Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dexw 2462 release 1.4.19 final #1810

Open
wants to merge 75 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
ae5da1b
DEXW-2442: save progress
Nov 21, 2019
231b737
DEXW-2442: new user landing
Nov 22, 2019
40eef6b
DEXW-2442: save multiAcc user
Nov 22, 2019
9d766a4
DEXW-2442: old user
Nov 22, 2019
d66dfab
DEXW-2442: delete signUp and signIn pages
Nov 22, 2019
5472c0c
DEXW-2442: delete migrate page and module
Nov 22, 2019
687e7f4
DEXW-2442: delete saveSeed page and module
Nov 22, 2019
2df0deb
DEXW-2442: delete sessions page and module
Nov 22, 2019
0f59bac
DEXW-2442: delete create page and module
Nov 22, 2019
fafd4df
DEXW-2442: new user
Nov 22, 2019
f02c8f9
DEXW-2442: delete restore page and module
Nov 22, 2019
ba758e0
DEXW-2442: delete fromBackup page and module
Nov 22, 2019
a778c3d
Merge branch 'dexw-2442-landing-after-locked' of github.com:wavesplat…
Nov 22, 2019
4e2fcfb
Merge branch 'dexw-2442-landing-after-locked' of github.com:wavesplat…
Nov 22, 2019
d780994
DEXW-2442: delete ledger page and module
Nov 22, 2019
223bb95
Merge branch 'dexw-2442-landing-after-locked' of github.com:wavesplat…
Nov 22, 2019
853f105
DEXW-2442: delete keeper page and module
Nov 22, 2019
930390d
DEXW-2442: delete import page and module
Nov 25, 2019
8fa2ee8
DEXW-2442: delete desktop page and module
Nov 25, 2019
089e161
DEXW-2442: delete wallet page and module
Nov 25, 2019
8daf8bf
DEXW-2442: delete wallet module
Nov 25, 2019
17ff081
DEXW-2442: delete dex, dex-demo page and module
Nov 25, 2019
1928249
DEXW-2442: delete tokens page and module
Nov 25, 2019
128b97b
DEXW-2442: delete main route state, stateManager service in header
Nov 25, 2019
49e7a2a
DEXW-2442: welcome page delete useless
Nov 25, 2019
6ce846a
DEXW-2442: delete stand page and module
Nov 25, 2019
c7d1303
DEXW-2442: fix user dropdown
Nov 25, 2019
72cf97c
DEXW-2442: web case
Nov 25, 2019
6e5644e
Merge branch 'dexw-2442-landing-after-locked' of github.com:wavesplat…
Nov 25, 2019
33f5cd6
DEXW-2442: delete modals, matcher requests
Nov 25, 2019
b01ccac
Merge branch 'dexw-2442-landing-after-locked' of github.com:wavesplat…
Nov 25, 2019
f72648a
DEXW-2442: delete modals
Nov 25, 2019
7c15bde
DEXW-2442: delete carousel
Nov 25, 2019
9d9a445
DEXW-2442: delete SessionBridge, StateManager services, ComponentErro…
Nov 25, 2019
43eadeb
DEXW-2442: landing case mobile
Nov 25, 2019
58060fe
Merge branch 'dexw-2442-landing-after-locked' of github.com:wavesplat…
Nov 25, 2019
5fad97f
DEXW-2442: web after locked
Nov 25, 2019
5180f3f
DEXW-2442: remove useless
Nov 25, 2019
bc6a0f0
Merge branch 'dexw-2442-landing-after-locked' of github.com:wavesplat…
Nov 25, 2019
3c9c0d9
DEXW-2442: add authorised step
Nov 25, 2019
87c91ee
DEXW-2442: desktop multiAcc user
Nov 25, 2019
10646ee
DEXW-2442: final delete
vba2000 Nov 25, 2019
3fff96d
DEXW-2442: fix removed code
vba2000 Nov 25, 2019
de31281
Merge branch 'dexw-2442-landing-after-locked' of github.com:wavesplat…
vba2000 Nov 25, 2019
5498a01
DEXW-2442: desktop new user case
Nov 26, 2019
e21620d
DEXW-2442: desktop new user case
Nov 26, 2019
144bed6
DEXW-2442: user without multiAcc case
Nov 26, 2019
cf592ef
DEXW-2442: case desktop
Nov 26, 2019
66edd1a
Merge branch 'dexw-2442-landing-after-locked' of github.com:wavesplat…
Nov 26, 2019
1c56d71
DEXW-2442: return migrate and signIn ns
Nov 26, 2019
89f121f
Merge branch 'dexw-2442-landing-after-locked' of github.com:wavesplat…
Nov 26, 2019
e37fb56
Merge branch 'dexw-2462-release-1.4.19-final' into dexw-2442-landing-…
Nov 26, 2019
aa34a0a
DEXW-2442: almost finish web desktop
Nov 26, 2019
3d2d66f
DEXW-2442: fix
Nov 26, 2019
23c1765
DEXW-2442: add text
Nov 26, 2019
09ce191
DEXW-2442: add animate and new design
Nov 27, 2019
6d26231
DEXW-2442: some change
Nov 27, 2019
9a53b1a
DEXW-2442: clear
Nov 27, 2019
afbc646
DEXW-2442: new user dowload desktop
Nov 27, 2019
b4db972
Merge branch 'dexw-2442-landing-after-locked' of github.com:wavesplat…
Nov 27, 2019
80e8e22
Merge branch 'dev' into dexw-2442-landing-after-locked
Nov 27, 2019
b7bebb8
DEXW-2442: delete whatsNew service
Nov 28, 2019
f835268
DEXW-2442: remove DEXW_LOCKED check in routing
Nov 28, 2019
739de65
DEXW-2442: fix header
Nov 28, 2019
06a4dfd
DEXW-2442: fix mobile header
Nov 28, 2019
cd40e7d
DEXW-2442: fix tooltip
Nov 29, 2019
b873b97
DEXW-2442: del lang
Nov 29, 2019
f0aa35c
DEXW-2442: delete old desktop case
Nov 29, 2019
18ddf79
Merge branch 'dexw-2442-landing-after-locked' of github.com:wavesplat…
Nov 29, 2019
459c243
Merge pull request #1794 from wavesplatform/dexw-2442-landing-after-l…
jahsus-waves Nov 29, 2019
9b041a7
DEXW-2508: fix safari height
Dec 2, 2019
0d3531b
Merge pull request #1804 from wavesplatform/dexw-2508-fix-safari
jahsus-waves Dec 2, 2019
21fb96f
Fix timeout
tsigel Dec 2, 2019
2c00504
Fix language
vba2000 Dec 2, 2019
6bf8a1b
increased desktop update timeout
jahsus-waves Dec 3, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
64 changes: 3 additions & 61 deletions data-service/classes/DataManager.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
import { Money } from '@waves/data-entities';
import { path } from 'ramda';
import { IPollAPI, Poll } from '../utils/Poll';
import { balanceList } from '../api/assets/assets';
import { getReservedBalance } from '../api/matcher/getOrders';
import { IBalanceItem } from '../api/assets/interface';
import { IHash } from '../interface';
import { UTXManager } from './UTXManager';
import { getAliasesByAddress } from '../api/aliases/aliases';
import { PollControl } from './PollControl';
import { change, get } from '../config';
import { getOracleData, IOracleData } from '../api/data';
import { change } from '../config';
import { DATA_PROVIDER_VERSIONS, STATUS_LIST, TProviderAsset } from '@waves/oracle-data';


Expand Down Expand Up @@ -50,15 +44,7 @@ export class DataManager {
this.pollControl.destroy();
this.transactions.dropAddress();
}

public getBalances(): Promise<Array<IBalanceItem>> {
return this.pollControl.getPollHash().balance.getDataPromise();
}

public getReservedInOrders(): Promise<IHash<Money>> {
return this.pollControl.getPollHash().orders.getDataPromise();
}


public getAliasesPromise(): Promise<Array<string>> {
return this.pollControl.getPollHash().aliases.getDataPromise();
}
Expand Down Expand Up @@ -139,64 +125,20 @@ export class DataManager {
return this.pollControl.getPollHash()[oracleName].lastData;
}

private _getPollBalanceApi(): IPollAPI<Array<IBalanceItem>> {
const get = () => {
const hash = this.pollControl.getPollHash();
const inOrdersHash = hash && hash.orders.lastData || Object.create(null);
return balanceList(this._address, Object.create(null), inOrdersHash);
};
return { get, set: () => null };
}

private _getPollOrdersApi(): IPollAPI<IHash<Money>> {
return {
get: () => getReservedBalance(),
set: () => null
};
}

private _getPollAliasesApi(): IPollAPI<Array<string>> {
return {
get: () => getAliasesByAddress(this._address),
set: () => null
};
}

private _getPollOracleApi(address: string): IPollAPI<IOracleData> {
return {
get: () => {
return address ? getOracleData(address) : Promise.resolve({ assets: Object.create(null) }) as any;
},
set: () => null
};
}

private _createPolls(): TPollHash {
const balance = new Poll(this._getPollBalanceApi(), 1000);
const orders = new Poll(this._getPollOrdersApi(), 1000);
const aliases = new Poll(this._getPollAliasesApi(), 10000);
const oracleWaves = new Poll(this._getPollOracleApi(get('oracleWaves')), 30000);
const oracleTokenomica = new Poll(this._getPollOracleApi(get('oracleTokenomica')), 30000);

return { balance, orders, aliases, oracleWaves, oracleTokenomica };
return { aliases };
}

}

type TPollHash = {
balance: Poll<Array<IBalanceItem>>;
orders: Poll<IHash<Money>>;
aliases: Poll<Array<string>>;
oracleWaves: Poll<IOracleData>
oracleTokenomica: Poll<IOracleData>
}

export interface IOracleAsset {
id: string;
status: number; // TODO! Add enum
logo: string;
site: string;
ticker: string;
email: string;
description?: Record<string, string>;
}
20 changes: 19 additions & 1 deletion locale/de/app.migrate.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
{
"desktopLocked": {
"newUser": {
"desc": "To offer users a better experience and wider range of tools, the exchange moved from Waves DEX to Waves.Exchange.",
"secondDesc": "To continue using the exchange, you should download the new desktop application."
}
},
"desktopUpdate": {
"almostThere": "Almost there...",
"backToPrevious": "Back to previous",
Expand Down Expand Up @@ -36,6 +42,18 @@
"toFinish": "To finish the migration of your accounts, you have to go to the new application and complete the authorization process.",
"tryAgain": "Try again"
},
"dexLocked": {
"multiAccount": {
"desc": "To start migrating, please sign in."
},
"newUser": {
"desc": "To offer users a better experience and wider range of tools, the exchange has moved from Waves DEX to"
},
"oldUser": {
"desc": "To continue working with your existing accounts, assets and the exchange, you should move your accounts to the new Waves.Exchange. We strongly recommend that you do this ASAP. The migration process is fast, easy, and absolutely secure."
},
"title": "We’re no longer operating this service"
},
"faq": {
"attention": {
"text": "{div.margin-top-1}[The migration process for web wallets is ONLY available from the web domain [https://dex.wavesplatform.com](https://dex.wavesplatform.com/) and [https://client.wavesplatform.com](https://client.wavesplatform.com/). To complete migration for the desktop client you have to use the Waves DEX desktop application you have already installed.]\n\n{div.margin-top-1}[Do not use any other domains for migration, do not input your seed phrases and/or private keys anywhere, and do not download any other clients aside from the software indicated for the migration process from your current Waves DEX client. The migration process does not require you to input your seed phrases and/or private keys anywhere. Waves Platform or Waves.Exchange employees will never ask you to provide any kind of personal information, including private keys and/or seed phrases.]\n\n{div.margin-top-1}[The migration process is absolutely free, and it will not affect any gateways, which will process all transactions as normal. You do not need to pay or send any tokens to anyone to complete migration.]",
Expand Down Expand Up @@ -163,4 +181,4 @@
"title": "Two hours left!"
}
}
}
}
20 changes: 19 additions & 1 deletion locale/en/app.migrate.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
{
"desktopLocked": {
"newUser": {
"desc": "To offer users a better experience and wider range of tools, the exchange moved from Waves DEX to Waves.Exchange.",
"secondDesc": "To continue using the exchange, you should download the new desktop application."
}
},
"desktopUpdate": {
"almostThere": "Almost there...",
"backToPrevious": "Back to previous",
Expand Down Expand Up @@ -36,6 +42,18 @@
"toFinish": "To finish the migration of your accounts, you have to go to the new application and complete the authorization process.",
"tryAgain": "Try again"
},
"dexLocked": {
"multiAccount": {
"desc": "To start migrating, please sign in."
},
"newUser": {
"desc": "To offer users a better experience and wider range of tools, the exchange has moved from Waves DEX to"
},
"oldUser": {
"desc": "To continue working with your existing accounts, assets and the exchange, you should move your accounts to the new Waves.Exchange. We strongly recommend that you do this ASAP. The migration process is fast, easy, and absolutely secure."
},
"title": "We’re no longer operating this service"
},
"faq": {
"attention": {
"text": "{div.margin-top-1}[The migration process for web wallets is ONLY available from the web domain [https://dex.wavesplatform.com](https://dex.wavesplatform.com/) and [https://client.wavesplatform.com](https://client.wavesplatform.com/). To complete migration for the desktop client you have to use the Waves DEX desktop application you have already installed.]\n\n{div.margin-top-1}[Do not use any other domains for migration, do not input your seed phrases and/or private keys anywhere, and do not download any other clients aside from the software indicated for the migration process from your current Waves DEX client. The migration process does not require you to input your seed phrases and/or private keys anywhere. Waves Platform or Waves.Exchange employees will never ask you to provide any kind of personal information, including private keys and/or seed phrases.]\n\n{div.margin-top-1}[The migration process is absolutely free, and it will not affect any gateways, which will process all transactions as normal. You do not need to pay or send any tokens to anyone to complete migration.]",
Expand Down Expand Up @@ -163,4 +181,4 @@
"title": "Two hours left!"
}
}
}
}
20 changes: 19 additions & 1 deletion locale/es/app.migrate.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
{
"desktopLocked": {
"newUser": {
"desc": "To offer users a better experience and wider range of tools, the exchange moved from Waves DEX to Waves.Exchange.",
"secondDesc": "To continue using the exchange, you should download the new desktop application."
}
},
"desktopUpdate": {
"almostThere": "Almost there...",
"backToPrevious": "Back to previous",
Expand Down Expand Up @@ -36,6 +42,18 @@
"toFinish": "To finish the migration of your accounts, you have to go to the new application and complete the authorization process.",
"tryAgain": "Try again"
},
"dexLocked": {
"multiAccount": {
"desc": "To start migrating, please sign in."
},
"newUser": {
"desc": "To offer users a better experience and wider range of tools, the exchange has moved from Waves DEX to"
},
"oldUser": {
"desc": "To continue working with your existing accounts, assets and the exchange, you should move your accounts to the new Waves.Exchange. We strongly recommend that you do this ASAP. The migration process is fast, easy, and absolutely secure."
},
"title": "We’re no longer operating this service"
},
"faq": {
"attention": {
"text": "{div.margin-top-1}[The migration process for web wallets is ONLY available from the web domain [https://dex.wavesplatform.com](https://dex.wavesplatform.com/) and [https://client.wavesplatform.com](https://client.wavesplatform.com/). To complete migration for the desktop client you have to use the Waves DEX desktop application you have already installed.]\n\n{div.margin-top-1}[Do not use any other domains for migration, do not input your seed phrases and/or private keys anywhere, and do not download any other clients aside from the software indicated for the migration process from your current Waves DEX client. The migration process does not require you to input your seed phrases and/or private keys anywhere. Waves Platform or Waves.Exchange employees will never ask you to provide any kind of personal information, including private keys and/or seed phrases.]\n\n{div.margin-top-1}[The migration process is absolutely free, and it will not affect any gateways, which will process all transactions as normal. You do not need to pay or send any tokens to anyone to complete migration.]",
Expand Down Expand Up @@ -163,4 +181,4 @@
"title": "Two hours left!"
}
}
}
}
20 changes: 19 additions & 1 deletion locale/et_EE/app.migrate.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
{
"desktopLocked": {
"newUser": {
"desc": "To offer users a better experience and wider range of tools, the exchange moved from Waves DEX to Waves.Exchange.",
"secondDesc": "To continue using the exchange, you should download the new desktop application."
}
},
"desktopUpdate": {
"almostThere": "Almost there...",
"backToPrevious": "Back to previous",
Expand Down Expand Up @@ -36,6 +42,18 @@
"toFinish": "To finish the migration of your accounts, you have to go to the new application and complete the authorization process.",
"tryAgain": "Try again"
},
"dexLocked": {
"multiAccount": {
"desc": "To start migrating, please sign in."
},
"newUser": {
"desc": "To offer users a better experience and wider range of tools, the exchange has moved from Waves DEX to"
},
"oldUser": {
"desc": "To continue working with your existing accounts, assets and the exchange, you should move your accounts to the new Waves.Exchange. We strongly recommend that you do this ASAP. The migration process is fast, easy, and absolutely secure."
},
"title": "We’re no longer operating this service"
},
"faq": {
"attention": {
"text": "{div.margin-top-1}[The migration process for web wallets is ONLY available from the web domain [https://dex.wavesplatform.com](https://dex.wavesplatform.com/) and [https://client.wavesplatform.com](https://client.wavesplatform.com/). To complete migration for the desktop client you have to use the Waves DEX desktop application you have already installed.]\n\n{div.margin-top-1}[Do not use any other domains for migration, do not input your seed phrases and/or private keys anywhere, and do not download any other clients aside from the software indicated for the migration process from your current Waves DEX client. The migration process does not require you to input your seed phrases and/or private keys anywhere. Waves Platform or Waves.Exchange employees will never ask you to provide any kind of personal information, including private keys and/or seed phrases.]\n\n{div.margin-top-1}[The migration process is absolutely free, and it will not affect any gateways, which will process all transactions as normal. You do not need to pay or send any tokens to anyone to complete migration.]",
Expand Down Expand Up @@ -163,4 +181,4 @@
"title": "Two hours left!"
}
}
}
}
4 changes: 2 additions & 2 deletions locale/fr/app.create.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"avatarUnique": "Cet avatar est unique. Vous ne pourrez pas le changer plus tard.",
"choose": "Choisissez l'avatar de votre adresse",
"create": "Créer un nouveau compte",
"createAccount": "Create a new account",
"createAccount": "Créer un nouveau compte",
"createDescription": "Rapide et gratuit",
"createNewAccount": "Choisissez votre avatar",
"description": {
Expand All @@ -45,7 +45,7 @@
"withBlockchain": "Get Started with Blockchain"
},
"import": "Importer des comptes",
"importDescription": "via une Phrase Secrète (SEED), Ledger ou Keeper",
"importDescription": "via Seed ou clé privée, Ledger, fichier Keystore",
"protect": "Protéger votre compte avec un mot de passe ou",
"protectYourAccount": "Protéger votre compte",
"restore": "Restaurez un compte",
Expand Down
2 changes: 1 addition & 1 deletion locale/fr/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"button": {
"cancel": "Annuler",
"continue": "Continuer",
"signIn": "Sign in"
"signIn": "Identifiez-vous"
},
"confirmTransaction": {
"notPermitted": {
Expand Down
Loading