merge v2-prototype

1 files changed, 9 insertions, 9 deletions

diff --git a/packages/website/ts/local_storage/trade_history_storage.tsx b/packages/website/ts/local_storage/trade_history_storage.tsx
index 2e2f4e64e..a9b042820 100644
--- a/packages/website/ts/local_storage/trade_history_storage.tsx
+++ b/packages/website/ts/local_storage/trade_history_storage.tsx
@@ -27,31 +27,31 @@ export const tradeHistoryStorage = {
         localStorage.setItem(FILL_CLEAR_KEY, configs.LAST_LOCAL_STORAGE_FILL_CLEARANCE_DATE);
     },
     addFillToUser(userAddress: string, networkId: number, fill: Fill): void {
-        const fillsByHash = this.getUserFillsByHash(userAddress, networkId);
-        const fillHash = this._getFillHash(fill);
+        const fillsByHash = tradeHistoryStorage.getUserFillsByHash(userAddress, networkId);
+        const fillHash = tradeHistoryStorage._getFillHash(fill);
         const doesFillExist = !_.isUndefined(fillsByHash[fillHash]);
         if (doesFillExist) {
             return; // noop
         }
         fillsByHash[fillHash] = fill;
         const userFillsJSONString = JSON.stringify(fillsByHash);
-        const userFillsKey = this._getUserFillsKey(userAddress, networkId);
+        const userFillsKey = tradeHistoryStorage._getUserFillsKey(userAddress, networkId);
         localStorage.setItem(userFillsKey, userFillsJSONString);
     },
     removeFillFromUser(userAddress: string, networkId: number, fill: Fill): void {
-        const fillsByHash = this.getUserFillsByHash(userAddress, networkId);
-        const fillHash = this._getFillHash(fill);
+        const fillsByHash = tradeHistoryStorage.getUserFillsByHash(userAddress, networkId);
+        const fillHash = tradeHistoryStorage._getFillHash(fill);
         const doesFillExist = !_.isUndefined(fillsByHash[fillHash]);
         if (!doesFillExist) {
             return; // noop
         }
         delete fillsByHash[fillHash];
         const userFillsJSONString = JSON.stringify(fillsByHash);
-        const userFillsKey = this._getUserFillsKey(userAddress, networkId);
+        const userFillsKey = tradeHistoryStorage._getUserFillsKey(userAddress, networkId);
         localStorage.setItem(userFillsKey, userFillsJSONString);
     },
     getUserFillsByHash(userAddress: string, networkId: number): { [fillHash: string]: Fill } {
-        const userFillsKey = this._getUserFillsKey(userAddress, networkId);
+        const userFillsKey = tradeHistoryStorage._getUserFillsKey(userAddress, networkId);
         const userFillsJSONString = localStorage.getItemIfExists(userFillsKey);
         if (_.isEmpty(userFillsJSONString)) {
             return {};
@@ -66,7 +66,7 @@ export const tradeHistoryStorage = {
         return userFillsByHash;
     },
     getFillsLatestBlock(userAddress: string, networkId: number): number {
-        const userFillsLatestBlockKey = this._getFillsLatestBlockKey(userAddress, networkId);
+        const userFillsLatestBlockKey = tradeHistoryStorage._getFillsLatestBlockKey(userAddress, networkId);
         const blockNumberStr = localStorage.getItemIfExists(userFillsLatestBlockKey);
         if (_.isEmpty(blockNumberStr)) {
             return constants.GENESIS_ORDER_BLOCK_BY_NETWORK_ID[networkId];
@@ -75,7 +75,7 @@ export const tradeHistoryStorage = {
         return blockNumber;
     },
     setFillsLatestBlock(userAddress: string, networkId: number, blockNumber: number): void {
-        const userFillsLatestBlockKey = this._getFillsLatestBlockKey(userAddress, networkId);
+        const userFillsLatestBlockKey = tradeHistoryStorage._getFillsLatestBlockKey(userAddress, networkId);
         localStorage.setItem(userFillsLatestBlockKey, `${blockNumber}`);
     },
     _getUserFillsKey(userAddress: string, networkId: number): string {