From 96d9ea3840626f71efe38018b75748d8338565fa Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 26 May 2023 13:52:00 +0200 Subject: taler-util,wallet-core: make AbsoluteTime opaque --- .../src/cta/InvoicePay/stories.tsx | 12 +++++++---- .../src/cta/TransferPickup/stories.tsx | 7 ++++--- .../src/wallet/Backup.stories.tsx | 24 ++++++++++------------ .../src/wallet/DeveloperPage.stories.tsx | 6 ++---- .../src/wallet/DeveloperPage.tsx | 3 ++- .../src/wallet/History.tsx | 3 ++- .../src/wallet/Notifications/stories.tsx | 7 ++++--- .../src/wallet/Notifications/views.tsx | 9 +++++--- .../src/wallet/ProviderDetail.stories.tsx | 24 ++++++---------------- 9 files changed, 45 insertions(+), 50 deletions(-) (limited to 'packages/taler-wallet-webextension/src') diff --git a/packages/taler-wallet-webextension/src/cta/InvoicePay/stories.tsx b/packages/taler-wallet-webextension/src/cta/InvoicePay/stories.tsx index 00460bc8f..a8f55c512 100644 --- a/packages/taler-wallet-webextension/src/cta/InvoicePay/stories.tsx +++ b/packages/taler-wallet-webextension/src/cta/InvoicePay/stories.tsx @@ -19,7 +19,11 @@ * @author Sebastian Javier Marchano (sebasjm) */ -import { PreparePayResult, PreparePayResultType } from "@gnu-taler/taler-util"; +import { + AbsoluteTime, + PreparePayResult, + PreparePayResultType, +} from "@gnu-taler/taler-util"; import * as tests from "@gnu-taler/web-util/testing"; import { ReadyView } from "./views.js"; @@ -43,9 +47,9 @@ export const Ready = tests.createExample(ReadyView, { status: PreparePayResultType.PaymentPossible, amountEffective: "ARS:1", } as PreparePayResult, - expiration: { - t_ms: new Date().getTime() + 1000 * 60 * 60, - }, + expiration: AbsoluteTime.fromMilliseconds( + new Date().getTime() + 1000 * 60 * 60, + ), accept: {}, cancel: {}, }); diff --git a/packages/taler-wallet-webextension/src/cta/TransferPickup/stories.tsx b/packages/taler-wallet-webextension/src/cta/TransferPickup/stories.tsx index 000d450b5..4fb230cd9 100644 --- a/packages/taler-wallet-webextension/src/cta/TransferPickup/stories.tsx +++ b/packages/taler-wallet-webextension/src/cta/TransferPickup/stories.tsx @@ -21,6 +21,7 @@ import * as tests from "@gnu-taler/web-util/testing"; import { ReadyView } from "./views.js"; +import { AbsoluteTime } from "@gnu-taler/taler-util"; export default { title: "transfer pickup", @@ -38,9 +39,9 @@ export const Ready = tests.createExample(ReadyView, { fraction: 0, }, summary: "some subject", - expiration: { - t_ms: new Date().getTime() + 1000 * 60 * 60, - }, + expiration: AbsoluteTime.fromMilliseconds( + new Date().getTime() + 1000 * 60 * 60, + ), accept: {}, cancel: {}, }); diff --git a/packages/taler-wallet-webextension/src/wallet/Backup.stories.tsx b/packages/taler-wallet-webextension/src/wallet/Backup.stories.tsx index ddcba6fae..59bcd5ce9 100644 --- a/packages/taler-wallet-webextension/src/wallet/Backup.stories.tsx +++ b/packages/taler-wallet-webextension/src/wallet/Backup.stories.tsx @@ -26,7 +26,11 @@ import { ShowRecoveryInfo, } from "./BackupPage.js"; import * as tests from "@gnu-taler/web-util/testing"; -import { TalerPreciseTimestamp, TalerProtocolTimestamp } from "@gnu-taler/taler-util"; +import { + AbsoluteTime, + TalerPreciseTimestamp, + TalerProtocolTimestamp, +} from "@gnu-taler/taler-util"; export default { title: "backup", @@ -45,9 +49,7 @@ export const LotOfProviders = tests.createExample(TestedComponent, { ], paymentStatus: { type: ProviderPaymentType.Paid, - paidUntil: { - t_ms: 1656599921000, - }, + paidUntil: AbsoluteTime.fromMilliseconds(1656599921000), }, terms: { annualFee: "ARS:1", @@ -66,9 +68,9 @@ export const LotOfProviders = tests.createExample(TestedComponent, { ], paymentStatus: { type: ProviderPaymentType.Paid, - paidUntil: { - t_ms: addDays(new Date(), 13).getTime(), - }, + paidUntil: AbsoluteTime.fromMilliseconds( + addDays(new Date(), 13).getTime(), + ), }, terms: { annualFee: "ARS:1", @@ -123,9 +125,7 @@ export const LotOfProviders = tests.createExample(TestedComponent, { storageLimitInMegabytes: 16, supportedProtocolVersion: "1", }, - paidUntil: { - t_ms: "never", - }, + paidUntil: AbsoluteTime.never(), }, terms: { annualFee: "KUDOS:0.1", @@ -177,9 +177,7 @@ export const OneProvider = tests.createExample(TestedComponent, { ], paymentStatus: { type: ProviderPaymentType.Paid, - paidUntil: { - t_ms: 1656599921000, - }, + paidUntil: AbsoluteTime.fromMilliseconds(1656599921000), }, terms: { annualFee: "ARS:1", diff --git a/packages/taler-wallet-webextension/src/wallet/DeveloperPage.stories.tsx b/packages/taler-wallet-webextension/src/wallet/DeveloperPage.stories.tsx index 28caf9c22..2ca5305f5 100644 --- a/packages/taler-wallet-webextension/src/wallet/DeveloperPage.stories.tsx +++ b/packages/taler-wallet-webextension/src/wallet/DeveloperPage.stories.tsx @@ -22,7 +22,7 @@ import { PendingTaskType, TaskId } from "@gnu-taler/taler-wallet-core"; import * as tests from "@gnu-taler/web-util/testing"; import { View as TestedComponent } from "./DeveloperPage.js"; -import { PendingIdStr } from "@gnu-taler/taler-util"; +import { AbsoluteTime, PendingIdStr } from "@gnu-taler/taler-util"; export default { title: "developer", @@ -41,9 +41,7 @@ export const AllOff = tests.createExample(TestedComponent, { exchangeBaseUrl: "http://exchange.url.", givesLifeness: false, lastError: undefined, - timestampDue: { - t_ms: 123123213, - }, + timestampDue: AbsoluteTime.fromMilliseconds(123123213), retryInfo: undefined, isDue: false, isLongpolling: false, diff --git a/packages/taler-wallet-webextension/src/wallet/DeveloperPage.tsx b/packages/taler-wallet-webextension/src/wallet/DeveloperPage.tsx index ddbb5bbba..388a331e6 100644 --- a/packages/taler-wallet-webextension/src/wallet/DeveloperPage.tsx +++ b/packages/taler-wallet-webextension/src/wallet/DeveloperPage.tsx @@ -15,6 +15,7 @@ */ import { + AbsoluteTime, Amounts, CoinDumpJson, CoinStatus, @@ -404,7 +405,7 @@ export function View({ Database exported at