gnunet-svn
[Top][All Lists]
Advanced

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

[taler-wallet-core] branch master updated: use logo, website and emai in


From: gnunet
Subject: [taler-wallet-core] branch master updated: use logo, website and emai in purchase details
Date: Sun, 29 May 2022 06:42:43 +0200

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

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

The following commit(s) were added to refs/heads/master by this push:
     new 64488a55 use logo, website and emai in purchase details
64488a55 is described below

commit 64488a55931fa73bb8e216fa068b33fefd9f6c3a
Author: Sebastian <sebasjm@gmail.com>
AuthorDate: Sun May 29 01:42:35 2022 -0300

    use logo, website and emai in purchase details
---
 .../src/wallet/Transaction.stories.tsx             |   2 +-
 .../src/wallet/Transaction.tsx                     |  40 ++++++++++++++++++++-
 .../{merchant-icon-11.jpeg => merchant-icon.jpeg}  | Bin
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git 
a/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx 
b/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx
index 83848d00..89b42706 100644
--- a/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx
@@ -58,7 +58,7 @@ const commonTransaction = {
   transactionId: "12",
 } as TransactionCommon;
 
-import merchantIcon from "../../static-dev/merchant-icon-11.jpeg";
+import merchantIcon from "../../static-dev/merchant-icon.jpeg";
 
 const exampleData = {
   withdraw: {
diff --git a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx 
b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
index 8165953a..1170c922 100644
--- a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
@@ -396,7 +396,45 @@ export function TransactionView({
         )}
         <Part
           title={<i18n.Translate>Merchant</i18n.Translate>}
-          text={transaction.info.merchant.name}
+          text={
+            <Fragment>
+              <div style={{ display: "flex", flexDirection: "row" }}>
+                {transaction.info.merchant.logo && (
+                  <div>
+                    <img
+                      src={transaction.info.merchant.logo}
+                      style={{ width: 64, height: 64, margin: 4 }}
+                    />
+                  </div>
+                )}
+                <div>
+                  <p>{transaction.info.merchant.name}</p>
+                  {transaction.info.merchant.website && (
+                    <a
+                      href={transaction.info.merchant.website}
+                      target="_blank"
+                      style={{ textDecorationColor: "gray" }}
+                      rel="noreferrer"
+                    >
+                      <SmallLightText>
+                        {transaction.info.merchant.website}
+                      </SmallLightText>
+                    </a>
+                  )}
+                  {transaction.info.merchant.email && (
+                    <a
+                      href={`mailto:${transaction.info.merchant.email}`}
+                      style={{ textDecorationColor: "gray" }}
+                    >
+                      <SmallLightText>
+                        {transaction.info.merchant.email}
+                      </SmallLightText>
+                    </a>
+                  )}
+                </div>
+              </div>
+            </Fragment>
+          }
           kind="neutral"
         />
         <Part
diff --git 
a/packages/taler-wallet-webextension/static-dev/merchant-icon-11.jpeg 
b/packages/taler-wallet-webextension/static-dev/merchant-icon.jpeg
similarity index 100%
rename from packages/taler-wallet-webextension/static-dev/merchant-icon-11.jpeg
rename to packages/taler-wallet-webextension/static-dev/merchant-icon.jpeg

-- 
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]