Beneficiaries: Correct handle retry step, show bank name

.github/workflows/pull-request.yml

@@ -21,8 +21,7 @@ jobs:
 
       - name: Get node version
         id: node
-        run: |
-          echo "::set-output name=version::$(node -v)"
+        run: echo "version=$(node -v)" >> "$GITHUB_OUTPUT"
 
       - name: Get node_modules cache
         uses: actions/cache@v4

packages/blockchain-wallet-v4-frontend/src/components/Flyout/model.tsx

@@ -557,7 +557,7 @@ const renderBankText = (
 ): string | ReactElement => {
   if ('agent' in value) {
     // BeneficiaryType
-    return value.name
+    return value.agent.bankName ?? value.name
   }
   if ('details' in value && value.details?.bankName) {
     // BankTransferAccountType | BSPaymentMethodType
@@ -901,7 +901,7 @@ const BankWire = ({
     </Col>
     <Col style={{ width: '100%' }}>
       <Content>
-        <Value asTitle>{beneficiary.name}</Value>
+        <Value asTitle>{beneficiary.agent.bankName ?? beneficiary.name}</Value>
         <Title asValue>Wire Account ending in {beneficiary.address.slice(-4)}</Title>
 
         {type === 'DEPOSIT' && (

packages/blockchain-wallet-v4-frontend/src/modals/Brokerage/Banks/Withdraw/AddBankWireForm/Steps/Failure.tsx

@@ -1,29 +1,22 @@
 import React from 'react'
-import { useDispatch, useSelector } from 'react-redux'
+import { useDispatch } from 'react-redux'
 import { destroy } from 'redux-form'
 
 import { Button, Icon, Text } from 'blockchain-info-components'
 import FlyoutFooter from 'components/Flyout/Footer'
 import { modals } from 'data/actions'
-import { setDWStep } from 'data/components/brokerage/slice'
-import { getModals } from 'data/modals/selectors'
-import { BankDWStepType, ModalName } from 'data/types'
+import { ModalName } from 'data/types'
 
 import { Header } from '../Header'
 import { WIRE_BANK_FORM } from './constants'
 import { FinalStatusWrapper } from './StepsStyles'
 
 const Failure = ({ message, title }: { message?: string; title?: string }) => {
   const dispatch = useDispatch()
-  const openModals = useSelector(getModals)
 
   const onConfirm = () => {
     dispatch(destroy(WIRE_BANK_FORM))
-    if (openModals.find((m) => m.props.origin === 'AddBankModalSettings')) {
-      dispatch(modals.closeModal(ModalName.BANK_DEPOSIT_MODAL))
-    } else {
-      dispatch(setDWStep({ dwStep: BankDWStepType.DEPOSIT_METHODS }))
-    }
+    dispatch(modals.closeModal(ModalName.BANK_DEPOSIT_MODAL))
   }
 
   return (

packages/blockchain-wallet-v4-frontend/src/modals/Brokerage/Banks/Withdraw/AddBankWireForm/Steps/Success.tsx

@@ -5,13 +5,14 @@ import { destroy } from 'redux-form'
 import { WalletFiatType } from '@core/types'
 import { Button, Icon, Text } from 'blockchain-info-components'
 import FlyoutFooter from 'components/Flyout/Footer'
-import { components, modals } from 'data/actions'
+import { modals } from 'data/actions'
 import { getModals } from 'data/modals/selectors'
 import { ModalName, WithdrawStepEnum } from 'data/types'
 
 import { Header } from '../Header'
 import { WIRE_BANK_FORM } from './constants'
 import { FinalStatusWrapper } from './StepsStyles'
+import { withdraw } from 'data/components/actions'
 
 type Props = { bankName: string; fiatCurrency: WalletFiatType }
 
@@ -25,7 +26,7 @@ const Success = ({ bankName, fiatCurrency }: Props) => {
 
     if (!openModals.find((m) => m.props.origin === 'AddBankModalSettings')) {
       dispatch(
-        components.withdraw.setStep({
+        withdraw.setStep({
           fiatCurrency,
           step: WithdrawStepEnum.BANK_PICKER
         })

packages/blockchain-wallet-v4-frontend/src/scenes/Settings/General/LinkedWireBanks/index.tsx

@@ -1,7 +1,6 @@
 import React, { useEffect } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 
-import { BeneficiariesType, BSPaymentMethodsType } from '@core/types'
 import { custodial } from 'data/actions'
 import { brokerage, buySell } from 'data/components/actions'
 import { getFiatCurrency } from 'data/components/withdraw/selectors'
@@ -11,11 +10,6 @@ import { getData } from './selectors'
 import Loading from './template.loading'
 import Success from './template.success'
 
-type DataType = {
-  beneficiaries: BeneficiariesType
-  paymentMethods: BSPaymentMethodsType
-}
-
 const LinkedWireBanks = () => {
   const { data, hasError, isLoading, isNotAsked } = useRemote(getData)
   const fiatCurrency = useSelector(getFiatCurrency)

packages/blockchain-wallet-v4-frontend/src/scenes/Settings/General/LinkedWireBanks/selectors.ts

@@ -1,11 +1,6 @@
 import { lift } from 'ramda'
 
-import {
-  BeneficiariesType,
-  BSPaymentMethodsType,
-  ExtractSuccess,
-  RemoteDataType
-} from '@core/types'
+import { BeneficiariesType, BSPaymentMethodsType, RemoteDataType } from '@core/types'
 import { selectors } from 'data'
 import { RootState } from 'data/rootReducer'
 

packages/blockchain-wallet-v4-frontend/src/scenes/Settings/General/LinkedWireBanks/template.success.tsx

@@ -93,7 +93,7 @@ const Success: React.FC<InjectedFormProps<{}, Props> & Props> = ({
               <ItemWrapper key={beneficiary.id} onClick={() => onBankClick(beneficiary)}>
                 <StandardRow
                   icon={<Image name={getBankLogoImageName(beneficiary.agent)} />}
-                  topLeftText={beneficiary.name}
+                  topLeftText={beneficiary.agent.bankName ?? beneficiary.name}
                   topRightText={beneficiary.address}
                   bottomLeftText={
                     availableAmount && (