taler-typescript-core

commit 137645115a79df73d87c59f6ab420ea2fa1ddd47
parent 030f1bf38f1e4178894197e94988d8ec949634fd
Author: Florian Dold <florian@dold.me>
Date:   Thu, 22 Feb 2024 13:15:34 +0100

webextension: put all version info in one place

Diffstat:
M
packages/taler-wallet-webextension/src/wallet/Settings.tsx
 | 
72
++++++++++++++++++++++++++++++++++--------------------------------------

1 file changed, 34 insertions(+), 38 deletions(-)
diff --git a/packages/taler-wallet-webextension/src/wallet/Settings.tsx b/packages/taler-wallet-webextension/src/wallet/Settings.tsx
@@ -245,43 +245,6 @@ export function SettingsView({
             <i18n.Translate>Add an exchange</i18n.Translate>
           </LinkPrimary>
         </div>
-
-        {coreVersion && (
-          <Fragment>
-            <SubTitle>
-              <i18n.Translate>Version Info</i18n.Translate>
-            </SubTitle>
-            {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`}
-                text={<span>{coreVersion.exchange}</span>}
-              />
-              <Part
-                title={i18n.str`Merchant compatibility`}
-                text={<span>{coreVersion.merchant}</span>}
-              />
-              <Part
-                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>Advanced mode</i18n.Translate>
         </SubTitle>
@@ -324,7 +287,7 @@ export function SettingsView({
           onToggle={autoOpenToggle.button.onClick!}
         />
         <SubTitle>
-          <i18n.Translate>Version</i18n.Translate>
+          <i18n.Translate>Version Info</i18n.Translate>
         </SubTitle>
         <Part
           title={i18n.str`Web Extension`}
@@ -337,6 +300,39 @@ export function SettingsView({
             </span>
           }
         />
+        {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`}
+                text={<span>{coreVersion.exchange}</span>}
+              />
+              <Part
+                title={i18n.str`Merchant compatibility`}
+                text={<span>{coreVersion.merchant}</span>}
+              />
+              <Part
+                title={i18n.str`Bank compatibility`}
+                text={<span>{coreVersion.bank}</span>}
+              />
+              <Part
+                title={i18n.str`Wallet Core compatibility`}
+                text={<span>{coreVersion.version}</span>}
+              />
+            </EnabledBySettings>
+          </Fragment>
+        )}
       </section>
     </Fragment>
   );