From c265e7d019d445add2d2cfb7cfcbdeee059684d3 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Tue, 29 Mar 2022 13:47:32 +0200
Subject: wallet: make retries more robust and consistent

---
 packages/taler-wallet-core/src/operations/pending.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'packages/taler-wallet-core/src/operations/pending.ts')

diff --git a/packages/taler-wallet-core/src/operations/pending.ts b/packages/taler-wallet-core/src/operations/pending.ts
index 71b8b34f4..b89c7c640 100644
--- a/packages/taler-wallet-core/src/operations/pending.ts
+++ b/packages/taler-wallet-core/src/operations/pending.ts
@@ -51,18 +51,17 @@ async function gatherExchangePending(
     resp.pendingOperations.push({
       type: PendingTaskType.ExchangeUpdate,
       givesLifeness: false,
-      timestampDue: e.lastError
-        ? e.retryInfo.nextRetry
-        : AbsoluteTime.fromTimestamp(e.nextUpdate),
+      timestampDue:
+        e.retryInfo?.nextRetry ?? AbsoluteTime.fromTimestamp(e.nextUpdate),
       exchangeBaseUrl: e.baseUrl,
       lastError: e.lastError,
     });
 
     resp.pendingOperations.push({
       type: PendingTaskType.ExchangeCheckRefresh,
-      timestampDue: e.lastError
-        ? e.retryInfo.nextRetry
-        : AbsoluteTime.fromTimestamp(e.nextRefreshCheck),
+      timestampDue:
+        e.retryInfo?.nextRetry ??
+        AbsoluteTime.fromTimestamp(e.nextRefreshCheck),
       givesLifeness: false,
       exchangeBaseUrl: e.baseUrl,
     });
-- 
cgit v1.2.3