From bd88dcebbcf90414c790a86ee13740eaf20e3334 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Sat, 15 Oct 2022 12:59:26 +0200
Subject: wallet-core: simplify exchanges list response

---
 .../src/wallet/DeveloperPage.tsx                   | 17 ++++++++---------
 .../src/wallet/Settings.tsx                        | 22 ++++++++++------------
 2 files changed, 18 insertions(+), 21 deletions(-)

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

diff --git a/packages/taler-wallet-webextension/src/wallet/DeveloperPage.tsx b/packages/taler-wallet-webextension/src/wallet/DeveloperPage.tsx
index c6f016e00..c0e35b17b 100644
--- a/packages/taler-wallet-webextension/src/wallet/DeveloperPage.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/DeveloperPage.tsx
@@ -17,6 +17,7 @@
 import {
   Amounts,
   CoinDumpJson,
+  CoinStatus,
   ExchangeListItem,
   NotificationType,
 } from "@gnu-taler/taler-util";
@@ -86,7 +87,7 @@ type CoinsInfo = CoinDumpJson["coins"];
 type CalculatedCoinfInfo = {
   ageKeysCount: number | undefined;
   denom_value: number;
-  remain_value: number;
+  //remain_value: number;
   status: string;
   from_refresh: boolean;
   id: string;
@@ -143,10 +144,10 @@ export function View({
       prev[cur.exchange_base_url].push({
         ageKeysCount: cur.ageCommitmentProof?.proof.privateKeys.length,
         denom_value: parseFloat(Amounts.stringifyValue(denom)),
-        remain_value: parseFloat(
-          Amounts.stringifyValue(Amounts.parseOrThrow(cur.remaining_value)),
-        ),
-        status: cur.coin_suspended ? "suspended" : "ok",
+        // remain_value: parseFloat(
+        //   Amounts.stringifyValue(Amounts.parseOrThrow(cur.remaining_value)),
+        // ),
+        status: cur.coin_status,
         from_refresh: cur.refresh_parent_coin_pub !== undefined,
         id: cur.coin_pub,
       });
@@ -254,8 +255,8 @@ export function View({
 
         const coins = allcoins.reduce(
           (prev, cur) => {
-            if (cur.remain_value > 0) prev.usable.push(cur);
-            if (cur.remain_value === 0) prev.spent.push(cur);
+            if (cur.status === CoinStatus.Fresh) prev.usable.push(cur);
+            if (cur.status === CoinStatus.Dormant) prev.spent.push(cur);
             return prev;
           },
           {
@@ -356,7 +357,6 @@ function ShowAllCoins({
               <tr key={idx}>
                 <td>{c.id.substring(0, 5)}</td>
                 <td>{c.denom_value}</td>
-                <td>{c.remain_value}</td>
                 <td>{c.status}</td>
                 <td>{c.from_refresh ? "true" : "false"}</td>
                 <td>{String(c.ageKeysCount)}</td>
@@ -396,7 +396,6 @@ function ShowAllCoins({
               <tr key={idx}>
                 <td>{c.id.substring(0, 5)}</td>
                 <td>{c.denom_value}</td>
-                <td>{c.remain_value}</td>
                 <td>{c.status}</td>
                 <td>{c.from_refresh ? "true" : "false"}</td>
               </tr>
diff --git a/packages/taler-wallet-webextension/src/wallet/Settings.tsx b/packages/taler-wallet-webextension/src/wallet/Settings.tsx
index 80843ac27..8412c4a12 100644
--- a/packages/taler-wallet-webextension/src/wallet/Settings.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/Settings.tsx
@@ -14,7 +14,11 @@
  GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
 
-import { ExchangeListItem, WalletCoreVersion } from "@gnu-taler/taler-util";
+import {
+  ExchangeListItem,
+  ExchangeTosStatus,
+  WalletCoreVersion,
+} from "@gnu-taler/taler-util";
 import { Fragment, h, VNode } from "preact";
 import { Checkbox } from "../components/Checkbox.js";
 import { ErrorTalerOperation } from "../components/ErrorTalerOperation.js";
@@ -36,7 +40,6 @@ import { useBackupDeviceName } from "../hooks/useBackupDeviceName.js";
 import { useAutoOpenPermissions } from "../hooks/useAutoOpenPermissions.js";
 import { ToggleHandler } from "../mui/handlers.js";
 import { Pages } from "../NavigationBar.js";
-import { buildTermsOfServiceStatus } from "../components/TermsOfService/utils.js";
 import * as wxApi from "../wxApi.js";
 import { platform } from "../platform/api.js";
 import { useClipboardPermissions } from "../hooks/useClipboardPermissions.js";
@@ -181,26 +184,21 @@ export function SettingsView({
               <tbody>
                 {knownExchanges.map((e, idx) => {
                   function Status(): VNode {
-                    const status = buildTermsOfServiceStatus(
-                      e.tos.content,
-                      e.tos.acceptedVersion,
-                      e.tos.currentVersion,
-                    );
-                    switch (status) {
-                      case "accepted":
+                    switch (e.tosStatus) {
+                      case ExchangeTosStatus.Accepted:
                         return (
                           <SuccessText>
                             <i18n.Translate>ok</i18n.Translate>
                           </SuccessText>
                         );
-                      case "changed":
+                      case ExchangeTosStatus.Changed:
                         return (
                           <WarningText>
                             <i18n.Translate>changed</i18n.Translate>
                           </WarningText>
                         );
-                      case "new":
-                      case "notfound":
+                      case ExchangeTosStatus.New:
+                      case ExchangeTosStatus.NotFound:
                         return (
                           <DestructiveText>
                             <i18n.Translate>not accepted</i18n.Translate>
-- 
cgit v1.2.3