diff --git a/src/assets/device-not-found-icon.svg b/src/assets/device-not-found-icon.svg index 1984347..f7f48e6 100644 --- a/src/assets/device-not-found-icon.svg +++ b/src/assets/device-not-found-icon.svg @@ -1,26 +1,18 @@ - - + - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/src/assets/fonts/Lora/Lora-Medium.ttf b/src/assets/fonts/Lora/Lora-Medium.ttf new file mode 100644 index 0000000..85ca5a2 Binary files /dev/null and b/src/assets/fonts/Lora/Lora-Medium.ttf differ diff --git a/src/assets/fonts/Lora/Lora-SemiBold.ttf b/src/assets/fonts/Lora/Lora-SemiBold.ttf new file mode 100644 index 0000000..3a7c6d7 Binary files /dev/null and b/src/assets/fonts/Lora/Lora-SemiBold.ttf differ diff --git a/src/index.css b/src/index.css index 394741c..a504a29 100644 --- a/src/index.css +++ b/src/index.css @@ -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; } diff --git a/src/modals/BaseModal/BaseModal.module.css b/src/modals/BaseModal/BaseModal.module.css index de82413..a78953b 100644 --- a/src/modals/BaseModal/BaseModal.module.css +++ b/src/modals/BaseModal/BaseModal.module.css @@ -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; } diff --git a/src/modals/DeviceActionSuccessModal/DeviceActionSuccessModal.tsx b/src/modals/DeviceActionSuccessModal/DeviceActionSuccessModal.tsx index 419c667..a53ebf3 100644 --- a/src/modals/DeviceActionSuccessModal/DeviceActionSuccessModal.tsx +++ b/src/modals/DeviceActionSuccessModal/DeviceActionSuccessModal.tsx @@ -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 { diff --git a/src/modals/ErrorModal/ErrorModal.tsx b/src/modals/ErrorModal/ErrorModal.tsx index 784c2e9..df294cb 100644 --- a/src/modals/ErrorModal/ErrorModal.tsx +++ b/src/modals/ErrorModal/ErrorModal.tsx @@ -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) + "..." diff --git a/src/screens/ConnectScreen/ConnectScreen.module.css b/src/screens/ConnectScreen/ConnectScreen.module.css index 205495f..d6c74e7 100644 --- a/src/screens/ConnectScreen/ConnectScreen.module.css +++ b/src/screens/ConnectScreen/ConnectScreen.module.css @@ -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; @@ -38,7 +38,7 @@ .instructionsTitle { font-size: 18px; - font-weight: 400; + font-weight: 500; display: flex; align-items: center; margin-bottom: 30px; @@ -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; } diff --git a/src/screens/ConnectScreen/ConnectScreen.tsx b/src/screens/ConnectScreen/ConnectScreen.tsx index 0b7d19b..38d4ae5 100644 --- a/src/screens/ConnectScreen/ConnectScreen.tsx +++ b/src/screens/ConnectScreen/ConnectScreen.tsx @@ -253,7 +253,9 @@ const ConnectScreen = () => {
Keeper Logo

- Welcome to Bitcoin Keeper's Desktop App + Welcome to Bitcoin +
+ Keeper's Desktop App

diff --git a/src/screens/WelcomeScreen/WelcomeScreen.module.css b/src/screens/WelcomeScreen/WelcomeScreen.module.css index c7be3c0..9b8f9eb 100644 --- a/src/screens/WelcomeScreen/WelcomeScreen.module.css +++ b/src/screens/WelcomeScreen/WelcomeScreen.module.css @@ -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; }