Skip to content

Multiple enhanced keys #6753

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

Draft
ben-kaufman wants to merge 8 commits into
base: sprint
Choose a base branch
from
+730 −329
Draft

Multiple enhanced keys #6753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
400aaf6
Multiple enhanced keys
ben-kaufman Jul 23, 2025
28a7579
Fix rotate key
ben-kaufman Jul 23, 2025
3a81ae4
Limit to 5 enhanced keys
ben-kaufman Jul 23, 2025
7c76d4e
UI fixes
ben-kaufman Jul 23, 2025
12c8a63
UI fixes
ben-kaufman Jul 25, 2025
b3332a3
UI fixes
ben-kaufman Jul 25, 2025
7d3bd27
Fix import
ben-kaufman Jul 25, 2025
c6cedc0
Merge branch 'sprint' into multi-enhanced-keys
ben-kaufman Jul 25, 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
9 changes: 7 additions & 2 deletions src/context/Localization/language/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@
"lessInfo": "Less Info",
"Buy": "Buy",
"update": "Update",
"swapBtc": "Swap BTC"
"swapBtc": "Swap BTC",
"removeKey": "Remove Key"
},
"login": {
"welcomeback": "Welcome Back",
Expand Down Expand Up @@ -708,7 +709,9 @@
"keyUsedForVault": "Key is being used for Vault",
"keysTryingToHide": "The Key you are trying to hide is used in one of the visible vaults.",
"toHideKey": "To hide the key",
"toviewMobileKey": "To view Mobile Key seed words"
"toviewMobileKey": "To view Mobile Key seed words",
"AddAnotherInheritanceKey": "Add Another Inheritance Key",
"AddAnotherEmergencyKey": "Add Another Emergency Key"
},
"seed": {
"EnterSeed": "Enter Seeds",
Expand Down Expand Up @@ -1951,6 +1954,8 @@
"passwordError": "Please enter a valid password",
"confirmPasswordError": "Confirm password is required",
"passwordMatchError": "Password does not match",
"maximumInheritanceKeysReached": "You cannot add more than 5 inheritance keys",
"maximumEmergencyKeysReached": "You cannot add more than 5 emergency keys",
"psbtNotMatch": "This PSBT does not match the current transaction",
"psbtMissingSignature": "This PSBT does not include a signature for the selected signer"
},
Expand Down
9 changes: 7 additions & 2 deletions src/context/Localization/language/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@
"lessInfo": "Less Info",
"Buy": "Buy",
"update": "Update",
"swapBtc": "Swap BTC"
"swapBtc": "Swap BTC",
"removeKey": "Remove Key"
},
"login": {
"welcomeback": "Welcome Back",
Expand Down Expand Up @@ -708,7 +709,9 @@
"keyUsedForVault": "Key is being used for Vault",
"keysTryingToHide": "The Key you are trying to hide is used in one of the visible vaults.",
"toHideKey": "To hide the key",
"toviewMobileKey": "To view Mobile Key seed words"
"toviewMobileKey": "To view Mobile Key seed words",
"AddAnotherInheritanceKey": "Add Another Inheritance Key",
"AddAnotherEmergencyKey": "Add Another Emergency Key"
},
"seed": {
"EnterSeed": "Enter Seeds",
Expand Down Expand Up @@ -1951,6 +1954,8 @@
"passwordError": "Please enter a valid password",
"confirmPasswordError": "Confirm password is required",
"passwordMatchError": "Password does not match",
"maximumInheritanceKeysReached": "You cannot add more than 5 inheritance keys",
"maximumEmergencyKeysReached": "You cannot add more than 5 emergency keys",
"psbtNotMatch": "This PSBT does not match the current transaction",
"psbtMissingSignature": "This PSBT does not include a signature for the selected signer"
},
Expand Down
12 changes: 10 additions & 2 deletions src/screens/SigningDevices/components/AddKeyButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,23 @@ import AddWhite from 'src/assets/images/add-plus-white.svg';
import { useContext } from 'react';
import { LocalizationContext } from 'src/context/Localization/LocContext';

export function AddKeyButton({ short = false, onPress }: { short?: boolean; onPress: () => void }) {
export function AddKeyButton({
short = false,
onPress,
buttonText = null,
}: {
short?: boolean;
onPress: () => void;
buttonText?: string;
}) {
const { colorMode } = useColorMode();
const isDarkMode = colorMode === 'dark';
const { translations } = useContext(LocalizationContext);
const { vault: vaultTranslation } = translations;
return (
<TouchableOpacity onPress={onPress} style={styles.addNewBtn} testID="btn_add_new_key">
<Text color={`${colorMode}.textGreen`} bold style={styles.addNew}>
{short ? vaultTranslation.addAKey : vaultTranslation.addNewKey}
{buttonText ? buttonText : short ? vaultTranslation.addAKey : vaultTranslation.addNewKey}
</Text>
{isDarkMode ? <AddWhite /> : <AddGreen />}
</TouchableOpacity>
Expand Down
Loading
Loading