From 2e48d83b2bf01a79c882178976080dd6b75e4a30 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Fri, 8 Dec 2017 16:51:44 +0100
Subject: nicely show version if there is a mismatch

---
 src/types.ts                               | 11 +++++++++++
 src/wallet.ts                              |  2 ++
 src/webex/pages/confirm-create-reserve.tsx |  8 ++++----
 3 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/types.ts b/src/types.ts
index 03ba597fe..767474e4a 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -582,6 +582,17 @@ export interface ReserveCreationInfo {
    * Older exchanges don't return version information.
    */
   versionMatch: LibtoolVersion.VersionMatchResult|undefined;
+
+  /**
+   * Libtool-style version string for the exchange or "unknown"
+   * for older exchanges.
+   */
+  exchangeVersion: string;
+
+  /**
+   * Libtool-style version string for the wallet.
+   */
+  walletVersion: string;
 }
 
 
diff --git a/src/wallet.ts b/src/wallet.ts
index 14c614e6c..56120638d 100644
--- a/src/wallet.ts
+++ b/src/wallet.ts
@@ -1645,6 +1645,8 @@ export class Wallet {
       wireFees,
       wireInfo,
       withdrawFee: acc,
+      exchangeVersion: exchangeInfo.protocolVersion || "unknown",
+      walletVersion: WALLET_PROTOCOL_VERSION,
     };
     return ret;
   }
diff --git a/src/webex/pages/confirm-create-reserve.tsx b/src/webex/pages/confirm-create-reserve.tsx
index 53b0d635f..87e0b273f 100644
--- a/src/webex/pages/confirm-create-reserve.tsx
+++ b/src/webex/pages/confirm-create-reserve.tsx
@@ -273,16 +273,16 @@ class ExchangeSelection extends ImplicitStateComponent<ExchangeSelectionProps> {
     if (rci.versionMatch.currentCmp === -1) {
       return (
         <p className="errorbox">
-          Your wallet might be outdated.  The exchange has a higher, incompatible
-          protocol version.
+          Your wallet (protocol version <span>{rci.walletVersion}</span>) might be outdated.  The exchange has a higher, incompatible
+          protocol version (<span>{rci.exchangeVersion}</span>).
         </p>
       );
     }
     if (rci.versionMatch.currentCmp === 1) {
       return (
         <p className="errorbox">
-          The chosen exchange might be outdated.  The exchange has a lower, incompatible
-          protocol version.
+          The chosen exchange (protocol version <span>{rci.exchangeVersion}</span> might be outdated.  The exchange has a lower, incompatible
+          protocol version than your wallet (protocol version <span>{rci.walletVersion}</span>).
         </p>
       );
     }
-- 
cgit v1.2.3