From 538f27e9dd5f55004e1fd1849ec7939afbec5c88 Mon Sep 17 00:00:00 2001
From: Sebastian <sebasjm@gmail.com>
Date: Thu, 29 Sep 2022 10:05:17 -0300
Subject: fix #7332

---
 .../src/components/BankDetailsByPaytoType.tsx                 | 11 ++++++-----
 packages/taler-wallet-webextension/src/wallet/Transaction.tsx |  6 ++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'packages')

diff --git a/packages/taler-wallet-webextension/src/components/BankDetailsByPaytoType.tsx b/packages/taler-wallet-webextension/src/components/BankDetailsByPaytoType.tsx
index 06a91f039..3283723e4 100644
--- a/packages/taler-wallet-webextension/src/components/BankDetailsByPaytoType.tsx
+++ b/packages/taler-wallet-webextension/src/components/BankDetailsByPaytoType.tsx
@@ -45,6 +45,11 @@ export function BankDetailsByPaytoType({
 
   if (payto.isKnown && payto.targetType === "bitcoin") {
     const min = segwitMinAmount(amount.currency);
+    const addrs = payto.segwitAddrs.map(
+      (a) => `${a} ${Amounts.stringifyValue(min)}`,
+    );
+    addrs.unshift(`${payto.targetPath} ${Amounts.stringifyValue(amount)}`);
+    const copyContent = addrs.join("\n");
     return (
       <section
         style={{
@@ -85,11 +90,7 @@ export function BankDetailsByPaytoType({
             </td>
             <td></td>
             <td>
-              <CopyButton
-                getContent={() =>
-                  `${payto.targetPath} ${Amounts.stringifyValue(amount)} BTC`
-                }
-              />
+              <CopyButton getContent={() => copyContent} />
             </td>
           </tr>
         </table>
diff --git a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
index 8e479f988..c95b79fbc 100644
--- a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
@@ -116,8 +116,10 @@ export function TransactionPage({ tid, goToWalletHistory }: Props): VNode {
       onDelete={() =>
         wxApi.deleteTransaction(tid).then(() => goToWalletHistory(currency))
       }
-      onRetry={() =>
-        wxApi.retryTransaction(tid).then(() => goToWalletHistory(currency))
+      onRetry={async () =>
+        await wxApi
+          .retryTransaction(tid)
+          .then(() => goToWalletHistory(currency))
       }
       onRefund={(id) => wxApi.applyRefundFromPurchaseId(id).then()}
       onBack={() => goToWalletHistory(currency)}
-- 
cgit v1.2.3