diff options
Diffstat (limited to 'packages/bank-ui/src/pages/OperationState')
-rw-r--r-- | packages/bank-ui/src/pages/OperationState/index.ts | 16 | ||||
-rw-r--r-- | packages/bank-ui/src/pages/OperationState/state.ts | 6 | ||||
-rw-r--r-- | packages/bank-ui/src/pages/OperationState/views.tsx | 17 |
3 files changed, 23 insertions, 16 deletions
diff --git a/packages/bank-ui/src/pages/OperationState/index.ts b/packages/bank-ui/src/pages/OperationState/index.ts index e4d9d45e3..8ab5659b1 100644 --- a/packages/bank-ui/src/pages/OperationState/index.ts +++ b/packages/bank-ui/src/pages/OperationState/index.ts @@ -106,15 +106,15 @@ export namespace State { account: string; routeHere: RouteDefinition<{ wopid: string }>; onAbort: - | undefined - | (() => Promise< - TalerCoreBankErrorsByMethod<"abortWithdrawalById"> | undefined - >); + | undefined + | (() => Promise< + TalerCoreBankErrorsByMethod<"abortWithdrawalById"> | undefined + >); onConfirm: - | undefined - | (() => Promise< - TalerCoreBankErrorsByMethod<"confirmWithdrawalById"> | undefined - >); + | undefined + | (() => Promise< + TalerCoreBankErrorsByMethod<"confirmWithdrawalById"> | undefined + >); error: undefined; id: string; } diff --git a/packages/bank-ui/src/pages/OperationState/state.ts b/packages/bank-ui/src/pages/OperationState/state.ts index 9c5626cce..80af1a91d 100644 --- a/packages/bank-ui/src/pages/OperationState/state.ts +++ b/packages/bank-ui/src/pages/OperationState/state.ts @@ -191,9 +191,9 @@ export function useComponentState({ routeClose, onAbort: !creds ? async () => { - onAbort(); - return undefined; - } + onAbort(); + return undefined; + } : doAbort, }; } diff --git a/packages/bank-ui/src/pages/OperationState/views.tsx b/packages/bank-ui/src/pages/OperationState/views.tsx index 6eee6daa9..330fe1072 100644 --- a/packages/bank-ui/src/pages/OperationState/views.tsx +++ b/packages/bank-ui/src/pages/OperationState/views.tsx @@ -73,6 +73,7 @@ export function NeedConfirmationView({ title: i18n.str`The reserve operation has been confirmed previously and can't be aborted`, description: resp.detail.hint as TranslatedString, debug: resp.detail, + when: AbsoluteTime.now(), }); case HttpStatusCode.BadRequest: return notify({ @@ -80,6 +81,7 @@ export function NeedConfirmationView({ title: i18n.str`The operation id is invalid.`, description: resp.detail.hint as TranslatedString, debug: resp.detail, + when: AbsoluteTime.now(), }); case HttpStatusCode.NotFound: return notify({ @@ -87,6 +89,7 @@ export function NeedConfirmationView({ title: i18n.str`The operation was not found.`, description: resp.detail.hint as TranslatedString, debug: resp.detail, + when: AbsoluteTime.now(), }); default: assertUnreachable(resp); @@ -111,6 +114,7 @@ export function NeedConfirmationView({ title: i18n.str`The withdrawal has been aborted previously and can't be confirmed`, description: resp.detail.hint as TranslatedString, debug: resp.detail, + when: AbsoluteTime.now(), }); case TalerErrorCode.BANK_CONFIRM_INCOMPLETE: return notify({ @@ -118,6 +122,7 @@ export function NeedConfirmationView({ title: i18n.str`The withdrawal operation can't be confirmed before a wallet accepted the transaction.`, description: resp.detail.hint as TranslatedString, debug: resp.detail, + when: AbsoluteTime.now(), }); case HttpStatusCode.BadRequest: return notify({ @@ -125,6 +130,7 @@ export function NeedConfirmationView({ title: i18n.str`The operation id is invalid.`, description: resp.detail.hint as TranslatedString, debug: resp.detail, + when: AbsoluteTime.now(), }); case HttpStatusCode.NotFound: return notify({ @@ -132,6 +138,7 @@ export function NeedConfirmationView({ title: i18n.str`The operation was not found.`, description: resp.detail.hint as TranslatedString, debug: resp.detail, + when: AbsoluteTime.now(), }); case TalerErrorCode.BANK_UNALLOWED_DEBIT: return notify({ @@ -139,6 +146,7 @@ export function NeedConfirmationView({ title: i18n.str`Your balance is not enough.`, description: resp.detail.hint as TranslatedString, debug: resp.detail, + when: AbsoluteTime.now(), }); case HttpStatusCode.Accepted: { updateBankState("currentChallenge", { @@ -147,7 +155,6 @@ export function NeedConfirmationView({ sent: AbsoluteTime.never(), location: routeHere.url({ wopid: id }), request: id, - }); return onAuthorizationRequired(); } @@ -331,10 +338,7 @@ export function ConfirmedView({ routeClose }: State.Confirmed) { ); } -export function ReadyView({ - uri, - onAbort: doAbort, -}: State.Ready): VNode { +export function ReadyView({ uri, onAbort: doAbort }: State.Ready): VNode { const { i18n } = useTranslationContext(); const walletInegrationApi = useTalerWalletIntegrationAPI(); const [notification, notify, errorHandler] = useLocalNotification(); @@ -355,6 +359,7 @@ export function ReadyView({ title: i18n.str`The reserve operation has been confirmed previously and can't be aborted`, description: hasError.detail.hint as TranslatedString, debug: hasError.detail, + when: AbsoluteTime.now(), }); case HttpStatusCode.BadRequest: return notify({ @@ -362,6 +367,7 @@ export function ReadyView({ title: i18n.str`The operation id is invalid.`, description: hasError.detail.hint as TranslatedString, debug: hasError.detail, + when: AbsoluteTime.now(), }); case HttpStatusCode.NotFound: return notify({ @@ -369,6 +375,7 @@ export function ReadyView({ title: i18n.str`The operation was not found.`, description: hasError.detail.hint as TranslatedString, debug: hasError.detail, + when: AbsoluteTime.now(), }); default: assertUnreachable(hasError); |