2 files changed, 3 insertions, 2 deletions
diff --git a/packages/website/ts/components/generate_order/asset_picker.tsx b/packages/website/ts/components/generate_order/asset_picker.tsx
index e78324346..ade168f2e 100644
--- a/packages/website/ts/components/generate_order/asset_picker.tsx
+++ b/packages/website/ts/components/generate_order/asset_picker.tsx
@@ -1,6 +1,7 @@
 import * as _ from 'lodash';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
+import * as moment from 'moment';
 import * as React from 'react';
 import { Blockchain } from 'ts/blockchain';
 import { NewTokenForm } from 'ts/components/generate_order/new_token_form';
@@ -260,7 +261,7 @@ export class AssetPicker extends React.Component<AssetPickerProps, AssetPickerSt
         };
 
         newTokenEntry.isTracked = true;
-        newTokenEntry.trackedTimestamp = Date.now();
+        newTokenEntry.trackedTimestamp = moment().unix();
         trackedTokenStorage.addTrackedTokenToUser(this.props.userAddress, this.props.networkId, newTokenEntry);
 
         this.props.dispatcher.updateTokenByAddress([newTokenEntry]);
diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx
index 5c90aa3da..785b2da88 100644
--- a/packages/website/ts/components/wallet/wallet.tsx
+++ b/packages/website/ts/components/wallet/wallet.tsx
@@ -165,7 +165,7 @@ export class Wallet extends React.Component<WalletProps, WalletState> {
         if (
             !_.isUndefined(firstDifferentTrackedToken) &&
             _.size(differentTrackedTokens) === 1 &&
-            currentTrackedTokens.includes(firstDifferentTrackedToken)
+            _.includes(currentTrackedTokens, firstDifferentTrackedToken)
         ) {
             document.getElementById(firstDifferentTrackedToken.address).scrollIntoView();
         }