DEXW-2442: save progress

data-service/classes/DataManager.ts

@@ -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';
 
 
@@ -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();
     }
@@ -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>;
 }

data-service/utils/request.ts

@@ -49,7 +49,7 @@ function tryParseError(error: string): string | object {
 }
 
 function addDefaultRequestParams(url: string, options: IFetchOptions = Object.create(null)): IFetchOptions {
-    if (url.indexOf(get('node')) === 0 && isEmpty(options.credentials) && options.method !== 'POST') {
+    if (url.indexOf(get('node')) === 0 && isEmpty(options.credentials)) {
         options.credentials = 'include';
     }
     return options;

locale/de/app.migrate.json

@@ -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",
@@ -10,6 +16,7 @@
         "congratulations": "Congratulations!",
         "congratulationsText": "You have successfully downloaded the new application. To start using the application, simply do the following:",
         "connectSupport": "If that did not help, then contact the Waves.Exchange [support](https://support.waves.exchange/).",
+        "download": "Download",
         "downloaded": "yes",
         "downloadText": "{div}[To offer users a better experience and wider range of tools, the exchange is moving from Waves DEX to Waves.Exchange.]\n{div.margin-top}[Waves DEX will stop operating on December 2, 2019. To continue trading you have to download the new desktop application.]",
         "fail": "Fail",
@@ -23,6 +30,8 @@
         "movingText": "{div.margin-bottom}[To offer users a better experience and wider range of tools, the exchange is moving from Waves DEX to Waves.Exchange.]\n{div.margin-bottom}[Waves DEX will stop operating on December 2, 2019. To continue trading you have to move your accounts to the new exchange. We strongly recommend that you do this in advance.]\n{div.margin-bottom}[The moving is fast, easy, and absolutely secure.]",
         "oldApplication": "Your current application is too old. If you want to trade just right now (before December 2, 2019), you can download our latest Waves DEX desktop application from the [official website](https://dex.wavesplatform.com).",
         "oops": "Oops! Something went wrong...",
+        "password": "Password",
+        "passwordError": "Wrong Password!",
         "pleaseWait": "Downloading...",
         "return": "return",
         "run": "Run the installed application",
@@ -33,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.]",
@@ -140,5 +161,24 @@
             "almostThere": "Almost there...",
             "protectAccount": "Protect your accounts"
         }
+    },
+    "modals": {
+        "shutdownNotificationFirst": {
+            "message1": "Waves DEX will stop operating on December 2, 2019",
+            "message2": "To proceed to work with the exchange, you have to move your accounts to the new Waves.Exchange. We strongly recommend that you do this ASAP. The moving is fast, easy, and absolutely secure.",
+            "submit": "I understand",
+            "title": "One day left!"
+        },
+        "shutdownNotificationLast": {
+            "message1": "Waves DEX is no longer working. The exchange moved to Waves.Exchange. Don't worry! You are still able to move your accounts from Waves DEX to Waves.Exchange. Thank you for the good times!",
+            "submit": "I understand",
+            "title": "Time to move on!"
+        },
+        "shutdownNotificationSecond": {
+            "message1": "Waves DEX will stop operating in two hours.",
+            "message2": "To proceed to work with the exchange, you have to move your accounts to the new Waves.Exchange. We strongly recommend that you do this ASAP. The moving is fast, easy, and absolutely secure.",
+            "submit": "I understand",
+            "title": "Two hours left!"
+        }
     }
-}
+}

locale/de/app.welcome.json

@@ -145,8 +145,10 @@
         "contestLinkDescription": "Gewinnen Sie 5.000 WAVES in einem Trading Contest an Waves DEX!",
         "contestLinkLink": "Regeln",
         "controlAssets": "Die Kontrolle über das Vermögen liegt allein bei Ihnen - Gelder verlassen nicht Ihren Geldbeutel und können nicht eingefroren werden",
+        "cookies": "Cookies",
         "copyAddress": "Copy address",
         "copyright": "© 2019 Waves Platform",
+        "copyright-new": "© 2019 Waves.Exchange",
         "copyrightVordex": "© 2019 VORDEX",
         "createAccount": "Create account",
         "createToken": "Token erstellen",
@@ -162,6 +164,7 @@
         "forDevelopers": "Für Entwickler",
         "forum": "Forum",
         "gateways": "Gateways zu gängigen Währungen",
+        "gdpr": "GDPR",
         "getRealTimeAccess": "Erhalten Sie Echtzeit-Zugriff auf Marktdaten und richten Sie Ihre Trading-Bots über die API ein",
         "getStarted": "Loslegen",
         "gitHub": "GitHub",

locale/en/app.migrate.json

@@ -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",
@@ -10,6 +16,7 @@
         "congratulations": "Congratulations!",
         "congratulationsText": "You have successfully downloaded the new application. To start using the application, simply do the following:",
         "connectSupport": "If that did not help, then contact the Waves.Exchange [support](https://support.waves.exchange/).",
+        "download": "Download",
         "downloaded": "yes",
         "downloadText": "{div}[To offer users a better experience and wider range of tools, the exchange is moving from Waves DEX to Waves.Exchange.]\n{div.margin-top}[Waves DEX will stop operating on December 2, 2019. To continue trading you have to download the new desktop application.]",
         "fail": "Fail",
@@ -23,6 +30,8 @@
         "movingText": "{div.margin-bottom}[To offer users a better experience and wider range of tools, the exchange is moving from Waves DEX to Waves.Exchange.]\n{div.margin-bottom}[Waves DEX will stop operating on December 2, 2019. To continue trading you have to move your accounts to the new exchange. We strongly recommend that you do this in advance.]\n{div.margin-bottom}[The moving is fast, easy, and absolutely secure.]",
         "oldApplication": "Your current application is too old. If you want to trade just right now (before December 2, 2019), you can download our latest Waves DEX desktop application from the [official website](https://dex.wavesplatform.com).",
         "oops": "Oops! Something went wrong...",
+        "password": "Password",
+        "passwordError": "Wrong Password!",
         "pleaseWait": "Downloading...",
         "return": "return",
         "run": "Run the installed application",
@@ -33,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.]",
@@ -140,5 +161,24 @@
             "almostThere": "Almost there...",
             "protectAccount": "Protect your accounts"
         }
+    },
+    "modals": {
+        "shutdownNotificationFirst": {
+            "message1": "Waves DEX will stop operating on December 2, 2019",
+            "message2": "To proceed to work with the exchange, you have to move your accounts to the new Waves.Exchange. We strongly recommend that you do this ASAP. The moving is fast, easy, and absolutely secure.",
+            "submit": "I understand",
+            "title": "One day left!"
+        },
+        "shutdownNotificationLast": {
+            "message1": "Waves DEX is no longer working. The exchange moved to Waves.Exchange. Don't worry! You are still able to move your accounts from Waves DEX to Waves.Exchange. Thank you for the good times!",
+            "submit": "I understand",
+            "title": "Time to move on!"
+        },
+        "shutdownNotificationSecond": {
+            "message1": "Waves DEX will stop operating in two hours.",
+            "message2": "To proceed to work with the exchange, you have to move your accounts to the new Waves.Exchange. We strongly recommend that you do this ASAP. The moving is fast, easy, and absolutely secure.",
+            "submit": "I understand",
+            "title": "Two hours left!"
+        }
     }
-}
+}

locale/en/app.welcome.json

@@ -145,8 +145,10 @@
         "contestLinkDescription": "Win 5,000 WAVES in a trading contest on Waves DEX!",
         "contestLinkLink": "Rules",
         "controlAssets": "Control of assets is yours alone – funds do not leave your wallet and cannot be frozen",
+        "cookies": "Cookies",
         "copyAddress": "Copy address",
         "copyright": "© 2019 Waves Platform",
+        "copyright-new": "© 2019 Waves.Exchange",
         "copyrightVordex": "© 2019 VORDEX",
         "createAccount": "Create account",
         "createToken": "Create token",
@@ -162,6 +164,7 @@
         "forDevelopers": "For developers",
         "forum": "Forum",
         "gateways": "Gateways to popular currencies",
+        "gdpr": "GDPR",
         "getRealTimeAccess": "Get real-time access to market data and set up your trading bots via API",
         "getStarted": "Get started",
         "gitHub": "GitHub",