Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 20 additions & 20 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "keeper-desktop",
"private": true,
"version": "0.2.3",
"version": "0.2.4",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "keeper-desktop"
version = "0.2.3"
version = "0.2.4"
description = "Bitcoin Keeper Desktop App"
authors = ["Ben Kaufman"]
repository = "https://github.com/bithyve/keeper-desktop"
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"package": {
"productName": "Keeper Desktop (Dev)",
"version": "0.2.3"
"version": "0.2.4"
},
"tauri": {
"allowlist": {
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.release.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"package": {
"productName": "Keeper Desktop",
"version": "0.2.3"
"version": "0.2.4"
},
"tauri": {
"allowlist": {
Expand Down
38 changes: 15 additions & 23 deletions src/assets/device-not-found-icon.svg
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
Binary file not shown.
Binary file added src/assets/fonts/Lora/Lora-SemiBold.ttf
Binary file not shown.
4 changes: 2 additions & 2 deletions src/index.css
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
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
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
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
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
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
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