From 7c1cbd33ff22718074c724bf1418461c28703b1d Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Wed, 3 Jan 2018 15:25:45 +0100
Subject: [PATCH] Store tokens with repeatable id (#7435)

---
 js-old/src/redux/providers/tokensActions.js |  2 +-
 js-old/src/util/tokens/index.js             | 22 +++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/js-old/src/redux/providers/tokensActions.js b/js-old/src/redux/providers/tokensActions.js
index 2e1e8c052..915619009 100644
--- a/js-old/src/redux/providers/tokensActions.js
+++ b/js-old/src/redux/providers/tokensActions.js
@@ -23,7 +23,7 @@ import { fetchTokenIds, fetchTokensBasics, fetchTokensInfo, fetchTokensImages }
 
 import { setAddressImage } from './imagesActions';
 
-const TOKENS_CACHE_LS_KEY_PREFIX = '_parity::tokens::';
+const TOKENS_CACHE_LS_KEY_PREFIX = '_parity::tokenreg::';
 const log = getLogger(LOG_KEYS.Balances);
 
 function _setTokens (tokens) {
diff --git a/js-old/src/util/tokens/index.js b/js-old/src/util/tokens/index.js
index c196f9167..413806d42 100644
--- a/js-old/src/util/tokens/index.js
+++ b/js-old/src/util/tokens/index.js
@@ -59,22 +59,18 @@ export function fetchTokensBasics (api, tokenReg, start = 0, limit = 100) {
     })
     .then((tokenAddresses) => {
       return tokenAddresses.map((tokenAddress, index) => {
-        if (/^0x0*$/.test(tokenAddress)) {
-          return null;
-        }
-
         const tokenIndex = start + index;
 
         return {
-          address: tokenAddress,
-          id: getTokenId(tokenAddress, tokenIndex),
+          address: /^0x0*$/.test(tokenAddress)
+            ? ''
+            : tokenAddress,
+          id: getTokenId(tokenIndex),
           index: tokenIndex,
-
           fetched: false
         };
       });
     })
-    .then((tokens) => tokens.filter((token) => token))
     .then((tokens) => {
       const randomAddress = sha3(`${Date.now()}`).substr(0, 42);
 
@@ -82,7 +78,13 @@ export function fetchTokensBasics (api, tokenReg, start = 0, limit = 100) {
         .then((_balances) => {
           const balances = _balances[randomAddress];
 
-          return tokens.filter(({ id }) => balances[id].eq(0));
+          return tokens.map((token) => {
+            if (balances[token.id] && balances[token.id].gt(0)) {
+              token.address = '';
+            }
+
+            return token;
+          });
         });
     });
 }
@@ -113,7 +115,7 @@ export function fetchTokensInfo (api, tokenReg, tokenIndexes) {
 
         const token = {
           address,
-          id: getTokenId(address, tokenIndex),
+          id: getTokenId(tokenIndex),
           index: tokenIndex,
 
           format: format.toString(),