Refactored consideredUtxo for forward compatibility

joinmarket-webui · Aug 20, 2024 · bb30c98 · bb30c98
1 parent e8382b4
commit bb30c98
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/components/Send/SendForm.tsx b/src/components/Send/SendForm.tsx
@@ -26,7 +26,7 @@ import {
   isValidNumCollaborators,
 } from './helpers'
 import { AccountBalanceSummary } from '../../context/BalanceSummary'
-import { WalletInfo, CurrentWallet, Utxos } from '../../context/WalletContext'
+import { WalletInfo, CurrentWallet } from '../../context/WalletContext'
 import { useSettings } from '../../context/SettingsContext'
 import styles from './SendForm.module.css'
 import { TxFeeInputField, validateTxFee } from '../settings/TxFeeInputField'
@@ -214,7 +214,7 @@ export interface SendFormValues {
   txFee?: TxFee
   isCoinJoin: boolean
   numCollaborators?: number
-  consideredUtxos?: Utxos
+  consideredUtxos?: string[]
 }
 
 interface InnerSendFormProps {

diff --git a/src/components/Send/index.tsx b/src/components/Send/index.tsx
@@ -542,9 +542,17 @@ export default function Send({ wallet }: SendProps) {
             feeConfigValues: { ...feeConfigValues, tx_fees: showConfirmSendModal.txFee },
           }}
         >
-          {showConfirmSendModal.amount!.isSweep && showConfirmSendModal.consideredUtxos && (
-            <ReviewConsideredUtxos utxos={showConfirmSendModal.consideredUtxos} />
-          )}
+          {showConfirmSendModal.amount?.isSweep &&
+            showConfirmSendModal.consideredUtxos &&
+            walletInfo &&
+            showConfirmSendModal.sourceJarIndex !== undefined &&
+            (() => {
+              const selectedUtxosList = showConfirmSendModal.consideredUtxos
+              const utxoList = walletInfo.utxosByJar[showConfirmSendModal.sourceJarIndex].filter((utxo) =>
+                selectedUtxosList.some((selectedUtxos) => selectedUtxos === utxo.utxo),
+              )
+              return <ReviewConsideredUtxos utxos={utxoList} />
+            })()}
         </PaymentConfirmModal>
       )}
     </div>