diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-08-09 02:30:49 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-08-09 02:30:49 +0800 |
| commit | 286bde606f1c42a8edf2793b78042f5ef3271894 (patch) | |
| tree | c8beb87f4726385fa766bb5ccea185055a244acb /app/scripts/controllers/detect-tokens.js | |
| parent | 0ebdd73e027f62bb5d83f96fcbca85f4e9c9038c (diff) | |
| download | tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.tar.gz tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.tar.zst tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.zip | |
fix merge conflicts
Diffstat (limited to 'app/scripts/controllers/detect-tokens.js')
| -rw-r--r-- | app/scripts/controllers/detect-tokens.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/controllers/detect-tokens.js b/app/scripts/controllers/detect-tokens.js index 195ec918a..62e639795 100644 --- a/app/scripts/controllers/detect-tokens.js +++ b/app/scripts/controllers/detect-tokens.js @@ -85,7 +85,7 @@ class DetectTokensController { set preferences (preferences) { if (!preferences) { return } this._preferences = preferences - preferences.store.subscribe(({ tokens }) => { this.tokenAddresses = tokens.map((obj) => { return obj.address }) }) + preferences.store.subscribe(({ tokens = [] }) => { this.tokenAddresses = tokens.map((obj) => { return obj.address }) }) preferences.store.subscribe(({ selectedAddress }) => { if (this.selectedAddress !== selectedAddress) { this.selectedAddress = selectedAddress |