From cf48a564312b924a919d53836a51bf31e9a039ee Mon Sep 17 00:00:00 2001
From: okanishcheva <okanishcheva@wavesplatform.com>
Date: Tue, 29 Oct 2019 15:55:54 +0300
Subject: [PATCH] DEXW-2266: catch some errors

---
 data-service/config.ts                        | 20 ++++++++++---------
 .../dex/directives/createOrder/CreateOrder.js |  3 ++-
 src/modules/ui/directives/avatar/Avatar.js    | 12 +++--------
 .../directives/portfolioRow/PortfolioRow.js   |  3 ++-
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/data-service/config.ts b/data-service/config.ts
index 49d659d298..d34b5aff1f 100644
--- a/data-service/config.ts
+++ b/data-service/config.ts
@@ -22,16 +22,18 @@ export function get<K extends keyof IConfigParams>(key: K): IConfigParams[K] {
 export function set<K extends keyof IConfigParams>(key: K, value: IConfigParams[K]): void {
     config[key] = value;
     if (key === 'node') {
-        time().then(serverTime => {
-            const now = Date.now();
-            const dif = now - serverTime.getTime();
+        time()
+            .then(serverTime => {
+                const now = Date.now();
+                const dif = now - serverTime.getTime();
 
-            if (Math.abs(dif) > 1000 * 30) {
-                timeDiff = dif;
-            } else {
-                timeDiff = 0;
-            }
-        });
+                if (Math.abs(dif) > 1000 * 30) {
+                    timeDiff = dif;
+                } else {
+                    timeDiff = 0;
+                }
+            })
+            .catch(() => null);
     }
     if (key === 'matcher') {
         matcherSettingsPromise = request<any>({
diff --git a/src/modules/dex/directives/createOrder/CreateOrder.js b/src/modules/dex/directives/createOrder/CreateOrder.js
index 3e3d916763..b122b1c4aa 100644
--- a/src/modules/dex/directives/createOrder/CreateOrder.js
+++ b/src/modules/dex/directives/createOrder/CreateOrder.js
@@ -983,7 +983,8 @@
                     waves.matcher.getCreateOrderSettings(pair, matcherPublicKey)
                         .then(data => {
                             this.matcherSettings = data;
-                        });
+                        })
+                        .catch(() => null);
                 });
             }
 
diff --git a/src/modules/ui/directives/avatar/Avatar.js b/src/modules/ui/directives/avatar/Avatar.js
index ff92ec6b12..20f7f2633f 100644
--- a/src/modules/ui/directives/avatar/Avatar.js
+++ b/src/modules/ui/directives/avatar/Avatar.js
@@ -1,8 +1,6 @@
 (function () {
     'use strict';
 
-    const ds = require('data-service');
-
     /**
      * @param {typeof Base} Base
      * @param $q
@@ -48,16 +46,12 @@
                     this.size = 67;
                 }
                 if (this.address) {
-                    ds.fetch(`${ds.config.get('node')}/addresses/scriptInfo/${this.address}`)
+                    waves.node.scriptInfo(this.address)
                         .then(data => {
                             this.hasScript = !!data.script;
                             $scope.$apply();
-                        });
-
-                    waves.node.scriptInfo(this.address).then(data => {
-                        this.hasScript = !!data.script;
-                        $scope.$apply();
-                    });
+                        })
+                        .catch(() => null);
 
                     $q((resolve) => {
                         resolve(identityImg.create(this.address, { size: this.size * 3 }));
diff --git a/src/modules/wallet/modules/portfolio/directives/portfolioRow/PortfolioRow.js b/src/modules/wallet/modules/portfolio/directives/portfolioRow/PortfolioRow.js
index f6b3563089..5197b826b8 100644
--- a/src/modules/wallet/modules/portfolio/directives/portfolioRow/PortfolioRow.js
+++ b/src/modules/wallet/modules/portfolio/directives/portfolioRow/PortfolioRow.js
@@ -347,7 +347,8 @@
                             const baseAssetBalance = balance.available.getTokens().mul(rate).toFormat(2);
                             this.node.querySelector(`.${SELECTORS.EXCHANGE_RATE}`).innerHTML = rate.toFixed(2);
                             this.node.querySelector(`.${SELECTORS.BASE_ASSET_BALANCE}`).innerHTML = baseAssetBalance;
-                        });
+                        })
+                        .catch(() => null);
 
                     const startDate = this.utils.moment().add().day(-7);
                     this.waves.utils.getRateHistory(balance.asset.id, baseAssetId, startDate).then(values => {