From 64488a55931fa73bb8e216fa068b33fefd9f6c3a Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 29 May 2022 01:42:35 -0300 Subject: use logo, website and emai in purchase details --- .../src/wallet/Transaction.stories.tsx | 2 +- .../src/wallet/Transaction.tsx | 40 ++++++++++++++++++++- .../static-dev/merchant-icon-11.jpeg | Bin 60184 -> 0 bytes .../static-dev/merchant-icon.jpeg | Bin 0 -> 60184 bytes 4 files changed, 40 insertions(+), 2 deletions(-) delete mode 100644 packages/taler-wallet-webextension/static-dev/merchant-icon-11.jpeg create mode 100644 packages/taler-wallet-webextension/static-dev/merchant-icon.jpeg (limited to 'packages') diff --git a/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx b/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx index 83848d005..89b42706f 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 8165953ab..1170c9222 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({ )} Merchant} - text={transaction.info.merchant.name} + text={ + +
+ {transaction.info.merchant.logo && ( +
+ +
+ )} +
+

{transaction.info.merchant.name}

+ {transaction.info.merchant.website && ( + + + {transaction.info.merchant.website} + + + )} + {transaction.info.merchant.email && ( + + + {transaction.info.merchant.email} + + + )} +
+
+
+ } kind="neutral" />