fix(failed-order): show proper error flyout

blockchain · Apr 16, 2021 · a3f4c46 · a3f4c46
1 parent 116b03d
commit a3f4c46
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 51 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
@@ -348,18 +348,6 @@ export default ({
           AuthUrlCheck,
           data.paymentId
         )
-        if (order.state === 'FAILED') {
-          yield put(
-            actions.form.stopSubmit('brokerageTx', {
-              _error: 'Bank authroization failed, please try again.'
-            })
-          )
-          yield put(
-            actions.components.brokerage.setDWStep({
-              dwStep: BankDWStepType.ENTER_AMOUNT
-            })
-          )
-        }
         if (
           order.extraAttributes &&
           'authorisationUrl' in order.extraAttributes &&

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/simpleBuy/actionTypes.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/simpleBuy/actionTypes.ts
@@ -133,5 +133,3 @@ export const FETCH_LIMITS_SUCCESS = '@EVENT.FETCH_LIMITS_SUCCESS'
 
 export const UPDATE_SDD_TRANSACTION_FINISHED =
   '@EVENT.UPDATE_SDD_TRANSACTION_FINISHED'
-
-export const UPDATE_SB_ORDER = '@EVENT.UPDATE_SB_ORDER'
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/simpleBuy/actions.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/simpleBuy/actions.ts
@@ -667,10 +667,3 @@ export const fetchLimitsSuccess = (
 export const updateSddTransactionFinished = () => ({
   type: AT.UPDATE_SDD_TRANSACTION_FINISHED
 })
-
-export const updateSbOrder = (order: SBOrderType) => ({
-  type: AT.UPDATE_SB_ORDER,
-  payload: {
-    order
-  }
-})
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/simpleBuy/reducers.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/simpleBuy/reducers.ts
@@ -339,12 +339,6 @@ export function simpleBuyReducer(
         sddTransactionFinished: true
       }
     }
-    case AT.UPDATE_SB_ORDER: {
-      return {
-        ...state,
-        order: action.payload.order
-      }
-    }
     case AT.SET_FIAT_CURRENCY:
       return {
         ...state,

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/simpleBuy/sagas.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/simpleBuy/sagas.ts
@@ -427,7 +427,6 @@ export default ({
       api.getSBOrder,
       orderId
     )
-
     if (order.attributes?.authorisationUrl || order.state === 'FAILED') {
       return order
     } else {
@@ -454,8 +453,7 @@ export default ({
   const confirmSBOrder = function * (
     payload: ReturnType<typeof A.confirmSBOrder>
   ) {
-    const { paymentMethodId } = payload
-    let { order } = payload
+    const { order, paymentMethodId } = payload
     try {
       if (!order) throw new Error(NO_ORDER_EXISTS)
       yield put(actions.form.startSubmit('sbCheckoutConfirm'))
@@ -508,22 +506,8 @@ export default ({
           OrderConfirmCheck,
           confirmedOrder.id
         )
-        yield put(A.updateSbOrder(order))
       }
-      order = S.getSBOrder(yield select()) as SBOrderType
       yield put(actions.form.stopSubmit('sbCheckoutConfirm'))
-      // If payment method is invalid, backend will send back
-      // A failed trade in ~30 seconds rather than having
-      // payment method faill at a later step
-      if (order.state === 'FAILED') {
-        yield put(A.setStep({ step: 'CHECKOUT_CONFIRM', order }))
-        yield put(actions.form.startSubmit('sbCheckoutConfirm'))
-        return yield put(
-          actions.form.stopSubmit('sbCheckoutConfirm', {
-            _error: 'Order failed. Please try again.'
-          })
-        )
-      }
       if (order.paymentType === 'BANK_TRANSFER') {
         yield put(A.setStep({ step: 'ORDER_SUMMARY', order: confirmedOrder }))
       } else {

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/simpleBuy/types.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/simpleBuy/types.ts
@@ -495,12 +495,6 @@ interface FetchLimitsSuccess {
   type: typeof AT.FETCH_LIMITS_SUCCESS
 }
 
-interface UpdateSbOrder {
-  payload: {
-    order: SBOrderType
-  }
-  type: typeof AT.UPDATE_SB_ORDER
-}
 interface UpdateSddTransactionFinished {
   type: typeof AT.UPDATE_SDD_TRANSACTION_FINISHED
 }
@@ -561,4 +555,3 @@ export type SimpleBuyActionTypes =
   | UpdatePaymentLoadingAction
   | UpdatePaymentSuccessAction
   | UpdateSddTransactionFinished
-  | UpdateSbOrder