diff --git a/com.twin.app.shoptime/src/actions/checkoutActions.js b/com.twin.app.shoptime/src/actions/checkoutActions.js index 14e0f25d..4194c067 100644 --- a/com.twin.app.shoptime/src/actions/checkoutActions.js +++ b/com.twin.app.shoptime/src/actions/checkoutActions.js @@ -110,6 +110,8 @@ export const getCheckoutTotalAmt = orderProductCoupontUse, } = params; + dispatch(changeAppStatus({ isLoading: false })); + dispatch( changeAppStatus({ showLoadingPanel: { show: true, type: "wait" } }) ); diff --git a/com.twin.app.shoptime/src/views/DetailPanel/SingleProduct/SingleOption.jsx b/com.twin.app.shoptime/src/views/DetailPanel/SingleProduct/SingleOption.jsx index 8b47a540..fe8c44ba 100644 --- a/com.twin.app.shoptime/src/views/DetailPanel/SingleProduct/SingleOption.jsx +++ b/com.twin.app.shoptime/src/views/DetailPanel/SingleProduct/SingleOption.jsx @@ -388,7 +388,6 @@ export default function SingleOption({ response.data.shippingAddressList.length === 0 ) { dispatch(setShowPopup(Config.ACTIVE_POPUP.qrPopup)); - // dispatch(changeAppStatus({ showLoadingPanel: { show: false } })); dispatch(changeAppStatus({ isLoading: false })); return; @@ -407,11 +406,9 @@ export default function SingleOption({ } } else if (response.retCode === 1001) { dispatch(setShowPopup(Config.ACTIVE_POPUP.qrPopup)); - // dispatch(changeAppStatus({ showLoadingPanel: { show: false } })); dispatch(changeAppStatus({ isLoading: false })); } else { dispatch(showError(response.retCode, response.retMsg, false)); - // dispatch(changeAppStatus({ showLoadingPanel: { show: false } })); dispatch(changeAppStatus({ isLoading: false })); return;