From 03b588c723ce5aa2f799eed13a1596e55200780a Mon Sep 17 00:00:00 2001 From: okanishcheva Date: Fri, 25 Oct 2019 12:29:20 +0300 Subject: [PATCH 1/2] DEXW-2151: set default network settings --- src/modules/utils/modals/settings/SettingsCtrl.js | 4 ++++ src/modules/utils/modals/settings/settings.html | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/modules/utils/modals/settings/SettingsCtrl.js b/src/modules/utils/modals/settings/SettingsCtrl.js index a538543728..67a577eebc 100644 --- a/src/modules/utils/modals/settings/SettingsCtrl.js +++ b/src/modules/utils/modals/settings/SettingsCtrl.js @@ -285,6 +285,10 @@ modalManager.showDeleteAccountModal(); } + onBlurSetting(prop) { + this[prop] = this[prop] ? this[prop] : undefined; + } + } return new SettingsCtrl(); diff --git a/src/modules/utils/modals/settings/settings.html b/src/modules/utils/modals/settings/settings.html index 99984f3c5d..137ad9c162 100644 --- a/src/modules/utils/modals/settings/settings.html +++ b/src/modules/utils/modals/settings/settings.html @@ -209,7 +209,7 @@
- +
@@ -219,7 +219,7 @@
- +
@@ -288,7 +288,7 @@
- +
From 2142fcce0d41595eee2f773dd18e8fa0b9e7dbfc Mon Sep 17 00:00:00 2001 From: okanishcheva Date: Mon, 28 Oct 2019 16:52:22 +0300 Subject: [PATCH 2/2] DEXW-2151: fix set default assetsOracleTmp --- src/modules/utils/modals/settings/SettingsCtrl.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/utils/modals/settings/SettingsCtrl.js b/src/modules/utils/modals/settings/SettingsCtrl.js index 67a577eebc..c77754f8c7 100644 --- a/src/modules/utils/modals/settings/SettingsCtrl.js +++ b/src/modules/utils/modals/settings/SettingsCtrl.js @@ -253,6 +253,7 @@ this.scamListUrl = WavesApp.network.scamListUrl; this.tokensNameListUrl = WavesApp.network.tokensNameListUrl; this.oracleWaves = WavesApp.oracles.waves; + this.assetsOracleTmp = this.oracleWaves; this.api = WavesApp.network.api; }