fix(Order History Table): to be received for pending orders

blockchain · Aug 9, 2018 · 6c9d632 · 6c9d632
1 parent b342a69
commit 6c9d632
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 13 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/defaultMessages.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/defaultMessages.json
@@ -661,6 +661,10 @@
       {
         "defaultMessage": "Received",
         "id": "scenes.buysell.orderhistory.list.received"
+      },
+      {
+        "defaultMessage": "To Be Received",
+        "id": "scenes.buysell.orderhistory.list.tobereceived"
       }
     ],
     "path": "src/components/BuySell/OrderHistoryTable/index.json"

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json
@@ -1088,6 +1088,7 @@
   "scenes.buysell.orderhistory.list.date": "Date",
   "scenes.buysell.orderhistory.list.exchanged": "Exchanged",
   "scenes.buysell.orderhistory.list.received": "Received",
+  "scenes.buysell.orderhistory.list.tobereceived": "To Be Received",
   "scenes.buysell.orderhistory.list.status": "Status",
   "scenes.buysell.orderhistory.recurring.cancelorder": "Cancel Recurring Order",
   "scenes.buysell.orderhistory.recurring.date": "Date",

diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Alerts/template.js b/packages/blockchain-wallet-v4-frontend/src/components/Alerts/template.js
@@ -448,13 +448,6 @@ const selectMessage = (message, data = undefined) => {
           defaultMessage='Mobile number has been successfully updated. Verification SMS has been sent.'
         />
       )
-    case C.MOBILE_RESEND_SUCCESS:
-      return (
-        <FormattedMessage
-          id='components.alerts.mobile_resend_success'
-          defaultMessage='Verification SMS has been sent.'
-        />
-      )
     case C.MOBILE_VERIFY_ERROR:
       return (
         <FormattedMessage

diff --git a/packages/blockchain-wallet-v4-frontend/src/components/BuySell/OrderHistoryTable/index.js b/packages/blockchain-wallet-v4-frontend/src/components/BuySell/OrderHistoryTable/index.js
@@ -20,6 +20,7 @@ class OrderHistoryTable extends React.PureComponent {
       status,
       cancelTradeId,
       canTrade,
+      pending,
       partner
     } = this.props
 
@@ -58,10 +59,17 @@ class OrderHistoryTable extends React.PureComponent {
           </TableCell>
           <TableCell width='20%' mobileWidth='35%'>
             <Text size='13px' weight={500} capitalize>
-              <FormattedMessage
-                id='scenes.buysell.orderhistory.list.received'
-                defaultMessage='Received'
-              />
+              {pending ? (
+                <FormattedMessage
+                  id='scenes.buysell.orderhistory.list.tobereceived'
+                  defaultMessage='To Be Received'
+                />
+              ) : (
+                <FormattedMessage
+                  id='scenes.buysell.orderhistory.list.received'
+                  defaultMessage='Received'
+                />
+              )}
             </Text>
           </TableCell>
         </TableHeader>

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/modules/settings/sagas.js b/packages/blockchain-wallet-v4-frontend/src/data/modules/settings/sagas.js
@@ -91,7 +91,7 @@ export default ({ coreSagas }) => {
   const resendMobile = function*(action) {
     try {
       yield call(coreSagas.settings.setMobile, action.payload)
-      yield put(actions.alerts.displaySuccess(C.MOBILE_RESEND_SUCCESS))
+      yield put(actions.alerts.displaySuccess(C.SMS_RESEND_SUCCESS))
     } catch (e) {
       yield put(actions.logs.logErrorMessage(logLocation, 'resendMobile', e))
       yield put(actions.alerts.displayError(C.MOBILE_UPDATE_ERROR))

diff --git a/...t-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/OrderHistory/template.success.js b/...t-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/OrderHistory/template.success.js
@@ -78,6 +78,7 @@ const OrderHistory = props => {
             </Text>
             <OrderHistoryTable
               trades={pendingTrades}
+              pending
               conversion={conversion}
               handleFinishTrade={trade => finishTrade(trade)}
               handleDetailsClick={trade =>

diff --git a/...blockchain-wallet-v4-frontend/src/scenes/BuySell/SfoxCheckout/Content/template.success.js b/...blockchain-wallet-v4-frontend/src/scenes/BuySell/SfoxCheckout/Content/template.success.js
@@ -267,6 +267,7 @@ const Success = props => {
             </Text>
             <OrderHistoryTable
               trades={filter(isPending, trades)}
+              pending
               conversion={conversion}
               handleDetailsClick={trade =>
                 showModal('SfoxTradeDetails', { trade })

diff --git a/packages/blockchain-wallet-v4-frontend/src/services/AlertService/index.js b/packages/blockchain-wallet-v4-frontend/src/services/AlertService/index.js
@@ -57,7 +57,6 @@ export const MOBILE_LOGIN_ERROR_QRCODE_EXPIRED =
 export const MOBILE_LOGIN_SCAN_ERROR = 'mobile_login_scan_error'
 export const MOBILE_UPDATE_ERROR = 'mobile_update_error'
 export const MOBILE_UPDATE_SUCCESS = 'mobile_update_success'
-export const MOBILE_RESEND_SUCCESS = 'mobile_resend_success'
 export const MOBILE_VERIFY_ERROR = 'mobile_verify_error'
 export const MOBILE_VERIFY_SUCCESS = 'mobile_verify_success'
 export const NEW_ADDRESS_GENERATE_ERROR = 'new_address_generate_error'