gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-wallet-core] 03/05: fix currency link in history, hide auto-open


From: gnunet
Subject: [taler-wallet-core] 03/05: fix currency link in history, hide auto-open wallet, fix space
Date: Mon, 03 Apr 2023 17:29:38 +0200

This is an automated email from the git hooks/post-receive script.

sebasjm pushed a commit to branch master
in repository wallet-core.

commit d9c39f53d6870bfd59eed6a75ffb0ce4c94a4582
Author: Sebastian <sebasjm@gmail.com>
AuthorDate: Mon Apr 3 12:14:05 2023 -0300

    fix currency link in history, hide auto-open wallet, fix space
---
 .../src/wallet/Application.tsx                     |  3 +-
 .../src/wallet/History.stories.tsx                 |  1 +
 .../src/wallet/Settings.tsx                        | 53 +++++++++++-----------
 .../src/wallet/Transaction.stories.tsx             |  1 +
 .../src/wallet/Transaction.tsx                     |  2 +-
 5 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/packages/taler-wallet-webextension/src/wallet/Application.tsx 
b/packages/taler-wallet-webextension/src/wallet/Application.tsx
index fc8ddb804..4a5ef30eb 100644
--- a/packages/taler-wallet-webextension/src/wallet/Application.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/Application.tsx
@@ -136,12 +136,13 @@ export function Application(): VNode {
 
             <Route
               path={Pages.balanceHistory.pattern}
-              component={() => (
+              component={({ currency }: { currency?: string }) => (
                 <WalletTemplate
                   path="balance"
                   goToTransaction={redirectToTxInfo}
                 >
                   <HistoryPage
+                    currency={currency}
                     goToWalletDeposit={(currency: string) =>
                       redirectTo(Pages.sendCash({ amount: `${currency}:0` }))
                     }
diff --git a/packages/taler-wallet-webextension/src/wallet/History.stories.tsx 
b/packages/taler-wallet-webextension/src/wallet/History.stories.tsx
index e7dcc18f4..5fc03e0a7 100644
--- a/packages/taler-wallet-webextension/src/wallet/History.stories.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/History.stories.tsx
@@ -75,6 +75,7 @@ const exampleData = {
     ...commonTransaction(),
     amountEffective: "USD:11",
     type: TransactionType.Payment,
+    posConfirmation: undefined,
     info: {
       contractTermsHash: "ASDZXCASD",
       merchant: {
diff --git a/packages/taler-wallet-webextension/src/wallet/Settings.tsx 
b/packages/taler-wallet-webextension/src/wallet/Settings.tsx
index d65f3a095..3109e8947 100644
--- a/packages/taler-wallet-webextension/src/wallet/Settings.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/Settings.tsx
@@ -115,21 +115,6 @@ export function SettingsView({
   return (
     <Fragment>
       <section>
-        <SubTitle>
-          <i18n.Translate>Navigator</i18n.Translate>
-        </SubTitle>
-        <Checkbox
-          label={i18n.str`Automatically open wallet based on page content`}
-          name="autoOpen"
-          description={
-            <i18n.Translate>
-              Enabling this option below will make using the wallet faster, but
-              requires more permissions from your browser.
-            </i18n.Translate>
-          }
-          enabled={autoOpenToggle.value!}
-          onToggle={autoOpenToggle.button.onClick!}
-        />
         {/* <Checkbox
           label={
             i18n.str`Automatically check clipboard for Taler URI`
@@ -225,17 +210,6 @@ export function SettingsView({
           </LinkPrimary>
         </div>
 
-        <SubTitle>
-          <i18n.Translate>Troubleshooting</i18n.Translate>
-        </SubTitle>
-        <Checkbox
-          label={i18n.str`Developer mode`}
-          name="devMode"
-          description={i18n.str`More options and information useful for 
debugging`}
-          enabled={devModeToggle.value!}
-          onToggle={devModeToggle.button.onClick!}
-        />
-
         <JustInDevMode>
           <SubTitle>
             <i18n.Translate>Display</i18n.Translate>
@@ -289,6 +263,33 @@ export function SettingsView({
             />
           </JustInDevMode>
         )}
+        <SubTitle>
+          <i18n.Translate>Troubleshooting</i18n.Translate>
+        </SubTitle>
+        <Checkbox
+          label={i18n.str`Developer mode`}
+          name="devMode"
+          description={i18n.str`More options and information useful for 
debugging`}
+          enabled={devModeToggle.value!}
+          onToggle={devModeToggle.button.onClick!}
+        />
+        <JustInDevMode>
+          <SubTitle>
+            <i18n.Translate>Navigator</i18n.Translate>
+          </SubTitle>
+          <Checkbox
+            label={i18n.str`Automatically open wallet based on page content`}
+            name="autoOpen"
+            description={
+              <i18n.Translate>
+                Enabling this option below will make using the wallet faster,
+                but requires more permissions from your browser.
+              </i18n.Translate>
+            }
+            enabled={autoOpenToggle.value!}
+            onToggle={autoOpenToggle.button.onClick!}
+          />
+        </JustInDevMode>
       </section>
     </Fragment>
   );
diff --git 
a/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx 
b/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx
index b2922de22..d338b77f5 100644
--- a/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx
@@ -89,6 +89,7 @@ const exampleData = {
     ...commonTransaction,
     amountEffective: "KUDOS:12",
     type: TransactionType.Payment,
+    posConfirmation: undefined,
     info: {
       contractTermsHash: "ASDZXCASD",
       merchant: {
diff --git a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx 
b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
index 58e50e7b6..d34e57f58 100644
--- a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
@@ -486,7 +486,7 @@ export function TransactionView({
               <InfoBox>
                 <div style={{ display: "block" }}>
                   <i18n.Translate>
-                    Wire transfer need a confirmation. Go to the
+                    Wire transfer need a confirmation. Go to the{" "}
                     <a
                       href={transaction.withdrawalDetails.bankConfirmationUrl}
                       target="_blank"

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]