Skip to content

Update fonts to Lora and improve error messages #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ben-kaufman merged 3 commits into from
Jun 4, 2025
Merged

Update fonts to Lora and improve error messages #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83734bb
Update fonts
ben-kaufman May 20, 2025
5147039
Improve error handling meessages
ben-kaufman May 20, 2025
b920af8
Fix modal add key success text
ben-kaufman May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 15 additions & 23 deletions src/assets/device-not-found-icon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/fonts/Lora/Lora-Medium.ttf
View file
Open in desktop
Binary file not shown.
Binary file added src/assets/fonts/Lora/Lora-SemiBold.ttf
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ html {

@font-face {
font-family: "Inter";
src: url("./assets/fonts/Inter/Inter-SemiBold.ttf") format("truetype");
src: url("./assets/fonts/Lora/Lora-SemiBold.ttf") format("truetype");
font-weight: 600;
font-style: normal;
}

@font-face {
font-family: "Inter";
src: url("./assets/fonts/Inter/Inter-Medium.ttf") format("truetype");
src: url("./assets/fonts/Lora/Lora-Medium.ttf") format("truetype");
font-weight: 500;
font-style: normal;
}
Expand Down
5 changes: 3 additions & 2 deletions src/modals/BaseModal/BaseModal.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,14 @@
font-size: 18px;
color: #000;
margin-bottom: 10px;
font-weight: 500;
}

.text {
font-size: 15px;
font-size: 14px;
color: #3e524d;
margin: 0 7%;
font-weight: 300;
font-weight: 400;
line-height: 20px;
}

Expand Down
2 changes: 1 addition & 1 deletion src/modals/DeviceActionSuccessModal/DeviceActionSuccessModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const DeviceActionSuccessModal = ({
case "shareXpubs":
return {
title: `Device Added`,
text: `Your ${deviceName} has successfully been added to Keeper App and is now available for use.`,
text: `You have added ${deviceName} successfully. It is available in the Keeper app to be used as a key.`,
};
case "healthCheck":
return {
Expand Down
17 changes: 16 additions & 1 deletion src/modals/ErrorModal/ErrorModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,25 @@ interface ErrorModalProps {
const ErrorModal = ({
isOpen,
onClose,
errorMessage,
errorMessage: originalErrorMessage,
onRetry,
}: ErrorModalProps) => {
const [isExpanded, setIsExpanded] = useState(false);

let errorMessage = originalErrorMessage;

if (
originalErrorMessage.includes(
"A multisig account configuration with this name already exists",
)
) {
errorMessage =
"A wallet with this name already exists. Please rename your wallet on the Keeper app and try again.";
} else if (originalErrorMessage.includes("sign_tx canceled by user")) {
errorMessage =
"Your transaction was declined on the hardware device. Please retry if you declined unintentionally.";
}

const shortMessage =
errorMessage.length > 100
? errorMessage.slice(0, 100) + "..."
Expand Down
17 changes: 12 additions & 5 deletions src/screens/ConnectScreen/ConnectScreen.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
.title {
margin-top: 38px;
max-width: 345px;
font-size: 25px;
font-size: 24px;
font-weight: 600;
line-height: normal;
margin-bottom: 0px;
Expand All @@ -38,7 +38,7 @@

.instructionsTitle {
font-size: 18px;
font-weight: 400;
font-weight: 500;
display: flex;
align-items: center;
margin-bottom: 30px;
Expand Down Expand Up @@ -67,17 +67,24 @@
width: 355px;
}

@font-face {
font-family: "InterLocal";
src: url("../../assets/fonts/Inter/Inter-SemiBold.ttf") format("truetype");
font-weight: 600;
font-style: normal;
}

.note h4 {
font-family: "InterLocal";
font-size: 14px;
font-weight: 500;
font-weight: 600;
margin-bottom: 0px;
}

.note p {
margin-top: 5px;
font-size: 12px;
font-weight: 300;
line-height: 17px;
line-height: 20px;
font-weight: 400;
}

Expand Down
4 changes: 3 additions & 1 deletion src/screens/ConnectScreen/ConnectScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,9 @@ const ConnectScreen = () => {
<div className={styles.leftSection}>
<img src={keeperLogo} alt="Keeper Logo" className={styles.keeperLogo} />
<h1 className={styles.title}>
Welcome to Bitcoin Keeper&apos;s Desktop App
Welcome to Bitcoin
<br />
Keeper&apos;s Desktop App
</h1>
<div className={styles.instructionsContainer}>
<h3 className={styles.instructionsTitle}>
Expand Down
8 changes: 8 additions & 0 deletions src/screens/WelcomeScreen/WelcomeScreen.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,15 @@
margin-bottom: 4px;
}

@font-face {
font-family: "InterLocal";
src: url("../../assets/fonts/Inter/Inter-Bold.ttf") format("truetype");
font-weight: 700;
font-style: normal;
}

.hyve {
font-family: "InterLocal", sans-serif;
font-weight: 700;
}

Expand Down