fix(order): fixing order of steps for flexible pricing model

packages/blockchain-wallet-v4-frontend/src/data/components/buySell/sagas.ts

@@ -385,9 +385,6 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
         delete output.amount
       }
 
-      let buyOrder: BSOrderType
-      let oldBuyOrder: BSOrderType | undefined
-
       if (mobilePaymentMethod === MobilePaymentType.APPLE_PAY) {
         const applePayInfo: ApplePayInfoType = yield call(api.getApplePayInfo, fiat)
 
@@ -402,13 +399,26 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
 
       yield put(A.createOrderLoading())
 
+      let buyOrder: BSOrderType
+
+      let oldBuyOrder: BSOrderType | undefined
+
       // This code is handles refreshing the buy order when the user sits on
       // the order confirmation screen.
       while (true) {
+        // need to get current step and break if not checkout confirm
+        // usually happens when the user goes back to the enter amount form
+        const currentStep = S.getStep(yield select())
+
+        if (currentStep !== 'CHECKOUT_CONFIRM') {
+          break
+        }
+
         // non gold users can only make one order at a time so we need to cancel the old one
         if (oldBuyOrder) {
           yield call(api.cancelBSOrder, oldBuyOrder)
         }
+
         // get the current order, if any
         const currentBuyQuote = S.getBuyQuote(yield select()).getOrFail(BS_ERROR.NO_QUOTE)
 
@@ -439,12 +449,6 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
 
         // pause the while loop here until if/when the quote expires again, then refresh the order
         yield take(A.fetchBuyQuoteSuccess)
-        // need to get current step and break if not checkout confirm
-        // usually happens when the user goes back to the enter amount form
-        const currentStep = S.getStep(yield select())
-        if (currentStep !== 'CHECKOUT_CONFIRM') {
-          break
-        }
       }
     } catch (e) {
       if (isNabuError(e)) {