taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

nicely show version if there is a mismatch

Browse Source
This commit is contained in:
Florian Dold 2017-12-08 16:51:44 +01:00
parent 289d2cb572
commit 2e48d83b2b
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/types.ts
View File

@ -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;
}

2
src/wallet.ts
View File

@ -1645,6 +1645,8 @@ export class Wallet {
wireFees,
wireInfo,
withdrawFee: acc,
exchangeVersion: exchangeInfo.protocolVersion || "unknown",
walletVersion: WALLET_PROTOCOL_VERSION,
};
return ret;
}

8
src/webex/pages/confirm-create-reserve.tsx
View File

@ -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>
);
}