Merge branch 'master' into age-withdraw

packages/taler-wallet-core/src/versions.ts

@@ -26,7 +26,7 @@ export const WALLET_EXCHANGE_PROTOCOL_VERSION = "17:0:0";
  *
  * Uses libtool's current:revision:age versioning.
  */
-export const WALLET_MERCHANT_PROTOCOL_VERSION = "2:0:1";
+export const WALLET_MERCHANT_PROTOCOL_VERSION = "5:0:1";
 
 /**
  * Protocol version spoken with the bank.
@@ -40,5 +40,4 @@ export const WALLET_BANK_INTEGRATION_PROTOCOL_VERSION = "0:0:0";
  * Will be replaced with the value from package.json in a
  * post-compilation step (inside lib/).
  */
-export const WALLET_CORE_IMPLEMENTATION_VERSION =
-  "__WALLET_CORE_IMPLEMENTATION_VERSION__";
+export const WALLET_CORE_IMPLEMENTATION_VERSION = "0:0:0";

packages/taler-wallet-webextension/src/wallet/Settings.tsx

@@ -17,6 +17,7 @@
 import {
   ExchangeListItem,
   ExchangeTosStatus,
+  LibtoolVersion,
   TranslatedString,
   WalletCoreVersion,
 } from "@gnu-taler/taler-util";
@@ -34,17 +35,18 @@ import {
   LinkPrimary,
   SubTitle,
   SuccessText,
+  WarningBox,
   WarningText,
 } from "../components/styled/index.js";
 import { useAlertContext } from "../context/alert.js";
 import { useBackendContext } from "../context/backend.js";
 import { useAsyncAsHook } from "../hooks/useAsyncAsHook.js";
 import { useBackupDeviceName } from "../hooks/useBackupDeviceName.js";
-import { useClipboardPermissions } from "../hooks/useClipboardPermissions.js";
 import { useSettings } from "../hooks/useSettings.js";
 import { ToggleHandler } from "../mui/handlers.js";
-import { platform } from "../platform/foreground.js";
 import { Settings } from "../platform/api.js";
+import { platform } from "../platform/foreground.js";
+import { WALLET_CORE_SUPPORTED_VERSION } from "../wxApi.js";
 
 const GIT_HASH = typeof __GIT_HASH__ !== "undefined" ? __GIT_HASH__ : undefined;
 
@@ -206,7 +208,14 @@ export function SettingsView({
           </LinkPrimary>
         </div>
 
-        {coreVersion && (
+
+        {coreVersion && (<Fragment>
+          {LibtoolVersion.compare(coreVersion.version, WALLET_CORE_SUPPORTED_VERSION)?.compatible ? undefined :
+            <WarningBox>
+              <i18n.Translate>
+                The version of wallet core is not supported. (supported version: {WALLET_CORE_SUPPORTED_VERSION})
+              </i18n.Translate>
+            </WarningBox>}
           <EnabledBySettings name="advanceMode">
             <Part
               title={i18n.str`Exchange compatibility`}
@@ -220,7 +229,12 @@ export function SettingsView({
               title={i18n.str`Bank compatibility`}
               text={<span>{coreVersion.bank}</span>}
             />
+            <Part
+              title={i18n.str`Wallet Core compatibility`}
+              text={<span>{coreVersion.version}</span>}
+            />
           </EnabledBySettings>
+        </Fragment>
         )}
         <SubTitle>
           <i18n.Translate>Advance mode</i18n.Translate>

packages/taler-wallet-webextension/src/wxApi.ts

@@ -53,6 +53,8 @@ import { platform } from "./platform/foreground.js";
 
 const logger = new Logger("wxApi");
 
+export const WALLET_CORE_SUPPORTED_VERSION = "0:0:0"
+
 export interface ExtendedPermissionsResponse {
   newValue: boolean;
 }