Skip to content
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.

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

fix: "Add account" to "Connect Wallet" #2896

Merged
merged 35 commits into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
a56b8cd
Updated "Add account" to "Connect Wallet"
AdarshRawat1 Nov 29, 2023
77ed025
Removed outdated translation of account
AdarshRawat1 Nov 30, 2023
6ab0dc0
fix: Removed outdated translations of "accounts"
AdarshRawat1 Nov 30, 2023
31e8f47
Merge branch 'master' into dev2-swap-accounts-to-wallets
AdarshRawat1 Nov 30, 2023
a7a3b2b
Updated "Account Settings" -> "Wallet Settings"
AdarshRawat1 Dec 2, 2023
2d68934
Updated "Settings" -> "Extension Settings"
AdarshRawat1 Dec 2, 2023
a2a9a38
Removed outdated translations for "Extension Settings"
AdarshRawat1 Dec 2, 2023
433f610
Updated "Manage Accounts" and "Switch Accounts"
AdarshRawat1 Dec 2, 2023
f9113dd
Discarded outdated translations for manage wallet and switch wallets
AdarshRawat1 Dec 2, 2023
a337044
fix: reset existing translations
AdarshRawat1 Dec 3, 2023
5da5690
Updated : options.account.add
AdarshRawat1 Dec 3, 2023
efe64a2
swapped :"Remove account" -> "Disconnect the Wallet"
AdarshRawat1 Dec 3, 2023
6ba2134
Merge branch 'master' into dev2-swap-accounts-to-wallets
AdarshRawat1 Dec 3, 2023
3d21c46
Fix: Removed all the outdated translations related to "Remove Account"
AdarshRawat1 Dec 3, 2023
0939ddb
Merge branch 'dev2-swap-accounts-to-wallets' of https://github.com/Ad…
AdarshRawat1 Dec 3, 2023
d33c235
Fix: Outdated Translations "Add a new account"
AdarshRawat1 Dec 3, 2023
a230de3
fix: Translations
AdarshRawat1 Dec 3, 2023
f0a170c
fix: EOL
AdarshRawat1 Dec 3, 2023
8a30396
Fix: removed Empty translations
AdarshRawat1 Dec 3, 2023
283adfd
Revert "Fix: removed Empty translations"
AdarshRawat1 Dec 3, 2023
ed4db7a
Revert "fix: EOL"
AdarshRawat1 Dec 3, 2023
85e643b
Revert "Revert "fix: EOL""
AdarshRawat1 Dec 3, 2023
07b0ba2
Revert "Revert "Fix: removed Empty translations""
AdarshRawat1 Dec 3, 2023
5d98aa4
Removed empty translations
AdarshRawat1 Dec 3, 2023
53e1239
Merge branch 'getAlby:master' into dev2-swap-accounts-to-wallets
AdarshRawat1 Dec 8, 2023
40b9c62
Update Accounts Test
AdarshRawat1 Dec 8, 2023
981ec82
Update AccountMenu Test
AdarshRawat1 Dec 8, 2023
cce2903
Updated AccountMenu Tests
AdarshRawat1 Dec 8, 2023
1e1949a
Merge branch 'master' into dev2-swap-accounts-to-wallets
AdarshRawat1 Dec 16, 2023
57dfc76
Minor String Fixes
AdarshRawat1 Dec 21, 2023
af924c4
Merge branch 'master' into dev2-swap-accounts-to-wallets
AdarshRawat1 Dec 21, 2023
2d36398
Merge branch 'master' into dev2-swap-accounts-to-wallets
AdarshRawat1 Jan 1, 2024
d2cc97b
Merge branch 'master' into dev2-swap-accounts-to-wallets
reneaaron Feb 29, 2024
19fd7bd
Merge branch 'master' into dev2-swap-accounts-to-wallets
reneaaron Feb 29, 2024
3b97b30
fix: remove nostr from global settings
reneaaron Feb 29, 2024
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
6 changes: 3 additions & 3 deletions src/app/components/AccountMenu/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ describe("AccountMenu", () => {
await user.click(screen.getByText("Toggle Dropdown"));
});

await screen.findByText("Switch account");
await screen.findByText("Switch Wallet");
expect(screen.getByText("Balance")).toBeInTheDocument();
expect(screen.getByText("LND account")).toBeInTheDocument();
expect(screen.getByText("Galoy account")).toBeInTheDocument();
expect(screen.getByText("Add a new account")).toBeInTheDocument();
expect(screen.getByText("Manage accounts")).toBeInTheDocument();
expect(screen.getByText("Connect a Wallet")).toBeInTheDocument();
expect(screen.getByText("Manage Wallets")).toBeInTheDocument();
});
});
2 changes: 1 addition & 1 deletion src/app/components/AccountMenu/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ function AccountMenu({ showOptions = true }: Props) {
}}
>
<WalletIcon className="h-5 w-5 mr-2 text-gray-700 dark:text-neutral-300 shrink-0" />
{t("options.account.account_settings")}
{t("options.account.wallet_settings")}
</Menu.ItemButton>
{(isAlbyLNDHubAccount(
authAccount?.alias,
Expand Down
2 changes: 1 addition & 1 deletion src/app/screens/Accounts/Detail/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ function AccountDetail() {
name: account.name,
});
}}
label={t("actions.remove_account")}
label={t("actions.disconnect_wallet")}
fullWidth
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/screens/Accounts/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ describe("Accounts", () => {
</I18nextProvider>
</AccountsProvider>
);
expect(await screen.findByText("Accounts")).toBeInTheDocument();
expect(await screen.findByText("Wallets")).toBeInTheDocument();
});
});
2 changes: 1 addition & 1 deletion src/app/screens/Accounts/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function AccountsScreen() {
<div>
<Button
icon={<PlusIcon className="w-5 h-5 mr-2" />}
label={t("actions.add_account")}
label={t("actions.connect_a_wallet")}
primary
onClick={() => navigate(`/accounts/new`)}
/>
Expand Down
21 changes: 1 addition & 20 deletions src/i18n/locales/cs/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -238,15 +238,7 @@
}
},
"accounts": {
"title": "Účty",
"actions": {
"add_account": "Přidat účet"
},
"account_view": {
"remove": {
"title": "Odstranit tento účet",
"subtitle": "Všechny propojené příspěvky budou smazány. Buďte si jisti, že akci chcete opravdu provést."
},
"nostr": {
"errors": {
"failed_to_load": "Nepodařilo se načíst Nostr klíč. Zadali jste validní Nostr klíč?"
Expand Down Expand Up @@ -283,7 +275,6 @@
}
},
"actions": {
"remove_account": "Odstranit účet",
"export": "Export"
},
"export": {
Expand All @@ -294,7 +285,6 @@
"your_ln_address": "Vaše Lightning adresa:",
"scan_qr": "Importujte tuto peněženku do Zeus nebo BlueWallet naskenováním QR kódu."
},
"title1": "Informace o účtu",
"title2": "Upravit účet",
"name": {
"title": "Jméno",
Expand Down Expand Up @@ -355,7 +345,6 @@
}
},
"settings": {
"title": "Nastavení",
"browser_notifications": {
"title": "Upozornění prohlížeče",
"subtitle": "Platební notifikace a notifikace týkající se autentizace."
Expand Down Expand Up @@ -639,7 +628,6 @@
"password": "Heslo",
"success": "Úspěch",
"error": "Chyba",
"settings": "Nastavení",
"connected_sites": "",
"sats_one": "sat",
"sats_other": "satů",
Expand Down Expand Up @@ -750,14 +738,7 @@
}
},
"account_menu": {
"screen_reader": "Přepnout rozbalovací nabídku",
"title": "Změnit účet",
"options": {
"account": {
"add": "Přidat nový účet",
"manage": "Spravovat účty"
}
}
"screen_reader": "Přepnout rozbalovací nabídku"
},
"publishers_table": {
"payments": "platby"
Expand Down
21 changes: 1 addition & 20 deletions src/i18n/locales/da/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,7 @@
}
},
"accounts": {
"title": "Konti",
"account_view": {
"title1": "Kontooplysninger",
"title2": "Rediger konto",
"name": {
"title": "Navn",
Expand Down Expand Up @@ -297,17 +295,9 @@
"failed_to_load": "Nostr-nøglen kunne ikke anvendes. Er det en gyldig Nostr-nøgle?"
}
},
"remove": {
"title": "Fjern denne konto",
"subtitle": "Alle de tilknyttede puljer bliver slettet. Du skal være helt sikker."
},
"actions": {
"remove_account": "Fjern konto",
"export": "Eksporter"
}
},
"actions": {
"add_account": "Tilføj konto"
}
},
"unlock": {
Expand All @@ -326,7 +316,6 @@
}
},
"settings": {
"title": "Indstillinger",
"browser_notifications": {
"title": "Browsermeddelelser",
"subtitle": "Meddelelser om betaling og godkendelser."
Expand Down Expand Up @@ -563,7 +552,6 @@
"confirm_password": "Bekræft adgangskode",
"success": "Succes",
"error": "Fejl",
"settings": "Indstillinger",
"accounts": "Konti",
"discover": "Opdag",
"connected_sites": "",
Expand Down Expand Up @@ -673,14 +661,7 @@
}
},
"account_menu": {
"screen_reader": "Skift drop-down",
"title": "Skift konto",
"options": {
"account": {
"add": "Tilføj en ny konto",
"manage": "Administrer konti"
}
}
"screen_reader": "Skift drop-down"
},
"publishers_table": {
"payments": "betalinger"
Expand Down
12 changes: 1 addition & 11 deletions src/i18n/locales/de/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -436,13 +436,10 @@
}
},
"accounts": {
"title": "Konten",
"actions": {
"add_account": "Konto hinzufügen"
},
"account_view": {
"title2": "Konto",
"title1": "Kontoeinstellung",

"name": {
"title": "Name anzeigen",
"placeholder": "Konto Anzeigename"
Expand Down Expand Up @@ -521,13 +518,10 @@
}
},
"remove": {
"title": "Dieses Konto entfernen",
"subtitle": "Entfernt alle Zugangsdaten, Zahlungsdaten und Schlüssel, die mit diesem Konto verbunden sind.",
"error": "Der eingegebene Kontoname stimmte nicht überein.",
"confirm": "Bitte gebe den Namen des Kontos ein, um die Löschung deines Kontos zu bestätigen:\n\n{{ Name }}\n\n⚠️ Wenn du fortfährst, werden alle zugehörigen Schlüssel (Hauptschlüssel, Nostr, etc.) gelöscht. Bitte vergewissern dich, dass du eine Sicherungskopie erstellt hast, denn es gibt keine andere Möglichkeit, sie wiederherzustellen."
},
"actions": {
"remove_account": "Konto entfernen",
"export": "Exportieren",
"remove_secretkey": "Hauptschlüssel entfernen"
},
Expand Down Expand Up @@ -980,13 +974,9 @@
"account_menu": {
"options": {
"account": {
"add": "Neues Konto hinzufügen",
"manage": "Konten verwalten",
"account_settings": "Kontoeinstellungen",
"go_to_web_wallet": "Verwalte dein Web-Konto"
}
},
"title": "Konto wechseln",
"screen_reader": "Dropdown umschalten"
},
"publishers_table": {
Expand Down
2 changes: 0 additions & 2 deletions src/i18n/locales/el/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,7 @@
}
},
"accounts": {
"title": "Λογαριασμοί",
"account_view": {
"title1": "Ρυθμίσεις λογαριασμού",
"title2": "Λογαριασμός",
"mnemonic": {
"backup": {
Expand Down
22 changes: 11 additions & 11 deletions src/i18n/locales/en/translation.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{

Check warning on line 1 in src/i18n/locales/en/translation.json

View workflow job for this annotation

GitHub Actions / Check source translation file for changes

Translation source translation.accounts.title has changed

Consider running `node scripts/remove-outdated-translations.js translation.accounts.title` to reset existing translations.

Check warning on line 1 in src/i18n/locales/en/translation.json

View workflow job for this annotation

GitHub Actions / Check source translation file for changes

Translation source translation.accounts.account_view.title1 has changed

Consider running `node scripts/remove-outdated-translations.js translation.accounts.account_view.title1` to reset existing translations.

Check warning on line 1 in src/i18n/locales/en/translation.json

View workflow job for this annotation

GitHub Actions / Check source translation file for changes

Translation source translation.accounts.account_view.remove.title has changed

Consider running `node scripts/remove-outdated-translations.js translation.accounts.account_view.remove.title` to reset existing translations.

Check warning on line 1 in src/i18n/locales/en/translation.json

View workflow job for this annotation

GitHub Actions / Check source translation file for changes

Translation source translation.accounts.account_view.remove.subtitle has changed

Consider running `node scripts/remove-outdated-translations.js translation.accounts.account_view.remove.subtitle` to reset existing translations.

Check warning on line 1 in src/i18n/locales/en/translation.json

View workflow job for this annotation

GitHub Actions / Check source translation file for changes

Translation source translation.settings.title has changed

Consider running `node scripts/remove-outdated-translations.js translation.settings.title` to reset existing translations.

Check warning on line 1 in src/i18n/locales/en/translation.json

View workflow job for this annotation

GitHub Actions / Check source translation file for changes

Translation source components.account_menu.title has changed

Consider running `node scripts/remove-outdated-translations.js components.account_menu.title` to reset existing translations.

Check warning on line 1 in src/i18n/locales/en/translation.json

View workflow job for this annotation

GitHub Actions / Check source translation file for changes

Translation source components.account_menu.options.account.add has changed

Consider running `node scripts/remove-outdated-translations.js components.account_menu.options.account.add` to reset existing translations.

Check warning on line 1 in src/i18n/locales/en/translation.json

View workflow job for this annotation

GitHub Actions / Check source translation file for changes

Translation source components.account_menu.options.account.manage has changed

Consider running `node scripts/remove-outdated-translations.js components.account_menu.options.account.manage` to reset existing translations.
"translation": {
"welcome": {
"set_password": {
Expand Down Expand Up @@ -396,9 +396,9 @@
}
},
"accounts": {
"title": "Accounts",
"title": "Wallets",
"account_view": {
"title1": "Account Settings",
"title1": "Wallet Settings",
"title2": "Account",
"name": {
"title": "Display Name",
Expand Down Expand Up @@ -535,8 +535,8 @@
}
},
"remove": {
"title": "Remove This Account",
"subtitle": "Removes all allowances, payment data and keys associated with this account.",
"title": "Disconnect This Wallet",
"subtitle": "Removes all allowances, payment data and keys associated with this wallet.",
"confirm": "Please enter the name of the account to confirm the deletion of your account:\n\n{{ name }}\n\n ⚠️ All associated keys (Master Key, Nostr, etc) will be deleted if you continue. Please make sure you have backed them up, there is no other way to restore them.",
"error": "The entered account name didn't match."
},
Expand All @@ -547,13 +547,13 @@
"success": "Successfully removed the Master Key."
},
"actions": {
"remove_account": "Remove account",
"disconnect_wallet": "Disconnect Wallet",
"remove_secretkey": "Remove Master Key",
"export": "Export"
}
},
"actions": {
"add_account": "Add account"
"connect_a_wallet": "Connect a wallet"
}
},
"webln_enable": {
Expand Down Expand Up @@ -593,7 +593,7 @@
}
},
"settings": {
"title": "Settings",
"title": "Extension Settings",
"browser_notifications": {
"title": "Browser notifications",
"subtitle": "Payment and authentication related notifications."
Expand Down Expand Up @@ -1167,12 +1167,12 @@
},
"account_menu": {
"screen_reader": "Toggle Dropdown",
"title": "Switch account",
"title": "Switch Wallet",
"options": {
"account": {
"add": "Add a new account",
"manage": "Manage accounts",
"account_settings": "Account settings",
"add": "Connect a Wallet",
"manage": "Manage Wallets",
"wallet_settings": "Wallet settings",
"go_to_web_wallet": "Manage your web account"
}
}
Expand Down
17 changes: 1 addition & 16 deletions src/i18n/locales/eo/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,6 @@
"is_blocked_hint": ""
}
},
"accounts": {
"title": "Kontoj",
"actions": {
"add_account": ""
}
},
"unlock": {
"unlock_to_continue": "",
"unlock_password": "",
Expand All @@ -243,7 +237,6 @@
}
},
"settings": {
"title": "Agordoj",
"browser_notifications": {
"title": "",
"subtitle": ""
Expand Down Expand Up @@ -471,7 +464,6 @@
"password": "Pasvorto",
"success": "Sukceso",
"error": "Eraro",
"settings": "Agordoj",
"connected_sites": "",
"sats_one": "satoŝio",
"sats_other": "satoŝioj",
Expand Down Expand Up @@ -574,14 +566,7 @@
}
},
"account_menu": {
"screen_reader": "",
"title": "",
"options": {
"account": {
"add": "",
"manage": "Administri kontojn"
}
}
"screen_reader": ""
},
"publishers_table": {
"payments": "pagoj"
Expand Down
16 changes: 0 additions & 16 deletions src/i18n/locales/es/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,6 @@
}
},
"accounts": {
"title": "Cuentas",
"actions": {
"add_account": "Agregar Cuenta"
},
"account_view": {
"nostr": {
"errors": {
Expand Down Expand Up @@ -275,11 +271,6 @@
"title": "Nostr",
"hint": "es un protocolo simple y abierto que tiene como objetivo crear redes sociales resistentes a la censura. Nostr trabaja con claves criptográficas. Para publicar algo, lo firma con su clave y lo envía a múltiples relevos. Puede usar Alby para administrar su clave Nostr. Muchas aplicaciones de Nostr le permitirán simplemente usar la clave de la extensión Alby."
},
"remove": {
"title": "Eliminar Esta Cuenta",
"subtitle": "Se eliminarán todos los enlaces vinculados. Por favor, asegúrese de querer hacerlo."
},
"title1": "Información de la Cuenta",
"title2": "Editar Cuenta",
"name": {
"title": "Nombre",
Expand All @@ -294,7 +285,6 @@
"export_uri": "URI de credenciales de LNDHub"
},
"actions": {
"remove_account": "Eliminar cuenta",
"export": "Exportar"
}
}
Expand All @@ -315,7 +305,6 @@
}
},
"settings": {
"title": "Configuración",
"website_enhancements": {
"title": "Mejoras del sitio web",
"subtitle": "Mejoras de propinas para Twitter, YouTube, etc."
Expand Down Expand Up @@ -648,7 +637,6 @@
"password": "Contraseña",
"success": "Exitoso",
"error": "Error",
"settings": "Ajustes",
"connected_sites": "Sitios conectados",
"sats_one": "sat",
"sats_other": "sats",
Expand Down Expand Up @@ -779,12 +767,8 @@
}
},
"account_menu": {
"title": "Cambiar de cuenta",
"options": {
"account": {
"add": "Agregar una nueva cuenta",
"manage": "Administrar cuentas",
"account_settings": "Configuraciones de la cuenta",
"go_to_web_wallet": "Administra tu cuenta de Alby"
}
},
Expand Down
Loading
Loading