feat(wires): refresh list when returning, minor fixes (#6244)

blockchain · Jan 19, 2024 · 3968ac5 · 3968ac5
1 parent 33bbabc
commit 3968ac5
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 26 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/brokerage/sagas.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/brokerage/sagas.ts
@@ -50,6 +50,7 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
   }: ReturnType<typeof A.deleteSavedBank>) {
     try {
       yield put(actions.form.startSubmit('linkedBanks'))
+      yield put(actions.modals.closeModal(ModalName.REMOVE_BANK_MODAL))
       yield call(api.deleteSavedAccount, bankId, bankType)
       if (bankType === 'banktransfer') {
         yield put(A.fetchBankTransferAccounts())
@@ -61,10 +62,9 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
           actions.custodial.fetchCustodialBeneficiariesFailure.type
         ])
       }
+      yield put(actions.modals.closeModal(ModalName.BANK_DETAILS_MODAL))
       yield put(actions.form.stopSubmit('linkedBanks'))
       yield put(actions.alerts.displaySuccess('Bank removed.'))
-      yield put(actions.modals.closeModal(ModalName.BANK_DETAILS_MODAL))
-      yield put(actions.modals.closeModal(ModalName.REMOVE_BANK_MODAL))
     } catch (e) {
       const error = errorHandler(e)
       yield put(actions.form.stopSubmit('linkedBanks', { _error: error }))

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/Brokerage/Banks/BankDetails/index.tsx b/packages/blockchain-wallet-v4-frontend/src/modals/Brokerage/Banks/BankDetails/index.tsx
@@ -1,5 +1,4 @@
 import React, { useEffect, useState } from 'react'
-import { compose } from 'redux'
 
 import Flyout, { duration, FlyoutChild } from 'components/Flyout'
 import { ModalName } from 'data/types'
@@ -43,6 +42,4 @@ const BankDetails = (props: BankDetailsModalProps & ModalPropsType) => {
   )
 }
 
-const enhance = compose(ModalEnhancer(ModalName.BANK_DETAILS_MODAL, { transition: duration }))
-
-export default enhance(BankDetails)
+export default ModalEnhancer(ModalName.BANK_DETAILS_MODAL, { transition: duration })(BankDetails)
diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/Brokerage/Banks/RemoveBank/index.tsx b/packages/blockchain-wallet-v4-frontend/src/modals/Brokerage/Banks/RemoveBank/index.tsx
@@ -1,5 +1,4 @@
 import React, { useEffect, useState } from 'react'
-import { compose } from 'redux'
 
 import Flyout, { duration, FlyoutChild } from 'components/Flyout'
 import { ModalName } from 'data/types'
@@ -43,6 +42,6 @@ const RemoveBankFlyout = (props: RemoveBankModalProps & ModalPropsType) => {
   )
 }
 
-const enhance = compose(ModalEnhancer(ModalName.REMOVE_BANK_MODAL, { transition: duration }))
-
-export default enhance(RemoveBankFlyout)
+export default ModalEnhancer(ModalName.REMOVE_BANK_MODAL, { transition: duration })(
+  RemoveBankFlyout
+)
diff --git a/...let-v4-frontend/src/modals/Brokerage/Banks/Withdraw/AddBankWireForm/Steps/StepsStyles.tsx b/...let-v4-frontend/src/modals/Brokerage/Banks/Withdraw/AddBankWireForm/Steps/StepsStyles.tsx
@@ -46,10 +46,10 @@ export const BaseEntry = styled.div`
 export const Entry = ({ leftText, rightText }: { leftText: string; rightText: string }) => (
   <BaseEntry>
     <Text size='16px' color='grey900' weight={600}>
-      {rightText}
+      {leftText}
     </Text>
     <Text size='16px' color='grey600' weight={600}>
-      {leftText}
+      {rightText}
     </Text>
   </BaseEntry>
 )
diff --git a/...-wallet-v4-frontend/src/modals/Brokerage/Banks/Withdraw/AddBankWireForm/Steps/Success.tsx b/...-wallet-v4-frontend/src/modals/Brokerage/Banks/Withdraw/AddBankWireForm/Steps/Success.tsx
@@ -2,30 +2,28 @@ import React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 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 { getFiatCurrency } from 'data/components/withdraw/selectors'
 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'
 
-type Props = { bankName: string }
+type Props = { bankName: string; fiatCurrency: WalletFiatType }
 
-const Success = ({ bankName }: Props) => {
+const Success = ({ bankName, fiatCurrency }: Props) => {
   const dispatch = useDispatch()
-  const fiatCurrency = useSelector(getFiatCurrency)
   const openModals = useSelector(getModals)
 
   const onConfirm = () => {
     dispatch(destroy(WIRE_BANK_FORM))
     dispatch(modals.closeModal(ModalName.BANK_DEPOSIT_MODAL))
-    if (openModals.find((m) => m.props.origin === 'AddBankModalSettings')) {
-      dispatch(modals.closeModal(ModalName.BANK_DEPOSIT_MODAL))
-    } else {
+
+    if (!openModals.find((m) => m.props.origin === 'AddBankModalSettings')) {
       dispatch(
         components.withdraw.setStep({
           fiatCurrency,

diff --git a/...ockchain-wallet-v4-frontend/src/modals/Brokerage/Banks/Withdraw/AddBankWireForm/index.tsx b/...ockchain-wallet-v4-frontend/src/modals/Brokerage/Banks/Withdraw/AddBankWireForm/index.tsx
@@ -5,7 +5,7 @@ import { destroy, formValueSelector, reduxForm } from 'redux-form'
 
 import { getDomains } from '@core/redux/walletOptions/selectors'
 import FlyoutContainer from 'components/Flyout/Container'
-import { actions } from 'data'
+import { components, custodial } from 'data/actions'
 import { getFiatCurrency } from 'data/components/withdraw/selectors'
 import { getUserApiToken } from 'data/modules/profile/selectors'
 import { BankDWStepType } from 'data/types'
@@ -52,7 +52,7 @@ const AddWireBank = () => {
     shallowEqual
   ) as WireBankFormType
 
-  const currency = useSelector(getFiatCurrency)
+  const fiatCurrency = useSelector(getFiatCurrency)
   const nabuToken = useSelector(getUserApiToken)
 
   const {
@@ -63,7 +63,7 @@ const AddWireBank = () => {
 
   const resetForm = () => {
     dispatch(destroy(WIRE_BANK_FORM))
-    dispatch(actions.components.brokerage.setDWStep({ dwStep: BankDWStepType.DEPOSIT_METHODS }))
+    dispatch(components.brokerage.setDWStep({ dwStep: BankDWStepType.DEPOSIT_METHODS }))
   }
 
   const onSubmit = async () => {
@@ -80,7 +80,7 @@ const AddWireBank = () => {
     const payload: FORM_PAYLOAD = {
       accountNumber,
       bankName,
-      currency,
+      currency: fiatCurrency,
       routingNumber
     }
 
@@ -98,6 +98,7 @@ const AddWireBank = () => {
         headers: { 'Content-Type': 'application/json', authorization: `Bearer ${nabuToken}` }
       })
       setStep('SUCCESS')
+      dispatch(custodial.fetchCustodialBeneficiaries({ currency: fiatCurrency }))
     } catch (error) {
       alreadyLinked.current = error.dataFields.description.includes('already exists')
       setStep('FAILURE')
@@ -113,21 +114,23 @@ const AddWireBank = () => {
             onClickBack={() => setStep('USER_INFO')}
           />
         )
-      case 'CONFIRM_DATA':
+      case 'CONFIRM_DATA': {
         const prevStep =
           formValues.hasIntermediaryBank === 'YES' ? 'INTERMEDIARY_INFO' : 'USER_INFO'
         return <ConfirmData onNextStep={() => onSubmit()} onClickBack={() => setStep(prevStep)} />
+      }
       case 'LOADING':
         return <Loading />
       case 'SUCCESS':
-        return <Success bankName={formValues?.bankName ?? ''} />
+        return <Success bankName={formValues?.bankName ?? ''} fiatCurrency={fiatCurrency} />
       case 'FAILURE':
         return <Failure alreadyLinked={alreadyLinked.current} />
       case 'USER_INFO':
-      default:
+      default: {
         const nextStep =
           formValues.hasIntermediaryBank === 'YES' ? 'INTERMEDIARY_INFO' : 'CONFIRM_DATA'
         return <EnterUserData onNextStep={() => setStep(nextStep)} onClickBack={resetForm} />
+      }
     }
   }