diff options
author | Sebastian <sebasjm@gmail.com> | 2024-01-14 16:29:03 -0300 |
---|---|---|
committer | Sebastian <sebasjm@gmail.com> | 2024-01-14 16:29:13 -0300 |
commit | ca0851186f461f33c2dbdc4b99194905d9e1f323 (patch) | |
tree | 537322b6215406a4fd52c4a1340899cd618207d2 | |
parent | 95f77199d5fedc709b5f5b925944c3f2746b31ac (diff) |
fix wording, missing strings
-rw-r--r-- | packages/demobank-ui/src/pages/WalletWithdrawForm.tsx | 2 | ||||
-rw-r--r-- | packages/demobank-ui/src/pages/WithdrawalQRCode.tsx | 22 | ||||
-rw-r--r-- | packages/demobank-ui/src/pages/business/CreateCashout.tsx | 2 |
3 files changed, 16 insertions, 10 deletions
diff --git a/packages/demobank-ui/src/pages/WalletWithdrawForm.tsx b/packages/demobank-ui/src/pages/WalletWithdrawForm.tsx index 70b83fa82..93b3b87a7 100644 --- a/packages/demobank-ui/src/pages/WalletWithdrawForm.tsx +++ b/packages/demobank-ui/src/pages/WalletWithdrawForm.tsx @@ -66,7 +66,7 @@ function OldWithdrawalForm({ goToConfirmOperation, limit, onCancel, focus }: { return <Attention type="warning" title={i18n.str`There is an operation already`}> <span ref={focus ? doAutoFocus : undefined} /> <i18n.Translate> - To complete or cancel the operation in this <a class="font-semibold text-yellow-700 hover:text-yellow-600" href={`#/operation/${bankState.currentWithdrawalOperationId}`}><i18n.Translate>page</i18n.Translate></a> + Complete or cancel the operation in this <a class="font-semibold text-yellow-700 hover:text-yellow-600" href={`#/operation/${bankState.currentWithdrawalOperationId}`}><i18n.Translate>page</i18n.Translate></a> </i18n.Translate> </Attention> } diff --git a/packages/demobank-ui/src/pages/WithdrawalQRCode.tsx b/packages/demobank-ui/src/pages/WithdrawalQRCode.tsx index c9384e945..787eeca52 100644 --- a/packages/demobank-ui/src/pages/WithdrawalQRCode.tsx +++ b/packages/demobank-ui/src/pages/WithdrawalQRCode.tsx @@ -68,7 +68,6 @@ export function WithdrawalQRCode({ const { body: data } = result; if (data.status === "aborted") { - // FIXME: remove exchange word return <section id="main" class="content"> <h1 class="nav">{i18n.str`Operation aborted`}</h1> <section> @@ -143,19 +142,26 @@ export function WithdrawalQRCode({ ); } - if (!data.selected_reserve_pub) { + const account = !data.selected_exchange_account ? undefined : parsePaytoUri(data.selected_exchange_account) + + if (!data.selected_reserve_pub && account) { return <Attention type="danger" - title={i18n.str`The operation is incomplete or some step in the withdrawal failed`} > - <i18n.Translate>The wallet confirmation is partially confirmed. The Taler Exchange operator is selected but no withdrawal identification found.</i18n.Translate> + title={i18n.str`The operation is marked as 'selected' but some step in the withdrawal failed`} > + <i18n.Translate>The account is selected but no withdrawal identification found.</i18n.Translate> </Attention> } - const account = !data.selected_exchange_account ? undefined : parsePaytoUri(data.selected_exchange_account) + if (!account && data.selected_reserve_pub) { + return <Attention type="danger" + title={i18n.str`The operation is marked as 'selected' but some step in the withdrawal failed`}> + <i18n.Translate>There is a withdrawal identification but no account has been selected or the selected account is invalid.</i18n.Translate> + </Attention> + } - if (!account) { + if (!account || !data.selected_reserve_pub) { return <Attention type="danger" - title={i18n.str`The operation is incomplete or some step in the withdrawal failed`}> - <i18n.Translate>The Taler Exchange operator is selected but the Taler Exchange operator account is missing or invalid.</i18n.Translate> + title={i18n.str`The operation is marked as 'selected' but some step in the withdrawal failed`}> + <i18n.Translate>No withdrawal ID found and no account has been selected or the selected account is invalid.</i18n.Translate> </Attention> } diff --git a/packages/demobank-ui/src/pages/business/CreateCashout.tsx b/packages/demobank-ui/src/pages/business/CreateCashout.tsx index 14e151ae6..f9962fbde 100644 --- a/packages/demobank-ui/src/pages/business/CreateCashout.tsx +++ b/packages/demobank-ui/src/pages/business/CreateCashout.tsx @@ -457,7 +457,7 @@ export function CreateCashout({ class="block text-sm font-medium leading-6 text-gray-900" for="channel" > - {i18n.str`Second fac`} + {i18n.str`Second factor authentication`} </label> <div class="mt-2 max-w-xl text-sm text-gray-500"> <div class="px-4 mt-4 grid grid-cols-1 gap-y-6"> |