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

change name to wallet from account #3073

Closed
wants to merge 6 commits into from
Closed
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
2 changes: 1 addition & 1 deletion src/app/components/AccountDetailLayout/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function AccountDetailLayout() {
const isRoot = useMatch("accounts/:id");
const { accounts } = useAccounts();
const { t } = useTranslation("translation", {
keyPrefix: "accounts.account_view",
keyPrefix: "wallets.wallet_view",
});
const { id } = useParams() as { id: string };

Expand Down
10 changes: 5 additions & 5 deletions src/app/components/AccountMenu/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export type Props = {
};

function AccountMenu({ showOptions = true }: Props) {
const { t } = useTranslation("components", { keyPrefix: "account_menu" });
const { t } = useTranslation("components", { keyPrefix: "wallet_menu" });
const { t: tCommon } = useTranslation("common");

const {
Expand Down 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.wallet_settings")}
{t("options.wallet.wallet_settings")}
</Menu.ItemButton>
{(isAlbyLNDHubAccount(
authAccount?.alias,
Expand All @@ -141,7 +141,7 @@ function AccountMenu({ showOptions = true }: Props) {
}}
>
<GlobeIcon className="h-5 w-5 mr-2 text-gray-700 dark:text-neutral-300 shrink-0" />
{t("options.account.go_to_web_wallet")} →
{t("options.wallet.go_to_web_wallet")} →
</Menu.ItemButton>
)}

Expand Down Expand Up @@ -193,15 +193,15 @@ function AccountMenu({ showOptions = true }: Props) {
}}
>
<PlusIcon className="h-5 w-5 mr-2 text-gray-700 dark:text-neutral-300" />
{t("options.account.add")}
{t("options.wallet.add")}
</Menu.ItemButton>
<Menu.ItemButton
onClick={() => {
openOptions("accounts");
}}
>
<AddressBookIcon className="h-5 w-5 mr-2 text-gray-700 dark:text-neutral-300" />
{t("options.account.manage")}
{t("options.wallet.manage")}
</Menu.ItemButton>
</>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { classNames } from "~/app/utils";

function MnemonicInstructions() {
const { t } = useTranslation("translation", {
keyPrefix: "accounts.account_view.mnemonic",
keyPrefix: "wallets.wallet_view.mnemonic",
});

return (
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/mnemonic/MnemonicDescription/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import FaceSurpriseIcon from "~/app/icons/FaceSurpriseIcon";

function MnemonicDescription() {
const { t } = useTranslation("translation", {
keyPrefix: "accounts.account_view.mnemonic",
keyPrefix: "wallets.wallet_view.mnemonic",
});

return (
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/mnemonic/MnemonicInputs/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default function MnemonicInputs({
isConfirmed,
}: React.PropsWithChildren<MnemonicInputsProps>) {
const { t } = useTranslation("translation", {
keyPrefix: "accounts.account_view.mnemonic",
keyPrefix: "wallets.wallet_view.mnemonic",
});
const [revealedIndex, setRevealedIndex] = useState<number | undefined>(
undefined
Expand Down
2 changes: 1 addition & 1 deletion src/app/screens/Accounts/BackupMnemonic/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import api from "~/common/lib/api";
function BackupMnemonic() {
const { t: tCommon } = useTranslation("common");
const { t } = useTranslation("translation", {
keyPrefix: "accounts.account_view.mnemonic",
keyPrefix: "wallets.wallet_view.mnemonic",
});
const navigate = useNavigate();

Expand Down
16 changes: 11 additions & 5 deletions src/app/screens/Accounts/Detail/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function AccountDetail() {
const auth = useAccount();
const { accounts, getAccounts } = useAccounts();
const { t } = useTranslation("translation", {
keyPrefix: "accounts.account_view",
keyPrefix: "wallets.wallet_view",
});
const { t: tCommon } = useTranslation("common");
const { isLoading: isLoadingSettings } = useSettings();
Expand Down Expand Up @@ -174,10 +174,16 @@ function AccountDetail() {
) : (
<div>
<Container>
<div className="flex justify-between items-center pt-8 pb-4">
<h2 className="text-2xl font-bold dark:text-white">{t("title2")}</h2>
<div className="flex justify-between items-center pt-8 pb-2">
<h2 className="text-2xl font-bold dark:text-white">{t("title1")}</h2>
</div>
<p className="mb-4 text-gray-500 dark:text-neutral-500 text-sm">
{t("description")}
</p>

<h2 className="mb-4 text-xl font-bold dark:text-white">
{t("general.title")}
</h2>
<div>
<div className="shadow bg-white rounded-md sm:overflow-hidden p-6 dark:bg-surface-01dp flex flex-col gap-4">
<form
Expand Down Expand Up @@ -309,7 +315,7 @@ function AccountDetail() {
)}
</div>

<h2 className="text-2xl mt-12 mb-6 font-bold dark:text-white">
<h2 className="text-xl mt-8 mb-4 font-bold dark:text-white">
{t("mnemonic.title")}
</h2>

Expand Down Expand Up @@ -504,7 +510,7 @@ function AccountDetail() {
</div>
</div>

<div className="relative flex py-5 mt-12 items-center">
<div className="relative flex py-5 mt-8 items-center">
<div className="flex-grow border-t border-gray-300 dark:border-gray-700"></div>
<span className="flex-shrink mx-4 text-gray-600 dark:text-gray-400 fw-bold">
⛔️ Danger Zone
Expand Down
2 changes: 1 addition & 1 deletion src/app/screens/Accounts/GenerateMnemonic/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function GenerateMnemonic() {
const { id } = useParams() as { id: string };

const { t } = useTranslation("translation", {
keyPrefix: "accounts.account_view.mnemonic",
keyPrefix: "wallets.wallet_view.mnemonic",
});
const { t: tCommon } = useTranslation("common");

Expand Down
2 changes: 1 addition & 1 deletion src/app/screens/Accounts/GenerateMnemonic/new.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function MnemonicExplanation() {
const theme = useTheme();

const { t } = useTranslation("translation", {
keyPrefix: "accounts.account_view.mnemonic.new",
keyPrefix: "wallets.wallet_view.mnemonic.new",
});
const { t: tCommon } = useTranslation("common");

Expand Down
2 changes: 1 addition & 1 deletion src/app/screens/Accounts/ImportMnemonic/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function ImportMnemonic() {
const { t: tCommon } = useTranslation("common");
const navigate = useNavigate();
const { t } = useTranslation("translation", {
keyPrefix: "accounts.account_view.mnemonic",
keyPrefix: "wallets.wallet_view.mnemonic",
});

const [mnemonic, setMnemonic] = useState<string>("");
Expand Down
2 changes: 1 addition & 1 deletion src/app/screens/Accounts/NostrSettings/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { default as nostr } from "~/common/lib/nostr";
function NostrSettings() {
const { t: tCommon } = useTranslation("common");
const { t } = useTranslation("translation", {
keyPrefix: "accounts.account_view",
keyPrefix: "wallets.wallet_view",
});
const navigate = useNavigate();
const [hasMnemonic, setHasMnemonic] = useState(false);
Expand Down
2 changes: 1 addition & 1 deletion src/app/screens/Accounts/NostrSetup/NostrSetup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import api from "~/common/lib/api";

function NostrSetup() {
const { t } = useTranslation("translation", {
keyPrefix: "accounts.account_view.nostr.setup",
keyPrefix: "wallets.wallet_view.nostr.setup",
});
const navigate = useNavigate();
const [step, setStep] = useState<"start" | "import">("start");
Expand Down
2 changes: 1 addition & 1 deletion src/app/screens/Accounts/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function AccountsScreen() {
const navigate = useNavigate();

const { t } = useTranslation("translation", {
keyPrefix: "accounts",
keyPrefix: "wallets",
});

return (
Expand Down
2 changes: 1 addition & 1 deletion src/app/screens/ConfirmAddAccount/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ describe("ConfirmAddAccount", () => {

expect(
await screen.findByText(
"This website wants to add an account (Citadel (over Tor)):"
"This website wants to add an wallet (Citadel (over Tor)):"
)
).toBeInTheDocument();
expect(await screen.findByText("Your Citadel wallet")).toBeInTheDocument();
Expand Down
2 changes: 1 addition & 1 deletion src/app/screens/ConfirmAddAccount/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function ConfirmAddAccount() {
const navState = useNavigationState();
const { t: tCommon } = useTranslation("common");
const { t } = useTranslation("translation", {
keyPrefix: "confirm_add_account",
keyPrefix: "confirm_add_wallet",
});

const name = navState.args?.name as string;
Expand Down
2 changes: 1 addition & 1 deletion src/app/screens/Onboard/TestConnection/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default function TestConnection() {
</p>

<Button
label={t("actions.delete_edit_account")}
label={t("actions.delete_edit_wallet")}
onClick={handleEdit}
primary
/>
Expand Down
2 changes: 1 addition & 1 deletion src/app/screens/Options/TestConnection/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export default function TestConnection() {
</p>

<Button
label={t("actions.delete_edit_account")}
label={t("actions.delete_edit_wallet")}
onClick={handleEdit}
primary
/>
Expand Down
4 changes: 2 additions & 2 deletions src/i18n/locales/cs/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"connection_taking_long": "Připojování zabralo více, než bylo očekáváno... Zadali jste údaje o připojení správně? Je váš uzel dostupný?",
"contact_support": "Pokud potřebujete pomoct, prosím kontaktujte [email protected]",
"actions": {
"delete_edit_account": "Smažte nevalidní účet a změny proveďte znovu"
"delete_edit_wallet": "Smažte nevalidní účet a změny proveďte znovu"
}
},
"pin_extension": {
Expand Down Expand Up @@ -737,7 +737,7 @@
"invalid_credentials": "Chybné heslo. Prosím zkontrolujte své heslo a emailovou adresu a zkuste to znovu."
}
},
"account_menu": {
"wallet_menu": {
"screen_reader": "Přepnout rozbalovací nabídku"
},
"publishers_table": {
Expand Down
4 changes: 2 additions & 2 deletions src/i18n/locales/da/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"connection_taking_long": "Etablering af forbindelse går lidt langsomt...Er dine oplysninger korrekte? Er der kontakt til din node?",
"contact_support": "Kontakt [email protected] hvis du behøver hjælp",
"actions": {
"delete_edit_account": "Slet ugyldig konto og rediger igen"
"delete_edit_wallet": "Slet ugyldig konto og rediger igen"
}
}
},
Expand Down Expand Up @@ -660,7 +660,7 @@
"invalid_credentials": "Ugyldig adgangskode. Kontroller din adgangskode og e-mailadresse, og prøv igen."
}
},
"account_menu": {
"wallet_menu": {
"screen_reader": "Skift drop-down"
},
"publishers_table": {
Expand Down
7 changes: 3 additions & 4 deletions src/i18n/locales/de/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"test_connection": {
"review_connection_details": "Bitte überprüfe deine Verbindungsdaten.",
"actions": {
"delete_edit_account": "Ungültiges Konto löschen und erneut bearbeiten"
"delete_edit_wallet": "Ungültiges Konto löschen und erneut bearbeiten"
},
"ready": "Großartig, du kannst jetzt loslegen!",
"initializing": "Dein Konto wird initialisiert. Bitte warte, dies kann eine Minute dauern...",
Expand Down Expand Up @@ -439,7 +439,6 @@
"account_view": {
"title2": "Konto",
"title1": "Kontoeinstellung",

"name": {
"title": "Name anzeigen",
"placeholder": "Konto Anzeigename"
Expand Down Expand Up @@ -839,7 +838,7 @@
"name": "StartOS"
}
},
"confirm_add_account": {
"confirm_add_wallet": {
"title": "Konto hinzufügen",
"content": "Diese Webseite möchte ein Konto hinzufügen ({{connector}}):",
"tor_info": "Um sich über das TOR-Netzwerk zu verbinden, musst du zunächst die Alby-Begleit-App installieren:"
Expand Down Expand Up @@ -971,7 +970,7 @@
}
},
"components": {
"account_menu": {
"wallet_menu": {
"options": {
"account": {
"go_to_web_wallet": "Verwalte dein Web-Konto"
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/locales/el/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"review_connection_details": "Παρακαλώ εξετάστε τις λεπτομέρειες σύνδεσης σας.",
"contact_support": "Αν το χρειάζεστε παρακαλώ επικοινωνήστε με το [email protected]",
"actions": {
"delete_edit_account": "Διαγράψτε τον μη έγκυρο λογαριασμό και εισάγετε ξανά τα στοιχεία"
"delete_edit_wallet": "Διαγράψτε τον μη έγκυρο λογαριασμό και εισάγετε ξανά τα στοιχεία"
},
"ready": "Φανταστικά, μπορείτε να ξεκινήσετε!",
"connection_error": "Σφάλμα σύνδεσης",
Expand Down
Loading
Loading