From f8a01b2d8184bdfc902abd9cec2ecd64067c744d Mon Sep 17 00:00:00 2001 From: okanishcheva Date: Tue, 28 May 2019 10:53:08 +0300 Subject: [PATCH 1/5] DEXW-1734: save --- data-service/classes/DataManager.ts | 17 +++++++++++++++++ src/img/assets/vostok.svg | 10 ++++++++++ src/index.hbs | 3 ++- src/modules/app/services/DefaultSettings.js | 3 ++- .../ui/directives/assetLogo/AssetLogo.js | 1 + .../ui/directives/assetStatus/AssetStatus.js | 3 +++ .../ui/directives/assetStatus/asset-status.html | 5 +++++ src/modules/utils/services/utils.js | 6 +++++- ts-scripts/meta.json | 6 ++++-- 9 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 src/img/assets/vostok.svg diff --git a/data-service/classes/DataManager.ts b/data-service/classes/DataManager.ts index bf8812f471..d40eeb9239 100644 --- a/data-service/classes/DataManager.ts +++ b/data-service/classes/DataManager.ts @@ -96,10 +96,27 @@ export class DataManager { description: descriptionHash[id] }; + // TODO: delete when gateway will be ready + const gatewaySoonAsset = { + status: 4, + version: DATA_PROVIDER_VERSIONS.BETA, + id, + provider: 'WavesPlatform', + ticker: null, + link: null, + email: null, + logo: null, + description: descriptionHash[id] + }; + if (id === 'WAVES') { return { status: STATUS_LIST.VERIFIED, description: descriptionHash.WAVES } as any; } + if (id === WavesApp.defaultAssets.VOSTOK) { + return gatewaySoonAsset; + } + if (gateways[id]) { return gatewayAsset; } diff --git a/src/img/assets/vostok.svg b/src/img/assets/vostok.svg new file mode 100644 index 0000000000..65e17d3e56 --- /dev/null +++ b/src/img/assets/vostok.svg @@ -0,0 +1,10 @@ + + + + Icon/Asset Logo/vostok-30 + Created with Sketch. + + + + + diff --git a/src/index.hbs b/src/index.hbs index 8e1dce9707..3ccfa909ef 100644 --- a/src/index.hbs +++ b/src/index.hbs @@ -348,7 +348,8 @@ BSV: config.network.assets.BSV, DASH: config.network.assets.DASH, TRY: config.network.assets.TRY, - XMR: config.network.assets.XMR + XMR: config.network.assets.XMR, + VOSTOK: config.network.assets.VOSTOK }, ALWAYS_PINNED_ASSETS: ['WAVES'], diff --git a/src/modules/app/services/DefaultSettings.js b/src/modules/app/services/DefaultSettings.js index 1d0c05a437..86bd6b3efb 100644 --- a/src/modules/app/services/DefaultSettings.js +++ b/src/modules/app/services/DefaultSettings.js @@ -62,7 +62,8 @@ WavesApp.defaultAssets.BSV, WavesApp.defaultAssets.TRY, WavesApp.defaultAssets.DASH, - WavesApp.defaultAssets.XMR + WavesApp.defaultAssets.XMR, + WavesApp.defaultAssets.VOSTOK ], wallet: { activeState: 'assets', diff --git a/src/modules/ui/directives/assetLogo/AssetLogo.js b/src/modules/ui/directives/assetLogo/AssetLogo.js index 7c3468f2cb..dddc89a2af 100644 --- a/src/modules/ui/directives/assetLogo/AssetLogo.js +++ b/src/modules/ui/directives/assetLogo/AssetLogo.js @@ -15,6 +15,7 @@ [WavesApp.defaultAssets.BSV]: '/img/assets/bitcoin-cash-sv.svg', [WavesApp.defaultAssets.TRY]: '/img/assets/try.svg', [WavesApp.defaultAssets.XMR]: '/img/assets/xmr.svg', + [WavesApp.defaultAssets.VOSTOK]: '/img/assets/vostok.svg', [WavesApp.otherAssetsWithIcons.EFYT]: '/img/assets/efyt.svg', [WavesApp.otherAssetsWithIcons.WNET]: '/img/assets/wnet.svg' }; diff --git a/src/modules/ui/directives/assetStatus/AssetStatus.js b/src/modules/ui/directives/assetStatus/AssetStatus.js index 55591b77cf..fd7c5cd19e 100644 --- a/src/modules/ui/directives/assetStatus/AssetStatus.js +++ b/src/modules/ui/directives/assetStatus/AssetStatus.js @@ -27,9 +27,12 @@ isGateway, isTokenomica, isSuspicious, + isGatewaySoon, hasLabel } = utils.getDataFromOracles(this.assetId); this.isGateway = isGateway; + // TODO: delete when gateway will be ready + this.isGatewaySoon = isGatewaySoon; this.isTokenomica = isGateway ? false : isTokenomica; this.isVerified = isTokenomica ? false : isVerified; this.isSuspicious = isVerified ? false : isSuspicious; diff --git a/src/modules/ui/directives/assetStatus/asset-status.html b/src/modules/ui/directives/assetStatus/asset-status.html index 9e0943a362..b6e91c8532 100644 --- a/src/modules/ui/directives/assetStatus/asset-status.html +++ b/src/modules/ui/directives/assetStatus/asset-status.html @@ -14,3 +14,8 @@ class="status-label-min inactive" w-i18n-ns="app.utils" w-i18n="modal.assetInfo.suspicious"> + + diff --git a/src/modules/utils/services/utils.js b/src/modules/utils/services/utils.js index f35a046d1f..785230304a 100644 --- a/src/modules/utils/services/utils.js +++ b/src/modules/utils/services/utils.js @@ -1068,6 +1068,9 @@ const isGateway = path(['status'], dataOracle) === 3; + // TODO: delete when gateway will be ready + const isGatewaySoon = path(['status'], dataOracle) === 4; + const isTokenomica = path(['status'], dataOracle) === STATUS_LIST.VERIFIED && path(['provider'], dataOracle) === 'Tokenomica'; @@ -1095,7 +1098,8 @@ email, provider, description, - logo + logo, + isGatewaySoon }; }, diff --git a/ts-scripts/meta.json b/ts-scripts/meta.json index aaf5fad623..a9a302d41b 100644 --- a/ts-scripts/meta.json +++ b/ts-scripts/meta.json @@ -233,7 +233,8 @@ "DASH": "DGgBtwVoXKAKKvV2ayUpSoPzTJxt7jo9KiXMJRzTH2ET", "EFYT": "FvKx3cerSVYGfXKFvUgp7koNuTAcLs8DmtmwRrFVCqJv", "WNET": "3P8gkhcLhFQvBkDzMnWeqqwvq3qxkpTNQPs4LUQ95tKD", - "XMR": "8oPbSCKFHkXBy1hCGSg9pJkSARE7zhTQTLpc8KZwdtr7" + "XMR": "8oPbSCKFHkXBy1hCGSg9pJkSARE7zhTQTLpc8KZwdtr7", + "VOSTOK": "4iZj7NNvpHKmbJz3znDiGYnNHTWGM9eu9s2j6Lk54y3K" } }, "mainnet": { @@ -270,7 +271,8 @@ "DASH": "B3uGHFRpSUuGEDWjqB9LWWxafQj8VTvpMucEyoxzws5H", "EFYT": "725Yv9oceWsB4GsYwyy4A52kEwyVrL5avubkeChSnL46", "WNET": "AxAmJaro7BJ4KasYiZhw7HkjwgYtt2nekPuF2CN9LMym", - "XMR": "5WvPKSJXzVE2orvbkJ8wsQmmQKqTv9sGBPksV4adViw3" + "XMR": "5WvPKSJXzVE2orvbkJ8wsQmmQKqTv9sGBPksV4adViw3", + "VOSTOK": "4LHHvYGNKJUg5hj65aGD5vgScvCBmLpdRFtjokvCjSL8" } } } From 768a50a5552d9d1a19578954f94161da23468370 Mon Sep 17 00:00:00 2001 From: okanishcheva Date: Tue, 28 May 2019 11:38:17 +0300 Subject: [PATCH 2/5] DEXW-1734: remove lokalise label --- src/modules/ui/directives/assetStatus/asset-status.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/modules/ui/directives/assetStatus/asset-status.html b/src/modules/ui/directives/assetStatus/asset-status.html index b6e91c8532..adad3cd1c2 100644 --- a/src/modules/ui/directives/assetStatus/asset-status.html +++ b/src/modules/ui/directives/assetStatus/asset-status.html @@ -16,6 +16,4 @@ w-i18n="modal.assetInfo.suspicious"> + class="status-label-min active">GATEWAY SOON From 08d57371eb494a02bc333b0fb03873aa14016d53 Mon Sep 17 00:00:00 2001 From: okanishcheva Date: Tue, 28 May 2019 11:52:58 +0300 Subject: [PATCH 3/5] DEXW-1734: change to vostok to vst --- data-service/classes/DataManager.ts | 2 +- src/index.hbs | 2 +- src/modules/app/services/DefaultSettings.js | 2 +- src/modules/ui/directives/assetLogo/AssetLogo.js | 2 +- ts-scripts/meta.json | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data-service/classes/DataManager.ts b/data-service/classes/DataManager.ts index d40eeb9239..8d477875a2 100644 --- a/data-service/classes/DataManager.ts +++ b/data-service/classes/DataManager.ts @@ -113,7 +113,7 @@ export class DataManager { return { status: STATUS_LIST.VERIFIED, description: descriptionHash.WAVES } as any; } - if (id === WavesApp.defaultAssets.VOSTOK) { + if (id === WavesApp.defaultAssets.VST) { return gatewaySoonAsset; } diff --git a/src/index.hbs b/src/index.hbs index 3ccfa909ef..6195c49171 100644 --- a/src/index.hbs +++ b/src/index.hbs @@ -349,7 +349,7 @@ DASH: config.network.assets.DASH, TRY: config.network.assets.TRY, XMR: config.network.assets.XMR, - VOSTOK: config.network.assets.VOSTOK + VST: config.network.assets.VST }, ALWAYS_PINNED_ASSETS: ['WAVES'], diff --git a/src/modules/app/services/DefaultSettings.js b/src/modules/app/services/DefaultSettings.js index 86bd6b3efb..f5f7a18fca 100644 --- a/src/modules/app/services/DefaultSettings.js +++ b/src/modules/app/services/DefaultSettings.js @@ -63,7 +63,7 @@ WavesApp.defaultAssets.TRY, WavesApp.defaultAssets.DASH, WavesApp.defaultAssets.XMR, - WavesApp.defaultAssets.VOSTOK + WavesApp.defaultAssets.VST ], wallet: { activeState: 'assets', diff --git a/src/modules/ui/directives/assetLogo/AssetLogo.js b/src/modules/ui/directives/assetLogo/AssetLogo.js index dddc89a2af..0944fe35b1 100644 --- a/src/modules/ui/directives/assetLogo/AssetLogo.js +++ b/src/modules/ui/directives/assetLogo/AssetLogo.js @@ -15,7 +15,7 @@ [WavesApp.defaultAssets.BSV]: '/img/assets/bitcoin-cash-sv.svg', [WavesApp.defaultAssets.TRY]: '/img/assets/try.svg', [WavesApp.defaultAssets.XMR]: '/img/assets/xmr.svg', - [WavesApp.defaultAssets.VOSTOK]: '/img/assets/vostok.svg', + [WavesApp.defaultAssets.VST]: '/img/assets/vostok.svg', [WavesApp.otherAssetsWithIcons.EFYT]: '/img/assets/efyt.svg', [WavesApp.otherAssetsWithIcons.WNET]: '/img/assets/wnet.svg' }; diff --git a/ts-scripts/meta.json b/ts-scripts/meta.json index a9a302d41b..7be44a02a2 100644 --- a/ts-scripts/meta.json +++ b/ts-scripts/meta.json @@ -234,7 +234,7 @@ "EFYT": "FvKx3cerSVYGfXKFvUgp7koNuTAcLs8DmtmwRrFVCqJv", "WNET": "3P8gkhcLhFQvBkDzMnWeqqwvq3qxkpTNQPs4LUQ95tKD", "XMR": "8oPbSCKFHkXBy1hCGSg9pJkSARE7zhTQTLpc8KZwdtr7", - "VOSTOK": "4iZj7NNvpHKmbJz3znDiGYnNHTWGM9eu9s2j6Lk54y3K" + "VST": "4iZj7NNvpHKmbJz3znDiGYnNHTWGM9eu9s2j6Lk54y3K" } }, "mainnet": { @@ -272,7 +272,7 @@ "EFYT": "725Yv9oceWsB4GsYwyy4A52kEwyVrL5avubkeChSnL46", "WNET": "AxAmJaro7BJ4KasYiZhw7HkjwgYtt2nekPuF2CN9LMym", "XMR": "5WvPKSJXzVE2orvbkJ8wsQmmQKqTv9sGBPksV4adViw3", - "VOSTOK": "4LHHvYGNKJUg5hj65aGD5vgScvCBmLpdRFtjokvCjSL8" + "VST": "4LHHvYGNKJUg5hj65aGD5vgScvCBmLpdRFtjokvCjSL8" } } } From 99aea84e70bf6ca72d7ad767bf7a1cd91677332e Mon Sep 17 00:00:00 2001 From: uiskander Date: Tue, 28 May 2019 12:55:40 +0300 Subject: [PATCH 4/5] CLIENT-1735: fix tx text wrap --- src/modules/ui/directives/transaction/transactions.less | 5 +++++ .../ui/directives/transaction/types/exchange/exchange.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/ui/directives/transaction/transactions.less b/src/modules/ui/directives/transaction/transactions.less index f20caf9d2b..b675673974 100644 --- a/src/modules/ui/directives/transaction/transactions.less +++ b/src/modules/ui/directives/transaction/transactions.less @@ -71,6 +71,11 @@ w-transaction .transaction { } } + .exchange-type { + white-space: nowrap; + margin-right: 5px; + } + .icon { position: relative; width: 48px; diff --git a/src/modules/ui/directives/transaction/types/exchange/exchange.html b/src/modules/ui/directives/transaction/types/exchange/exchange.html index 8371fe36a8..3ae952ed8b 100644 --- a/src/modules/ui/directives/transaction/types/exchange/exchange.html +++ b/src/modules/ui/directives/transaction/types/exchange/exchange.html @@ -2,7 +2,7 @@
- + {{$ctrl.getAssetName($ctrl.transaction.amount.asset)}} From 58aaa668e6aeda4bd70bf41ec1b0595605d49e34 Mon Sep 17 00:00:00 2001 From: Valentin Kuzmenkov Date: Tue, 28 May 2019 13:53:19 +0300 Subject: [PATCH 5/5] CLIENT-1736: update version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index da1ede15b3..09e88fbf40 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "waves-client", - "version": "1.2.8", + "version": "1.2.9", "description": "The official client application for the Waves platform", "private": true, "repository": {