Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions data-service/classes/DataManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.VST) {
return gatewaySoonAsset;
}

if (gateways[id]) {
return gatewayAsset;
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
10 changes: 10 additions & 0 deletions src/img/assets/vostok.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion src/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
VST: config.network.assets.VST
},

ALWAYS_PINNED_ASSETS: ['WAVES'],
Expand Down
3 changes: 2 additions & 1 deletion src/modules/app/services/DefaultSettings.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@
WavesApp.defaultAssets.BSV,
WavesApp.defaultAssets.TRY,
WavesApp.defaultAssets.DASH,
WavesApp.defaultAssets.XMR
WavesApp.defaultAssets.XMR,
WavesApp.defaultAssets.VST
],
wallet: {
activeState: 'assets',
Expand Down
1 change: 1 addition & 0 deletions src/modules/ui/directives/assetLogo/AssetLogo.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.VST]: '/img/assets/vostok.svg',
[WavesApp.otherAssetsWithIcons.EFYT]: '/img/assets/efyt.svg',
[WavesApp.otherAssetsWithIcons.WNET]: '/img/assets/wnet.svg'
};
Expand Down
3 changes: 3 additions & 0 deletions src/modules/ui/directives/assetStatus/AssetStatus.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions src/modules/ui/directives/assetStatus/asset-status.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@
class="status-label-min inactive"
w-i18n-ns="app.utils"
w-i18n="modal.assetInfo.suspicious"></span>
<!-- TODO: delete when gateway will be ready-->
<span ng-if="$ctrl.isGatewaySoon"
class="status-label-min active">GATEWAY SOON</span>
5 changes: 5 additions & 0 deletions src/modules/ui/directives/transaction/transactions.less
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ w-transaction .transaction {
}
}

.exchange-type {
white-space: nowrap;
margin-right: 5px;
}

.icon {
position: relative;
width: 48px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="line">
<div class="body-2 top flex fs-mobile">
<span class="flex">
<span w-i18n="transaction.headers.{{::$ctrl.typeName}}"></span>
<span class="exchange-type" w-i18n="transaction.headers.{{::$ctrl.typeName}}"></span>
<span class="ellipsis">
{{$ctrl.getAssetName($ctrl.transaction.amount.asset)}}
</span>
Expand Down
6 changes: 5 additions & 1 deletion src/modules/utils/services/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -1095,7 +1098,8 @@
email,
provider,
description,
logo
logo,
isGatewaySoon
};
},

Expand Down
6 changes: 4 additions & 2 deletions ts-scripts/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,8 @@
"DASH": "DGgBtwVoXKAKKvV2ayUpSoPzTJxt7jo9KiXMJRzTH2ET",
"EFYT": "FvKx3cerSVYGfXKFvUgp7koNuTAcLs8DmtmwRrFVCqJv",
"WNET": "3P8gkhcLhFQvBkDzMnWeqqwvq3qxkpTNQPs4LUQ95tKD",
"XMR": "8oPbSCKFHkXBy1hCGSg9pJkSARE7zhTQTLpc8KZwdtr7"
"XMR": "8oPbSCKFHkXBy1hCGSg9pJkSARE7zhTQTLpc8KZwdtr7",
"VST": "4iZj7NNvpHKmbJz3znDiGYnNHTWGM9eu9s2j6Lk54y3K"
}
},
"mainnet": {
Expand Down Expand Up @@ -270,7 +271,8 @@
"DASH": "B3uGHFRpSUuGEDWjqB9LWWxafQj8VTvpMucEyoxzws5H",
"EFYT": "725Yv9oceWsB4GsYwyy4A52kEwyVrL5avubkeChSnL46",
"WNET": "AxAmJaro7BJ4KasYiZhw7HkjwgYtt2nekPuF2CN9LMym",
"XMR": "5WvPKSJXzVE2orvbkJ8wsQmmQKqTv9sGBPksV4adViw3"
"XMR": "5WvPKSJXzVE2orvbkJ8wsQmmQKqTv9sGBPksV4adViw3",
"VST": "4LHHvYGNKJUg5hj65aGD5vgScvCBmLpdRFtjokvCjSL8"
}
}
}
Expand Down