From 0c9358c1b2bd80e25940022e86bd8daef8184ad7 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Thu, 19 Dec 2019 20:42:49 +0100
Subject: new date format, replace checkable annotations with codecs

---
 src/webex/pages/pay.tsx  |  2 +-
 src/webex/renderHtml.tsx |  8 ++++----
 src/webex/wxBackend.ts   | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/webex')

diff --git a/src/webex/pages/pay.tsx b/src/webex/pages/pay.tsx
index eca115e78..b7f09b6f6 100644
--- a/src/webex/pages/pay.tsx
+++ b/src/webex/pages/pay.tsx
@@ -74,7 +74,7 @@ function TalerPayDialog({ talerPayUri }: { talerPayUri: string }) {
     );
   }
 
-  const contractTerms = payStatus.contractTerms;
+  const contractTerms = payStatus.contractTermsRaw;
 
   if (!contractTerms) {
     return (
diff --git a/src/webex/renderHtml.tsx b/src/webex/renderHtml.tsx
index 767058ebf..3204c410d 100644
--- a/src/webex/renderHtml.tsx
+++ b/src/webex/renderHtml.tsx
@@ -31,6 +31,7 @@ import * as moment from "moment";
 import * as i18n from "./i18n";
 import React from "react";
 import ReactDOM from "react-dom";
+import { stringifyTimestamp } from "../util/time";
 
 /**
  * Render amount as HTML, which non-breaking space between
@@ -215,7 +216,7 @@ function FeeDetailsView(props: {
       <tbody>
         {rci!.wireFees.feesForType[s].map(f => (
           <tr>
-            <td>{moment.unix(Math.floor(f.endStamp.t_ms / 1000)).format("llll")}</td>
+            <td>{stringifyTimestamp(f.endStamp)}</td>
             <td>{renderAmount(f.wireFee)}</td>
             <td>{renderAmount(f.closingFee)}</td>
           </tr>
@@ -239,9 +240,8 @@ function FeeDetailsView(props: {
       <p>
         {i18n.str`Rounding loss:`} {overhead}
       </p>
-      <p>{i18n.str`Earliest expiration (for deposit): ${moment
-        .unix(rci.earliestDepositExpiration.t_ms / 1000)
-        .fromNow()}`}</p>
+      <p>{i18n.str`Earliest expiration (for deposit): ${
+        stringifyTimestamp(rci.earliestDepositExpiration)}`}</p>
       <h3>Coin Fees</h3>
       <div style={{ overflow: "auto" }}>
         <table className="pure-table">
diff --git a/src/webex/wxBackend.ts b/src/webex/wxBackend.ts
index 97774a5c2..ae12f9f91 100644
--- a/src/webex/wxBackend.ts
+++ b/src/webex/wxBackend.ts
@@ -25,8 +25,8 @@
  */
 import { BrowserCryptoWorkerFactory } from "../crypto/workers/cryptoApi";
 import { deleteTalerDatabase, openTalerDatabase, WALLET_DB_VERSION } from "../db";
-import { ConfirmReserveRequest, CreateReserveRequest, ReturnCoinsRequest, WalletDiagnostics } from "../types/walletTypes";
-import { AmountJson } from "../util/amounts";
+import { ConfirmReserveRequest, CreateReserveRequest, ReturnCoinsRequest, WalletDiagnostics, codecForCreateReserveRequest, codecForConfirmReserveRequest } from "../types/walletTypes";
+import { AmountJson, codecForAmountJson } from "../util/amounts";
 import { BrowserHttpLib } from "../util/http";
 import { OpenedPromise, openPromise } from "../util/promiseUtils";
 import { classifyTalerUri, TalerUriType } from "../util/taleruri";
@@ -91,14 +91,14 @@ async function handleMessage(
         exchange: detail.exchange,
         senderWire: detail.senderWire,
       };
-      const req = CreateReserveRequest.checked(d);
+      const req = codecForCreateReserveRequest().decode(d);
       return needsWallet().createReserve(req);
     }
     case "confirm-reserve": {
       const d = {
         reservePub: detail.reservePub,
       };
-      const req = ConfirmReserveRequest.checked(d);
+      const req = codecForConfirmReserveRequest().decode(d);
       return needsWallet().confirmReserve(req);
     }
     case "confirm-pay": {
@@ -117,7 +117,7 @@ async function handleMessage(
       if (!detail.baseUrl || typeof detail.baseUrl !== "string") {
         return Promise.resolve({ error: "bad url" });
       }
-      const amount = AmountJson.checked(detail.amount);
+      const amount = codecForAmountJson().decode(detail.amount);
       return needsWallet().getWithdrawDetailsForAmount(detail.baseUrl, amount);
     }
     case "get-history": {
-- 
cgit v1.2.3