fix AML spa memo and fix #8615

2 files changed, 11 insertions, 4 deletions

diff --git a/packages/taler-wallet-webextension/src/components/BankDetailsByPaytoType.tsx b/packages/taler-wallet-webextension/src/components/BankDetailsByPaytoType.tsx
index 3bcf2d6ba..007c840c6 100644
--- a/packages/taler-wallet-webextension/src/components/BankDetailsByPaytoType.tsx
+++ b/packages/taler-wallet-webextension/src/components/BankDetailsByPaytoType.tsx
@@ -42,14 +42,19 @@ export interface BankDetailsProps {
 export function BankDetailsByPaytoType({
   subject,
   amount,
-  accounts,
+  accounts: unsortedAccounts,
 }: BankDetailsProps): VNode {
   const { i18n } = useTranslationContext();
   const [index, setIndex] = useState(0)
-  // const [currency, setCurrency] = useState(amount.currency)
-  if (!accounts.length) {
+
+  if (!unsortedAccounts.length) {
     return <div>the exchange account list is empty</div>
   }
+
+  const accounts = unsortedAccounts.sort((a, b) => {
+    return (b.priority ?? 0) - (a.priority ?? 0)
+  })
+
   const selectedAccount = accounts[index];
   const altCurrency = selectedAccount.currencySpecification?.name
 
@@ -83,12 +88,13 @@ export function BankDetailsByPaytoType({
       {accounts.length > 1 ?
         <Fragment>
           {accounts.map((ac, acIdx) => {
+            const accountLabel = ac.bankLabel ?? `Account #${acIdx + 1}`
             return <Button key={acIdx} variant={acIdx === index ? "contained" : "outlined"}
               onClick={async () => {
                 setIndex(acIdx)
               }}
             >
-              <i18n.Translate>Account #{acIdx+1} ({ac.currencySpecification?.name ?? amount.currency})</i18n.Translate>
+              {accountLabel} ({ac.currencySpecification?.name ?? amount.currency})
             </Button>
           })}
 
diff --git a/packages/taler-wallet-webextension/src/cta/Withdraw/state.ts b/packages/taler-wallet-webextension/src/cta/Withdraw/state.ts
index 51859d6a7..7486d5f97 100644
--- a/packages/taler-wallet-webextension/src/cta/Withdraw/state.ts
+++ b/packages/taler-wallet-webextension/src/cta/Withdraw/state.ts
@@ -454,6 +454,7 @@ function exchangeSelectionState(
       altCurrencies.length === 0
         ? []
         : [toBeReceived.currency, ...altCurrencies];
+
     const convAccount = amountHook.response.accounts.find((c) => {
       return (
         c.currencySpecification &&