Merge pull request #1688 from blockchain/fix/moment-date-parsing

Fix(Double date parsing/formatting Swap history)

Author: Andrew Schneider

packages/blockchain-wallet-v4-frontend/src/data/components/exchangeHistory/model.js

@@ -1,12 +1,8 @@
-import moment from 'moment'
 import { difference, has, propOr, values } from 'ramda'
 
 import { splitPair } from 'data/modules/rates/model'
 
 export const PER_PAGE = 20
-
-export const DATE_FORMAT = 'DD MMMM YYYY, HH:mm'
-
 export const ETH_AIRDROP_MODAL = '@EXCHANGE.ETH_AIRDROP_MODAL'
 export const RESULTS_MODAL = '@EXCHANGE.RESULTS_MODAL'
 
@@ -50,7 +46,7 @@ export const formatExchangeTrade = ({
   return {
     id,
     status: state,
-    date: moment(createdAt).format(DATE_FORMAT),
+    date: createdAt,
     sourceCoin,
     targetCoin,
     depositAmount: propOr('', 'value', deposit),

packages/blockchain-wallet-v4-frontend/src/scenes/ExchangeHistory/List/TradeItem/selectors.js

@@ -1,11 +1,9 @@
-import moment from 'moment'
 import { ifElse } from 'ramda'
 
 import { getCoinFromPair } from 'services/ShapeshiftService'
 import { model } from 'data'
 
 const {
-  DATE_FORMAT,
   formatExchangeTrade,
   isShapeShiftTrade
 } = model.components.exchangeHistory
@@ -17,7 +15,7 @@ const formatShapeshiftTrade = trade => {
 
   return {
     status,
-    date: moment(timestamp).format(DATE_FORMAT),
+    date: timestamp,
     sourceCoin,
     targetCoin,
     deposit,

packages/blockchain-wallet-v4-frontend/src/scenes/ExchangeHistory/List/TradeItem/template.js

@@ -4,6 +4,7 @@ import PropTypes from 'prop-types'
 import { FormattedMessage } from 'react-intl'
 import moment from 'moment'
 import { pathOr } from 'ramda'
+
 import { model } from 'data'
 import { TableCell, TableRow, Text, Link } from 'blockchain-info-components'
 import { selectColor, OrderStatus } from 'components/OrderStatus'
@@ -20,13 +21,10 @@ const StatusContainer = styled(TableCell)`
 
 const { FINISHED } = model.components.exchangeHistory.STATES
 
-const tradeDateHelper = (date, isMobile = false) => {
-  let timeFormat = 'MMMM D YYYY @ h:mm A'
-  if (isMobile) timeFormat = 'DD MMM'
-  return moment(date)
+const tradeDateHelper = (date, isMobile = false) =>
+  moment(date)
     .local()
-    .format(timeFormat)
-}
+    .format(isMobile ? 'DD MMM' : 'MMMM D YYYY @ h:mm A')
 
 const TradeItem = props => {
   const {