summaryrefslogtreecommitdiff
path: root/packages/taler-wallet-webextension
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2023-05-26 13:52:00 +0200
committerFlorian Dold <florian@dold.me>2023-05-26 13:52:00 +0200
commit96d9ea3840626f71efe38018b75748d8338565fa (patch)
treed1f04ecbb58750af79b3d0cb0420ba4fdf6d05a2 /packages/taler-wallet-webextension
parentcd8f76db61f4a1ab1a8a8a4d29b2f3e863b59854 (diff)
downloadwallet-core-96d9ea3840626f71efe38018b75748d8338565fa.tar.gz
wallet-core-96d9ea3840626f71efe38018b75748d8338565fa.tar.bz2
wallet-core-96d9ea3840626f71efe38018b75748d8338565fa.zip
taler-util,wallet-core: make AbsoluteTime opaque
Diffstat (limited to 'packages/taler-wallet-webextension')
-rw-r--r--packages/taler-wallet-webextension/src/cta/InvoicePay/stories.tsx12
-rw-r--r--packages/taler-wallet-webextension/src/cta/TransferPickup/stories.tsx7
-rw-r--r--packages/taler-wallet-webextension/src/wallet/Backup.stories.tsx24
-rw-r--r--packages/taler-wallet-webextension/src/wallet/DeveloperPage.stories.tsx6
-rw-r--r--packages/taler-wallet-webextension/src/wallet/DeveloperPage.tsx3
-rw-r--r--packages/taler-wallet-webextension/src/wallet/History.tsx3
-rw-r--r--packages/taler-wallet-webextension/src/wallet/Notifications/stories.tsx7
-rw-r--r--packages/taler-wallet-webextension/src/wallet/Notifications/views.tsx9
-rw-r--r--packages/taler-wallet-webextension/src/wallet/ProviderDetail.stories.tsx24
9 files changed, 45 insertions, 50 deletions
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({
<i18n.Translate>
Database exported at
<Time
- timestamp={{ t_ms: downloadedDatabase.time.getTime() }}
+ timestamp={AbsoluteTime.fromMilliseconds(downloadedDatabase.time.getTime())}
format="yyyy/MM/dd HH:mm:ss"
/>
<a
diff --git a/packages/taler-wallet-webextension/src/wallet/History.tsx b/packages/taler-wallet-webextension/src/wallet/History.tsx
index 300f385ea..0ea0f8da1 100644
--- a/packages/taler-wallet-webextension/src/wallet/History.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/History.tsx
@@ -15,6 +15,7 @@
*/
import {
+ AbsoluteTime,
Amounts,
Balance,
NotificationType,
@@ -261,7 +262,7 @@ export function HistoryView({
<Fragment key={i}>
<DateSeparator>
<Time
- timestamp={{ t_ms: Number.parseInt(d, 10) }}
+ timestamp={AbsoluteTime.fromMilliseconds(Number.parseInt(d, 10))}
format="dd MMMM yyyy"
/>
</DateSeparator>
diff --git a/packages/taler-wallet-webextension/src/wallet/Notifications/stories.tsx b/packages/taler-wallet-webextension/src/wallet/Notifications/stories.tsx
index 54f601c42..7344f417c 100644
--- a/packages/taler-wallet-webextension/src/wallet/Notifications/stories.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/Notifications/stories.tsx
@@ -22,6 +22,7 @@
import {
AbsoluteTime,
AttentionType,
+ TalerPreciseTimestamp,
TransactionIdStr,
} from "@gnu-taler/taler-util";
import * as tests from "@gnu-taler/web-util/testing";
@@ -34,7 +35,7 @@ export default {
export const Ready = tests.createExample(ReadyView, {
list: [
{
- when: AbsoluteTime.now(),
+ when: TalerPreciseTimestamp.now(),
read: false,
info: {
type: AttentionType.KycWithdrawal,
@@ -42,7 +43,7 @@ export const Ready = tests.createExample(ReadyView, {
},
},
{
- when: AbsoluteTime.now(),
+ when: TalerPreciseTimestamp.now(),
read: false,
info: {
type: AttentionType.MerchantRefund,
@@ -50,7 +51,7 @@ export const Ready = tests.createExample(ReadyView, {
},
},
{
- when: AbsoluteTime.now(),
+ when: TalerPreciseTimestamp.now(),
read: false,
info: {
type: AttentionType.BackupUnpaid,
diff --git a/packages/taler-wallet-webextension/src/wallet/Notifications/views.tsx b/packages/taler-wallet-webextension/src/wallet/Notifications/views.tsx
index 0f8fa7f26..03a08016a 100644
--- a/packages/taler-wallet-webextension/src/wallet/Notifications/views.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/Notifications/views.tsx
@@ -52,7 +52,8 @@ export function ReadyView({ list }: State.Ready): VNode {
}
const byDate = list.reduce((rv, x) => {
- const theDate = x.when.t_ms === "never" ? 0 : normalizeToDay(x.when.t_ms);
+ const theDate =
+ x.when.t_s === "never" ? 0 : normalizeToDay(x.when.t_s * 1000);
if (theDate) {
(rv[theDate] = rv[theDate] || []).push(x);
}
@@ -68,7 +69,9 @@ export function ReadyView({ list }: State.Ready): VNode {
<Fragment key={i}>
<DateSeparator>
<Time
- timestamp={{ t_ms: Number.parseInt(d, 10) }}
+ timestamp={AbsoluteTime.fromMilliseconds(
+ Number.parseInt(d, 10),
+ )}
format="dd MMMM yyyy"
/>
</DateSeparator>
@@ -77,7 +80,7 @@ export function ReadyView({ list }: State.Ready): VNode {
key={i}
info={n.info}
isRead={n.read}
- timestamp={n.when}
+ timestamp={AbsoluteTime.fromPreciseTimestamp(n.when)}
/>
))}
</Fragment>
diff --git a/packages/taler-wallet-webextension/src/wallet/ProviderDetail.stories.tsx b/packages/taler-wallet-webextension/src/wallet/ProviderDetail.stories.tsx
index 9c03d18f6..cd6af6214 100644
--- a/packages/taler-wallet-webextension/src/wallet/ProviderDetail.stories.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/ProviderDetail.stories.tsx
@@ -46,9 +46,7 @@ export const Active = tests.createExample(TestedComponent, {
],
paymentStatus: {
type: ProviderPaymentType.Paid,
- paidUntil: {
- t_ms: 1656599921000,
- },
+ paidUntil: AbsoluteTime.fromMilliseconds(1656599921000),
},
terms: {
annualFee: "EUR:1",
@@ -72,9 +70,7 @@ export const ActiveErrorSync = tests.createExample(TestedComponent, {
],
paymentStatus: {
type: ProviderPaymentType.Paid,
- paidUntil: {
- t_ms: 1656599921000,
- },
+ paidUntil: AbsoluteTime.fromMilliseconds(1656599921000),
},
lastError: {
code: 2002,
@@ -105,9 +101,7 @@ export const ActiveBackupProblemUnreadable = tests.createExample(
],
paymentStatus: {
type: ProviderPaymentType.Paid,
- paidUntil: {
- t_ms: 1656599921000,
- },
+ paidUntil: AbsoluteTime.fromMilliseconds(1656599921000),
},
backupProblem: {
type: "backup-unreadable",
@@ -133,17 +127,13 @@ export const ActiveBackupProblemDevice = tests.createExample(TestedComponent, {
],
paymentStatus: {
type: ProviderPaymentType.Paid,
- paidUntil: {
- t_ms: 1656599921000,
- },
+ paidUntil: AbsoluteTime.fromMilliseconds(1656599921000),
},
backupProblem: {
type: "backup-conflicting-device",
myDeviceId: "my-device-id",
otherDeviceId: "other-device-id",
- backupTimestamp: {
- t_ms: 1656599921000,
- },
+ backupTimestamp: AbsoluteTime.fromMilliseconds(1656599921000),
},
terms: {
annualFee: "EUR:1",
@@ -217,9 +207,7 @@ export const ActiveTermsChanged = tests.createExample(TestedComponent, {
paymentProposalIds: [],
paymentStatus: {
type: ProviderPaymentType.TermsChanged,
- paidUntil: {
- t_ms: 1656599921000,
- },
+ paidUntil: AbsoluteTime.fromMilliseconds(1656599921000),
newTerms: {
annualFee: "EUR:10",
storageLimitInMegabytes: 8,