Skip to content

Commit

Permalink
Merge branch 'feat/mnemonic' into feat/secret-key-security
Browse files Browse the repository at this point in the history
  • Loading branch information
rolznz committed Jun 19, 2023
2 parents 7d115ff + becdf95 commit 8ddc6cf
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 51 deletions.
34 changes: 0 additions & 34 deletions src/app/icons/OrdinalsIcon.tsx

This file was deleted.

19 changes: 3 additions & 16 deletions src/i18n/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -418,8 +418,8 @@
},
"mnemonic": {
"title": "Secret Key",
"description": "Your Account Secret Key allows you to use Alby to interact with protocols such as Nostr or Ordinals.",
"description2": "Your Secret Key is a set of 12 words that will allow you to access your keys to protocols such as Nostr or Ordinals on a new device or in case you loose access to your account.",
"description": "Your Account Secret Key allows you to use Alby to interact with protocols such as Nostr.",
"description2": "Your Secret Key is a set of 12 words that will allow you to access your keys to protocols such as Nostr on a new device or in case you loose access to your account.",
"saved": "Secret Key encrypted & saved successfully.",
"existing_nostr_key_notice": "⚠️ This account already has a nostr private key set and will not be derived from this secret key. You can manage your nostr key from your account settings.",
"generate": {
Expand All @@ -436,8 +436,7 @@
"description1": "In addition to the Bitcoin Lightning Network, Alby allows you to generate keys and interact with other protocols such as:",
"description2": "Your Secret Key is a set of 12 words that will allow you to access your keys to those protocols on a new device or in case you loose access to your account:",
"protocols": {
"nostr": "Nostr protocol",
"ordinals": "Ordinals"
"nostr": "Nostr protocol"
}
},
"import": {
Expand Down Expand Up @@ -776,18 +775,6 @@
"title": "Sign",
"content": "This website asks you to sign:"
},
"confirm_sign_psbt": {
"warning": "⚠️ Signing a PSBT may result in loosing your funds or Ordinals. Sign only if you understand what you're doing and trust this transaction",
"title": "Sign PSBT",
"allow_sign": "This website asks you to sign a Partially Signed Bitcoin Transaction:",
"view_addresses": "View addresses",
"hide_addresses": "Hide addresses",
"view_hex": "View PSBT hex",
"hide_hex": "Hide PSBT hex",
"input": "Input",
"outputs": "Outputs",
"amount": "{{amount}} sats"
},
"confirm_get_address": {
"title": "Get Address",
"heading": "This website asks you to read:",
Expand Down
1 change: 0 additions & 1 deletion src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ export type NavigationState = {
method: string;
description: string;
};
psbt?: string;
derivationPath?: string;
index?: number;
num?: number;
Expand Down

0 comments on commit 8ddc6cf

Please sign in to comment.