From d50294f76e0aa357d690a933bb6d696a2f6aef1b Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Wed, 2 Nov 2022 17:42:14 +0100
Subject: wallet-core: DB FIXMEs (amount format)

---
 .../components/ShowFullContractTermPopup.stories.tsx   | 18 +++---------------
 .../src/wallet/DepositPage/state.ts                    |  6 +++---
 .../src/wallet/DepositPage/stories.tsx                 |  6 +++---
 .../src/wallet/Transaction.tsx                         |  2 +-
 4 files changed, 10 insertions(+), 22 deletions(-)

(limited to 'packages/taler-wallet-webextension')

diff --git a/packages/taler-wallet-webextension/src/components/ShowFullContractTermPopup.stories.tsx b/packages/taler-wallet-webextension/src/components/ShowFullContractTermPopup.stories.tsx
index 6f71b9d2e..1396d8707 100644
--- a/packages/taler-wallet-webextension/src/components/ShowFullContractTermPopup.stories.tsx
+++ b/packages/taler-wallet-webextension/src/components/ShowFullContractTermPopup.stories.tsx
@@ -33,11 +33,7 @@ export default {
 };
 
 const cd: WalletContractData = {
-  amount: {
-    currency: "ARS",
-    fraction: 0,
-    value: 2,
-  },
+  amount: "ARS:2",
   contractTermsHash:
     "92X0KSJPZ8XS2XECCGFWTCGW8XMFCXTT2S6WHZDP6H9Y3TSKMTHY94WXEWDERTNN5XWCYGW4VN5CF2D4846HXTW7P06J4CZMHCWKC9G",
   fulfillmentUrl: "",
@@ -47,11 +43,7 @@ const cd: WalletContractData = {
     "0YA1WETV15R6K8QKS79QA3QMT16010F42Q49VSKYQ71HVQKAG0A4ZJCA4YTKHE9EA5SP156TJSKZEJJJ87305N6PS80PC48RNKYZE08",
   orderId: "2022.220-0281XKKB8W7YE",
   summary: "w",
-  maxWireFee: {
-    currency: "ARS",
-    fraction: 0,
-    value: 1,
-  },
+  maxWireFee: "ARS:1",
   payDeadline: {
     t_s: 1660002673,
   },
@@ -77,11 +69,7 @@ const cd: WalletContractData = {
   wireMethod: "x-taler-bank",
   wireInfoHash:
     "QDT28374ZHYJ59WQFZ3TW1D5WKJVDYHQT86VHED3TNMB15ANJSKXDYPPNX01348KDYCX6T4WXA5A8FJJ8YWNEB1JW726C1JPKHM89DR",
-  maxDepositFee: {
-    currency: "ARS",
-    fraction: 0,
-    value: 1,
-  },
+  maxDepositFee: "ARS:1",
   merchant: {
     name: "Default",
     address: {
diff --git a/packages/taler-wallet-webextension/src/wallet/DepositPage/state.ts b/packages/taler-wallet-webextension/src/wallet/DepositPage/state.ts
index a70682d89..2693db79e 100644
--- a/packages/taler-wallet-webextension/src/wallet/DepositPage/state.ts
+++ b/packages/taler-wallet-webextension/src/wallet/DepositPage/state.ts
@@ -99,7 +99,7 @@ export function useComponentState(
   const balance =
     bs.length > 0
       ? Amounts.parseOrThrow(bs[0].available)
-      : Amounts.getZero(currency);
+      : Amounts.zeroOfCurrency(currency);
 
   if (Amounts.isZero(balance)) {
     return {
@@ -157,12 +157,12 @@ export function useComponentState(
   const totalFee =
     fee !== undefined
       ? Amounts.sum([fee.wire, fee.coin, fee.refresh]).amount
-      : Amounts.getZero(currency);
+      : Amounts.zeroOfCurrency(currency);
 
   const totalToDeposit =
     parsedAmount && fee !== undefined
       ? Amounts.sub(parsedAmount, totalFee).amount
-      : Amounts.getZero(currency);
+      : Amounts.zeroOfCurrency(currency);
 
   const isDirty = amount !== initialValue;
   const amountError = !isDirty
diff --git a/packages/taler-wallet-webextension/src/wallet/DepositPage/stories.tsx b/packages/taler-wallet-webextension/src/wallet/DepositPage/stories.tsx
index 64b2c91a7..af9c620cb 100644
--- a/packages/taler-wallet-webextension/src/wallet/DepositPage/stories.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/DepositPage/stories.tsx
@@ -76,7 +76,7 @@ export const WithNoAccountForIBAN = createExample(ReadyView, {
       return;
     },
   },
-  totalFee: Amounts.getZero("USD"),
+  totalFee: Amounts.zeroOfCurrency("USD"),
   totalToDeposit: Amounts.parseOrThrow("USD:10"),
   // onCalculateFee: alwaysReturnFeeToOne,
 });
@@ -111,7 +111,7 @@ export const WithIBANAccountTypeSelected = createExample(ReadyView, {
       return;
     },
   },
-  totalFee: Amounts.getZero("USD"),
+  totalFee: Amounts.zeroOfCurrency("USD"),
   totalToDeposit: Amounts.parseOrThrow("USD:10"),
   // onCalculateFee: alwaysReturnFeeToOne,
 });
@@ -146,7 +146,7 @@ export const NewBitcoinAccountTypeSelected = createExample(ReadyView, {
       return;
     },
   },
-  totalFee: Amounts.getZero("USD"),
+  totalFee: Amounts.zeroOfCurrency("USD"),
   totalToDeposit: Amounts.parseOrThrow("USD:10"),
   // onCalculateFee: alwaysReturnFeeToOne,
 });
diff --git a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
index d7b6e3b1c..9fff76442 100644
--- a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
@@ -1132,7 +1132,7 @@ export function PurchaseDetails({
   const partialFee = Amounts.sub(price.effective, price.raw).amount;
 
   const refundFee = !refund
-    ? Amounts.getZero(price.effective.currency)
+    ? Amounts.zeroOfCurrency(price.effective.currency)
     : Amounts.sub(refund.raw, refund.effective).amount;
 
   const fee = Amounts.sum([partialFee, refundFee]).amount;
-- 
cgit v1.2.3