diff --git a/data-service/classes/DataManager.ts b/data-service/classes/DataManager.ts index 6a753ee9e0..38b2dcd9c7 100644 --- a/data-service/classes/DataManager.ts +++ b/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> { - return this.pollControl.getPollHash().balance.getDataPromise(); - } - - public getReservedInOrders(): Promise> { - return this.pollControl.getPollHash().orders.getDataPromise(); - } - + public getAliasesPromise(): Promise> { return this.pollControl.getPollHash().aliases.getDataPromise(); } @@ -139,22 +125,6 @@ export class DataManager { return this.pollControl.getPollHash()[oracleName].lastData; } - private _getPollBalanceApi(): IPollAPI> { - 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> { - return { - get: () => getReservedBalance(), - set: () => null - }; - } - private _getPollAliasesApi(): IPollAPI> { return { get: () => getAliasesByAddress(this._address), @@ -162,41 +132,13 @@ export class DataManager { }; } - private _getPollOracleApi(address: string): IPollAPI { - 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>; - orders: Poll>; aliases: Poll>; - oracleWaves: Poll - oracleTokenomica: Poll -} - -export interface IOracleAsset { - id: string; - status: number; // TODO! Add enum - logo: string; - site: string; - ticker: string; - email: string; - description?: Record; } diff --git a/locale/de/app.migrate.json b/locale/de/app.migrate.json index b46c1fff89..f793c17a5a 100644 --- a/locale/de/app.migrate.json +++ b/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", @@ -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.]", @@ -163,4 +181,4 @@ "title": "Two hours left!" } } -} \ No newline at end of file +} diff --git a/locale/en/app.migrate.json b/locale/en/app.migrate.json index b46c1fff89..f793c17a5a 100644 --- a/locale/en/app.migrate.json +++ b/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", @@ -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.]", @@ -163,4 +181,4 @@ "title": "Two hours left!" } } -} \ No newline at end of file +} diff --git a/locale/es/app.migrate.json b/locale/es/app.migrate.json index cfc2cfdb61..bf5684a6d1 100644 --- a/locale/es/app.migrate.json +++ b/locale/es/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", @@ -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.]", @@ -163,4 +181,4 @@ "title": "Two hours left!" } } -} \ No newline at end of file +} diff --git a/locale/et_EE/app.migrate.json b/locale/et_EE/app.migrate.json index b46c1fff89..f793c17a5a 100644 --- a/locale/et_EE/app.migrate.json +++ b/locale/et_EE/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", @@ -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.]", @@ -163,4 +181,4 @@ "title": "Two hours left!" } } -} \ No newline at end of file +} diff --git a/locale/fr/app.create.json b/locale/fr/app.create.json index 5e88c0dbb2..d015bb5c2d 100644 --- a/locale/fr/app.create.json +++ b/locale/fr/app.create.json @@ -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": { @@ -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", diff --git a/locale/fr/app.json b/locale/fr/app.json index c2584e7812..706b0e4662 100644 --- a/locale/fr/app.json +++ b/locale/fr/app.json @@ -3,7 +3,7 @@ "button": { "cancel": "Annuler", "continue": "Continuer", - "signIn": "Sign in" + "signIn": "Identifiez-vous" }, "confirmTransaction": { "notPermitted": { diff --git a/locale/fr/app.migrate.json b/locale/fr/app.migrate.json index b46c1fff89..eb2ca903be 100644 --- a/locale/fr/app.migrate.json +++ b/locale/fr/app.migrate.json @@ -1,47 +1,65 @@ { + "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", - "barDone": "Done", + "backToPrevious": "Retour à la page précédente", + "barDone": "Terminé", "barDownload": "Download", "barInstall": "Install and run", "barSuccess": "Success", "cancelDownloading": "Cancel download", - "congratulations": "Congratulations!", - "congratulationsText": "You have successfully downloaded the new application. To start using the application, simply do the following:", + "congratulations": "Félicitations !", + "congratulationsText": "Vous avez téléchargé avec succès la nouvelle application. Pour commencer à utiliser l'application, procédez comme suit :", "connectSupport": "If that did not help, then contact the Waves.Exchange [support](https://support.waves.exchange/).", - "download": "Download", + "download": "Télécharger", "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", "failText": "Please make sure that you have installed and run the new Waves.Exchange application.", "haveYouDownloaded": "Have you already downloaded the new Waves.Exchange desktop application?", - "install": "Install the application", - "installAndRun": "Install and run the application. Have you done it?", + "install": "Installer l'application", + "installAndRun": "Installez et exécutez l'application. L'avez-vous fait?", "iUnderstand": "I understand", "lookAtFAQ1": "If you did everything properly and keep getting the Fail result, then take a look at the", "lookAtFAQ2": "You might find the answer there.", "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).", + "oldApplication": "Votre application actuelle est trop ancienne. Si vous souhaitez trader dès maintenant (avant le 2 décembre 2019), vous pouvez télécharger notre dernière application de bureau Waves DEX à partir du [site web officiel] (https://dex.wavesplatform.com).", "oops": "Oops! Something went wrong...", - "password": "Password", - "passwordError": "Wrong Password!", + "password": "Mot de passe", + "passwordError": "Mot de passe erroné !", "pleaseWait": "Downloading...", - "return": "return", - "run": "Run the installed application", - "seconds": "seconds", - "seconds1": "second", - "seconds234": "seconds", - "signInAndMove": "Sign in & Start moving", + "return": "Retour", + "run": "Lancer l'application installée", + "seconds": "secondes", + "seconds1": "seconde", + "seconds234": "secondes", + "signInAndMove": "Connectez-vous et commencez le transfert", "toFinish": "To finish the migration of your accounts, you have to go to the new application and complete the authorization process.", - "tryAgain": "Try again" + "tryAgain": "Réessayez" + }, + "dexLocked": { + "multiAccount": { + "desc": "Pour commencer la migration, veuillez vous connecter." + }, + "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.]", - "title": "ATTENTION!!! " + "title": "ATTENTION !!!" }, - "goHome": "Go to HomePage", + "goHome": "Aller à la page d'accueil", "text1": "Waves DEX is transforming into a new product, Waves.Exchange. Don’t worry! All of your tokens, seed phrases and passwords are completely safe.", "text10": "{div.margin-bottom}[If you are using the old apps, you will NO LONGER BE ABLE TO:]\n{div.line}[- Create accounts]\n{div.line}[- Have access to the Waves DEX interface]\n{div.line}[- View your portfolio]\n{div.line}[- Make transactions of any kind: transfer, issue or burn tokens, lease WAVES or cancel leasing]\n{div.line}[- Use any gateways]\n\n{div.margin-bottom}[As of December 2, 2019, you will be able to enjoy this functionality with Waves.Exchange apps.]\n\n{div.margin-bottom}[However, with the old apps, you will STILL BE ABLE TO:]\n\n{div.line}[- Log into your accounts]\n{div.line}[- Initiate the process of migration to Waves.Exchange]\n{div.line}[- Create a local backup of your seed phrases]\n\n{div.margin-top}[If you still have questions, you can send a message to our [official Telegram group](https://t.me/wavesexchange) or create a ticket on the support page: [https://support.waves.exchange/](https://support.waves.exchange/)]", "text11": "No, never! This will not happen under any circumstances. All seed phrases will still be stored locally on your devices. It is impossible for the exchange to gain access to that storage.", @@ -58,7 +76,7 @@ "text21": "The launch of the USDT (ERC-20) gateway will have no impact on the operation of wUSD and wEUR. Users will be able to continue trading them as they wish.", "text22": "The new addresses belong to the Waves gateway (not Coinomat). We will constantly be improving these gateways, making transfers faster and more convenient for users.", "text23": "We understand that the migration process may bring some inconvenience for users, so we have prepared a nice surprise! All users who have successfully moved their accounts to the new exchange will receive a glittering avatar, displayed in the app. To receive this, you will need to complete the migration of your accounts from Waves DEX to Waves.Exchange by December 2, and have at least one outgoing transaction of any type in each account to qualify.", - "text24": "We plan to add support for all languages previously available on Waves DEX soon.", + "text24": "Nous prévoyons d'ajouter prochainement la prise en charge de toutes les langues précédemment disponibles sur Waves DEX.", "text3": "Waves.Exchange is developed and run by part of the Waves DEX team, in collaboration with new developers from the Waves community.", "text4": "The migration signifies a new phase in the development of the exchange, the main priority of which will now be user experience. In addition to focusing on the community’s requests, the new team will concentrate on building new trading tools and comprehensive promotion of the product, which was difficult under the previous arrangement.", "text5": "Migration has already begun. As of November 18, 2019, you can move your accounts to the new service. To do that, you’ll need to update Waves DEX’s web version and/or run a desktop app, log into your account and follow the instructions.", @@ -67,7 +85,7 @@ "text8": "We want to give Waves DEX users enough time to prepare for using the new exchange, so that their access to the service is uninterrupted. We hope that the two-week period will be sufficient for the majority of users to complete the migration process.", "text9": "Yes, migration of accounts will also be possible after the launch of Waves.Exchange. However, as of December 2, 2019, some restrictions will apply to Waves DEX’s old apps.", "title1": "What’s going on?", - "title10": "What restrictions will apply to Waves DEX apps as of December 2, 2019?", + "title10": "Quelles restrictions s'appliqueront aux applications Waves DEX à compter du 2 décembre 2019 ?", "title11": "Will the new exchange have access to my seed phrases?", "title12": "What will happen to my tokens?", "title13": "What problems might users face due to the migration?", @@ -75,14 +93,14 @@ "title15": "How can I update my mobile app?", "title16": "Do you plan on introducing KYC procedures? ", "title17": "What changes will the matcher undergo?", - "title18": "What if I have any problems or questions during the migration process?", + "title18": "Que faire si j'ai des problèmes ou des questions pendant le processus de migration ?", "title19": "What will happen to gateway tokens?", "title2": "What is Waves.Exchange?", "title20": "Will leasing still be available after migration? Will leases be cancelled during the migration process?", "title21": "Will Tether USD (USDT) replace wUSD and wEUR?", "title22": "Why have the gateway addresses for receiving BTC and ETH been changed?", "title23": "Why so complicated?", - "title24": "Are there plans to expand language support for the interface of the new exchange?", + "title24": "Est-il prévu d'étendre la prise en charge linguistique de l'interface du nouvel échange ?", "title3": "Who is in charge of developing the new exchange?", "title4": "Why is Waves DEX moving to Waves.Exchange?", "title5": "When will migration begin?", @@ -92,12 +110,12 @@ "title9": "Will it be possible to move accounts after the launch of Waves.Exchange?" }, "migrate": { - "achievementDesc": "You’ve successfully migrated your accounts. To thank you for completing the process, we’re rewarding all your accounts (with at least one outgoing transaction made before December 2, 2019) with glittering avatars!", + "achievementDesc": "Vous avez migré vos comptes avec succès. Pour vous remercier d'avoir terminé le processus, nous récompensons tous vos comptes (avec au moins une transaction sortante effectuée avant le 2 décembre 2019) avec des avatars scintillants !", "achievementTitle": "Congratulations!", "btn": { "unlock": "Unlock" }, - "continue": "Continue", + "continue": "Continuer", "desc": { "almostFinish": "To finish the migration of your accounts, accept the new Terms and Conditions and Privacy Policy.", "enterPassword": "Enter your Waves.Exchange password to continue the migration.", @@ -113,7 +131,7 @@ "headers": { "unlock": "Unlock your accounts", "unlockAccount": "Unlock account", - "unlockAccountExchange": "Unlock your account", + "unlockAccountExchange": "Déverrouiller votre compte", "unlockExchange": "Unlock your accounts" }, "modalButton": { @@ -128,7 +146,7 @@ }, "modalTitle": { "moving": "We're moving!", - "plate": "Don’t worry! All of your tokens, seed phrases and passwords are safe.", + "plate": "Pas d'inquiétude ! Tous vos jetons, phrases secrètes et mots de passe sont en sécurité.", "redirected": "You have been redirected to" }, "signIn": "Sign in", @@ -137,7 +155,7 @@ "pending": "Pending unlock", "pendingExchange": "To unlock, select an account from the list", "pendingUnlockingExchange": "Pending unlocking", - "unlocked": "Unlocked" + "unlocked": "Déverrouillé" }, "title": { "almostThere": "Almost there...", @@ -163,4 +181,4 @@ "title": "Two hours left!" } } -} \ No newline at end of file +} diff --git a/locale/fr/app.signIn.json b/locale/fr/app.signIn.json index 05937c602c..a289173d00 100644 --- a/locale/fr/app.signIn.json +++ b/locale/fr/app.signIn.json @@ -8,7 +8,7 @@ "signIn": { "btn": { "cancel": "Cancel", - "overwrite": "Overwrite", + "overwrite": "Écraser", "restore": "Reset all" }, "enterPass": "Please enter your password to continue", @@ -23,8 +23,8 @@ }, "password": { "forgot": "Forgot your password?", - "overwrite": "Overwrite accounts", - "overwriteDescription": "Overwrite all Waves.Exchange accounts on this device" + "overwrite": "Écraser les comptes", + "overwriteDescription": "Ecraser tous les comptes Waves.Exchange sur cet appareil" }, "signIn": "Sign in", "welcomeBack": "Welcome Back!" diff --git a/locale/fr/app.utils.json b/locale/fr/app.utils.json index f867ebcc5d..3a845fb1e9 100644 --- a/locale/fr/app.utils.json +++ b/locale/fr/app.utils.json @@ -920,9 +920,9 @@ } }, "unsuccessfulMigration": { - "checkbox": "Don't show this again", + "checkbox": "Ne plus afficher ce message", "description": "You have started the account migration from Waves DEX to this exchange, but it hasn't been finished. Your accounts haven't been moved. Go back to Waves DEX and start the process from the beginning.", - "title": "Unfinished Migration", + "title": "Migration inachevée", "understand": "Je comprends" } }, @@ -948,10 +948,10 @@ "utils": { "migrationError": "Oops! Your accounts are safe but haven't been moved. Please try again.", "privacyPolicy": "I have read and agree with the [Privacy Policy](https://wavesplatform.com/files/docs/Privacy_Policy_SW.pdf).", - "privacyPolicyText": "Privacy Policy", + "privacyPolicyText": "Politique de confidentialité", "termsAgreement": "I have read and agree with the [Terms and Conditions](https://wavesplatform.com/files/docs/Waves_terms_and_conditions.pdf).", - "termsAgreementText": "Terms and Conditions", - "termsAssign": "I have read and agree with the", + "termsAgreementText": "Conditions générales", + "termsAssign": "J'ai lu et j'accepte les", "whatsNew": { "body": { "1_0_0": "{span.line}[1. Le client Waves est sorti de la version bêta.]{span.line}[2. Vous pouvez maintenant épingler et désépingler n'importe quels actifs sur la page principale.]{span.line}[3. Mode nuit ajouté.]{span.line}[4. Vous pouvez maintenant importer facilement tous vos comptes depuis votre ancien client.]{span.line}[5. Correction de bugs mineurs.]", @@ -1022,10 +1022,10 @@ "day": "d", "dexMoves": "We are moving soon! Stay with us at [Waves.Exchange](https://waves.exchange)", "hour": "h", - "info": "We're moving from Waves DEX to Waves.Exchange. Do you want to move your accounts again?", + "info": "Nous passons de Waves DEX à Waves.Exchange. Voulez-vous à nouveau déplacer vos comptes ?", "min": "m", "notification": "We're moving from Waves DEX to Waves.Exchange. Don't forget to move your accounts!", "sec": "s", - "startMoving": "Safe moving" + "startMoving": "Un déménagement en toute sécurité" } } \ No newline at end of file diff --git a/locale/fr/app.welcome.json b/locale/fr/app.welcome.json index 7fdcdad7b2..dae576887a 100644 --- a/locale/fr/app.welcome.json +++ b/locale/fr/app.welcome.json @@ -245,4 +245,4 @@ "windows": "Windows", "windowsDescription": "Télécharger l'application Windows" } -} \ No newline at end of file +} diff --git a/locale/hi_IN/app.migrate.json b/locale/hi_IN/app.migrate.json index b46c1fff89..f793c17a5a 100644 --- a/locale/hi_IN/app.migrate.json +++ b/locale/hi_IN/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", @@ -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.]", @@ -163,4 +181,4 @@ "title": "Two hours left!" } } -} \ No newline at end of file +} diff --git a/locale/id/app.migrate.json b/locale/id/app.migrate.json index dad6c61172..7404f8b191 100644 --- a/locale/id/app.migrate.json +++ b/locale/id/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", @@ -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.]", @@ -163,4 +181,4 @@ "title": "Two hours left!" } } -} \ No newline at end of file +} diff --git a/locale/it/app.migrate.json b/locale/it/app.migrate.json index ecc9163230..972719f405 100644 --- a/locale/it/app.migrate.json +++ b/locale/it/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", @@ -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.]", @@ -163,4 +181,4 @@ "title": "Two hours left!" } } -} \ No newline at end of file +} diff --git a/locale/ja/app.migrate.json b/locale/ja/app.migrate.json index b46c1fff89..f793c17a5a 100644 --- a/locale/ja/app.migrate.json +++ b/locale/ja/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", @@ -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.]", @@ -163,4 +181,4 @@ "title": "Two hours left!" } } -} \ No newline at end of file +} diff --git a/locale/ko/app.migrate.json b/locale/ko/app.migrate.json index b46c1fff89..f793c17a5a 100644 --- a/locale/ko/app.migrate.json +++ b/locale/ko/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", @@ -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.]", @@ -163,4 +181,4 @@ "title": "Two hours left!" } } -} \ No newline at end of file +} diff --git a/locale/nl_NL/app.migrate.json b/locale/nl_NL/app.migrate.json index b0b9b80bf6..a9bbdaaaf2 100644 --- a/locale/nl_NL/app.migrate.json +++ b/locale/nl_NL/app.migrate.json @@ -1,4 +1,10 @@ { + "desktopLocked": { + "newUser": { + "desc": "Om gebruikers een betere ervaring en een breder scala aan tools te bieden, is de uitwisseling verplaatst van Waves DEX naar Waves.Exchange.", + "secondDesc": "Als u de exchange wilt blijven gebruiken, moet u de nieuwe desktoptoepassing downloaden." + } + }, "desktopUpdate": { "almostThere": "Bijna daar ...", "backToPrevious": "Terug naar vorige", @@ -36,6 +42,18 @@ "toFinish": "Om de migratie van uw accounts te voltooien, moet u naar de nieuwe applicatie gaan en het autorisatieproces voltooien.", "tryAgain": "Probeer opnieuw" }, + "dexLocked": { + "multiAccount": { + "desc": "Meld u aan om te beginnen met migreren." + }, + "newUser": { + "desc": "Om gebruikers een betere ervaring en een breder scala aan tools te bieden, is de exchange verplaatst van Waves DEX naar Waves.Exchange." + }, + "oldUser": { + "desc": "Als u wilt blijven werken met uw bestaande accounts, funds en de exchange, moet u uw accounts verplaatsen naar de nieuwe Waves.Exchange. We raden u ten zeerste aan dit zo snel mogelijk te doen. Het migratieproces is snel, eenvoudig en absoluut veilig." + }, + "title": "We gebruiken deze service niet meer" + }, "faq": { "attention": { "text": "{div.margin-top-1} [Het migratieproces voor {div.margin-top-1} is ALLEEN beschikbaar via het {div.margin-top-1} [https://dex.wavesplatform.com] (https://dex.wavesplatform.com/) en [https: //client.wavesplatform.com](https://client.wavesplatform.com/). Om de migratie voor de desktop-client te voltooien, moet u de Waves DEX-desktopapp gebruiken die u al hebt geïnstalleerd.] \n\n {div.margin-top-1} [Gebruik geen andere domeinen voor migratie, {div.margin-top-1} nergens uw seed-zinnen en / of privésleutels in en download geen andere clients behalve de software die is aangegeven voor het migratieproces van uw huidige Waves DEX-client. Voor het migratieproces hoeft u nergens uw seed-zinnen en / of privésleutels in te voeren. Waves Platform of Waves.Exchange-medewerkers zullen u nooit vragen om enige vorm van persoonlijke informatie te verstrekken, inclusief privésleutels en / of seed-zinnen.] \n\n {div.margin-top-1} [Het migratieproces is absoluut gratis en heeft geen invloed op gateways, die alle transacties normaal verwerken. U hoeft niemand te betalen of tokens te sturen om de migratie te voltooien.]", @@ -163,4 +181,4 @@ "title": "Nog twee uur!" } } -} \ No newline at end of file +} diff --git a/locale/pl/app.migrate.json b/locale/pl/app.migrate.json index 6da1f51a14..eec0629b7f 100644 --- a/locale/pl/app.migrate.json +++ b/locale/pl/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", @@ -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.]", @@ -163,4 +181,4 @@ "title": "Two hours left!" } } -} \ No newline at end of file +} diff --git a/locale/pt_BR/app.migrate.json b/locale/pt_BR/app.migrate.json index b46c1fff89..f793c17a5a 100644 --- a/locale/pt_BR/app.migrate.json +++ b/locale/pt_BR/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", @@ -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.]", @@ -163,4 +181,4 @@ "title": "Two hours left!" } } -} \ No newline at end of file +} diff --git a/locale/pt_PT/app.migrate.json b/locale/pt_PT/app.migrate.json index b46c1fff89..f793c17a5a 100644 --- a/locale/pt_PT/app.migrate.json +++ b/locale/pt_PT/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", @@ -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.]", @@ -163,4 +181,4 @@ "title": "Two hours left!" } } -} \ No newline at end of file +} diff --git a/locale/ru/app.migrate.json b/locale/ru/app.migrate.json index c3ed3df731..40c901cda4 100644 --- a/locale/ru/app.migrate.json +++ b/locale/ru/app.migrate.json @@ -1,4 +1,10 @@ { + "desktopLocked": { + "newUser": { + "desc": "Чтобы улучшить пользовательский опыт и предложить более широкий набор инструментов, биржа переехала с Waves DEX на Waves.Exchange.", + "secondDesc": "Чтобы продолжить пользоваться биржей, нужно скачать новое десктопное приложение." + } + }, "desktopUpdate": { "almostThere": "Еще немного...", "backToPrevious": "Назад", @@ -36,6 +42,18 @@ "toFinish": "Чтобы завершить процесс миграции, необходимо открыть новое приложение и пройти авторизацию.", "tryAgain": "Попробовать ещё раз" }, + "dexLocked": { + "multiAccount": { + "desc": "Чтобы начать миграцию, войдите в свой аккаунт. " + }, + "newUser": { + "desc": "Чтобы улучшить пользовательский опыт и предложить более широкий набор инструментов, биржа переехала с Waves DEX на" + }, + "oldUser": { + "desc": "Если Вы хотите продолжить работать со своими аккаунтами, токенами и биржей, перенесите свои аккаунты на Waves.Exchange. Настоятельно рекомендуем сделать это как можно скорее. Процесс миграции – быстрый, простой и абсолютно безопасный." + }, + "title": "Мы больше не поддерживаем этот сервис" + }, "faq": { "attention": { "text": "{div.margin-top-1}[Для веб-кошельков процесс миграции возможен ТОЛЬКО с веб-доменов [https://dex.wavesplatform.com](https://dex.wavesplatform.com/) и [https://client.wavesplatform.com](https://client.wavesplatform.com/). Чтобы провести миграцию из десктопного клиента, нужно использовать уже установленное приложение Waves DEX.]\n\n{div.margin-top-1}[Не используйте для миграции другие домены и нигде не вводите свои seed-фразы и/или приватные ключи, а также не загружайте никаких программ, кроме предложенных в процессе миграции из вашего текущего клиента Waves DEX. Процесс миграции не требует где-либо вводить seed-фразы и/или приватные ключи. Сотрудники Waves Platform или Waves.Exchange никогда не попросят предоставить какую-либо персональную информацию, включая приватные ключи и/или seed-фразы.]\n\n{div.margin-top-1}[Миграция осуществляется абсолютно бесплатно и не повлияет на гейтвеи, которые будут обрабатывать транзакции в штатном режиме. Для осуществления миграции не требуются никакие платежи или отправка токенов кому-либо.]", @@ -146,21 +164,21 @@ }, "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!" + "message1": "Waves DEX прекратит работу 2 декабря 2019 года.", + "message2": "Если Вы хотите продолжить использовать биржу, перенесите свои аккаунты на Waves.Exchange. Настоятельно рекомендуем сделать это как можно скорее. Процесс миграции – быстрый, простой и абсолютно безопасный.", + "submit": "Больше не показывать", + "title": "Остался один день!" }, "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!" + "message1": "Waves DEX больше не работает. Биржа переехала на Waves.Exchange. \nНе волнуйтесь, Вы все еще можете перенести свои аккаунты на новую биржу. \nСпасибо за хорошие времена!", + "submit": "Больше не показывать", + "title": "Время переехать!" }, "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!" + "message1": "Waves DEX прекратит работу через два часа.", + "message2": "Если Вы хотите продолжить использовать биржу, перенесите свои аккаунты на Waves.Exchange. Настоятельно рекомендуем сделать это как можно скорее. Процесс миграции – быстрый, простой и абсолютно безопасный.", + "submit": "Больше не показывать", + "title": "Осталось два часа!" } } -} \ No newline at end of file +} diff --git a/locale/tr/app.migrate.json b/locale/tr/app.migrate.json index b46c1fff89..f793c17a5a 100644 --- a/locale/tr/app.migrate.json +++ b/locale/tr/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", @@ -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.]", @@ -163,4 +181,4 @@ "title": "Two hours left!" } } -} \ No newline at end of file +} diff --git a/locale/zh_CN/app.migrate.json b/locale/zh_CN/app.migrate.json index a9230474fd..3325e8414d 100644 --- a/locale/zh_CN/app.migrate.json +++ b/locale/zh_CN/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": "快好了...", "backToPrevious": "返回上一个", @@ -36,6 +42,18 @@ "toFinish": "要完成帐户的迁移，您必须转到新应用程序并完成授权过程。", "tryAgain": "再试一次" }, + "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} [仅可从网络域[https://dex.wavesplatform.com]（https://dex.wavesplatform.com/）和[https： //client.wavesplatform.com](https://client.wavesplatform.com/）。要完成桌面客户端的迁移，您必须使用已经安装的Waves DEX桌面应用程序。] \n\n {div.margin-top-1} [请勿使用任何其他域进行迁移，请勿在任何地方输入您的种子短语和/或私钥，也不要从您的迁移过程中指定的软件中下载任何其他客户端当前的Waves DEX客户端。迁移过程不需要您在任何地方输入种子短语和/或私钥。 Waves Platform或Waves.Exchange员工绝不会要求您提供任何类型的个人信息，包括私钥和/或种子短语。] \n\n {div.margin-top-1} [迁移过程是完全免费的，并且不会影响任何网关，因为网关将正常处理所有事务。您无需支付任何费用或将令牌发送给任何人即可完成迁移。]", @@ -163,4 +181,4 @@ "title": "Two hours left!" } } -} \ No newline at end of file +} diff --git a/mocks/waves-client-config/master/config.json b/mocks/waves-client-config/master/config.json index a3e753fbda..0043ecb956 100644 --- a/mocks/waves-client-config/master/config.json +++ b/mocks/waves-client-config/master/config.json @@ -80,5 +80,5 @@ "GATEWAYS_SOON": [ "5dJj4Hn9t2Ve3tRpNGirUHy4yBK6qdJRAJYV21yPPuGz" ], - "DEXW_LOCKED": false + "DEXW_LOCKED": true } diff --git a/package-lock.json b/package-lock.json index e8b1bb04be..13c36aaa33 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "waves-client", - "version": "1.4.11", + "version": "1.4.15", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -7093,14 +7093,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7120,8 +7118,7 @@ "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", @@ -7269,7 +7266,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } diff --git a/src/img/icons/check-lang.svg b/src/img/icons/check-lang.svg new file mode 100644 index 0000000000..c0a466597f --- /dev/null +++ b/src/img/icons/check-lang.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/img/icons/closed.svg b/src/img/icons/closed.svg new file mode 100644 index 0000000000..40b37bdb03 --- /dev/null +++ b/src/img/icons/closed.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/index.hbs b/src/index.hbs index 3999387384..5a9f34f7ca 100644 --- a/src/index.hbs +++ b/src/index.hbs @@ -524,8 +524,6 @@ - -
@@ -614,22 +612,6 @@ WavesApp.stateTree = new tsUtils.Tree({ id: 'root', children: [ - { - id: 'signUp', - data: { - url: '/sign-up', - noLogin: true, - views: [{ name: 'main' }] - } - }, - { - id: 'signIn', - data: { - url: '/sign-in', - noLogin: true, - views: [{ name: 'main' }] - } - }, { id: 'switch', data: { @@ -638,13 +620,6 @@ views: [{ name: 'main' }] } }, - { - id: 'migrate', - data: { - url: '/migrate?id', - views: [{ name: 'main' }] - } - }, { id: 'unavailable', data: { @@ -660,74 +635,6 @@ views: [{ name: 'main' }] } }, - { - id: 'saveSeed', - data: { - url: '/save-seed', - views: [{ name: 'main' }] - } - }, - // { - // id: 'sessions', - // data: { - // noLogin: true, - // views: [{ name: 'main' }] - // } - // }, - { - id: 'create', - data: { - views: [{ name: 'main' }] - } - }, - { - id: 'restore', - data: { - url: '/import/restore', - views: [{ name: 'main' }] - } - }, - { - id: 'fromBackup', - data: { - url: '/import/fromBackup', - views: [{ name: 'main' }] - } - }, - { - id: 'ledger', - data: { - url: '/import/ledger', - views: [{ name: 'main' }] - } - }, - { - id: 'keeper', - data: { - url: '/import/waveskeeper', - views: [{ name: 'main' }] - } - }, - { - id: 'import', - data: { - views: [{ name: 'main' }] - } - }, - { - id: 'stand', - data: { - noLogin: true, - views: [{ name: 'main' }] - } - }, - { - id: 'desktop', - data: { - noLogin: true, - views: [{ name: 'main' }] - } - }, { id: 'desktopUpdate', data: { @@ -743,56 +650,6 @@ url: '/migration', views: [{ name: 'main' }] } - }, - { - id: 'main', - data: { - abstract: true, - views: [{ name: 'main', templateUrl: 'modules/app/templates/main.html' }] - }, - children: [ - { - id: 'wallet', - data: { - views: [{ - name: 'mainContent', - noController: true, - template: '' - }], - redirectTo: 'main.wallet.assets' - }, - children: [ - { id: 'assets', data: { views: [{ name: 'content' }] } }, - { id: 'portfolio', data: { views: [{ name: 'content' }] } }, - { id: 'transactions', data: { views: [{ name: 'content' }] } }, - { id: 'leasing', data: { views: [{ name: 'content' }] } } - ] - }, - { - id: 'dex', - data: { - url: '/dex?assetId1&assetId2', - reloadOnSearch: false, - views: [{ name: 'mainContent' }] - } - }, - { - id: 'dex-demo', - data: { - noLogin: true, - controller: 'Dex', - url: '/dex-demo?assetId1&assetId2', - reloadOnSearch: false, - views: [{ name: 'mainContent', templateUrl: 'modules/dex/templates/dex.html' }] - } - }, - { - id: 'tokens', - data: { - views: [{ name: 'mainContent' }] - } - } - ] } ] }); diff --git a/src/modules/app/app.js b/src/modules/app/app.js index 18b4154a20..a8583ae955 100644 --- a/src/modules/app/app.js +++ b/src/modules/app/app.js @@ -102,24 +102,9 @@ 'app.utils', 'app.ui', 'app.welcome', - 'app.signUp', - 'app.signIn', - 'app.migrate', 'app.switch', - 'app.create', - 'app.restore', - 'app.saveSeed', - 'app.desktop', 'app.desktopUpdate', - 'app.ledger', - 'app.keeper', - 'app.fromBackup', - 'app.import', - 'app.wallet', - 'app.dex', - 'app.tokens', 'app.unavailable', - 'app.stand', 'app.migration' ]); })(); diff --git a/src/modules/app/directives/componentError/ComponentError.js b/src/modules/app/directives/componentError/ComponentError.js deleted file mode 100644 index f7d519877e..0000000000 --- a/src/modules/app/directives/componentError/ComponentError.js +++ /dev/null @@ -1,7 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app').component('wComponentError', { - templateUrl: 'modules/app/directives/componentError/componentError.html' - }); -})(); diff --git a/src/modules/app/directives/componentError/componentError.html b/src/modules/app/directives/componentError/componentError.html deleted file mode 100644 index bf4b8340aa..0000000000 --- a/src/modules/app/directives/componentError/componentError.html +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/src/modules/app/directives/componentWarningPlate/ComponentWarningPlate.js b/src/modules/app/directives/componentWarningPlate/ComponentWarningPlate.js deleted file mode 100644 index 4026ceff7c..0000000000 --- a/src/modules/app/directives/componentWarningPlate/ComponentWarningPlate.js +++ /dev/null @@ -1,151 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {*} $scope - * @param {*} $transitions - * @param {ModalManager} modalManager - * @param {app.utils} utils - * @param {User} user - * @param {Storage} storage - * @param {ng.IAugmentedJQuery} $element - * @return {ComponentWarningPlate} - */ - const controller = function ($scope, $transitions, modalManager, utils, user, storage, $element) { - - class ComponentWarningPlate { - - /** - * @type {number} - */ - days = 0; - /** - * @type {number} - */ - hours = 0; - /** - * @type {number} - */ - minutes = 0; - /** - * @type {number} - */ - seconds = 0; - /** - * @type {boolean} - */ - canMoveAccounts = false; - /** - * @type {boolean} - */ - migrationSuccess = false; - /** - * @type {string} - */ - newDexLink = WavesApp.network.wavesExchangeLink; - /** - * @type {boolean} - */ - isDesktop = WavesApp.isDesktop(); - /** - * @type {boolean} - */ - isOldDesktop = this.isDesktop && utils.isVersionLte('1.4.0'); - /** - * @type {boolean} - */ - isVisible = true; - - constructor() { - this._initCanMoveAccounts(); - this._initMigrationSuccess(); - - storage.change.on(() => { - this._initMigrationSuccess(); - this._initCanMoveAccounts(); - }); - - user.loginSignal.on(this._initCanMoveAccounts, this); - user.logoutSignal.on(this._initCanMoveAccounts, this); - - utils.startTimer({ year: 2019, month: 12, day: 2, hours: 15 }, this._setTime.bind(this), 1000); - - $transitions.onSuccess({ to: 'desktopUpdate' }, () => { - this.isVisible = false; - }); - - $transitions.onSuccess({ from: 'desktopUpdate' }, () => { - this.isVisible = true; - }); - } - - showMovingModal() { - modalManager.showMigrateModal(); - } - - /** - * @param last - * @private - */ - _setTime(last) { - this.days = this._to2Digest(last.days); - this.hours = this._to2Digest(last.hours); - this.minutes = this._to2Digest(last.minutes); - this.seconds = this._to2Digest(last.seconds); - utils.safeApply($scope); - } - - /** - * @param num - * @return {string} - * @private - */ - _to2Digest(num) { - return num < 10 ? `0${num}` : String(num); - } - - /** - * @private - */ - _initCanMoveAccounts() { - Promise.all([ - user.getFilteredUserList(), - user.getMultiAccountData() - ]).then(([userList, multiAccountData]) => { - if ( - (multiAccountData && user.isAuthorised) || - (userList && userList.length && !multiAccountData) - ) { - this.canMoveAccounts = true; - } else { - this.canMoveAccounts = false; - } - $element.toggleClass('warning-timer_active', this.canMoveAccounts); - $scope.$apply(); - }); - } - - /** - * @private - */ - _initMigrationSuccess() { - storage.load('migrationSuccess').then((migrationSuccess) => { - this.migrationSuccess = migrationSuccess; - $scope.$apply(); - }); - } - - } - - return new ComponentWarningPlate(); - - }; - - controller.$inject = ['$scope', '$transitions', 'modalManager', 'utils', 'user', 'storage', '$element']; - - angular.module('app').component('wWarningPlate', { - templateUrl: 'modules/app/directives/componentWarningPlate/componentWarningPlate.html', - transclude: false, - controller - }); -})(); diff --git a/src/modules/app/directives/componentWarningPlate/componentWarningPlate.html b/src/modules/app/directives/componentWarningPlate/componentWarningPlate.html deleted file mode 100644 index 18d994943a..0000000000 --- a/src/modules/app/directives/componentWarningPlate/componentWarningPlate.html +++ /dev/null @@ -1,38 +0,0 @@ -
-
- -
-
- {{$ctrl.days}} - d : -
-
- {{$ctrl.hours}} - h : -
-
- {{$ctrl.minutes}} - m : -
-
- {{$ctrl.seconds}} - s -
-
- -
- - -
-
- - -
- -
-
-
diff --git a/src/modules/app/directives/componentWarningPlate/componentWarningPlate.less b/src/modules/app/directives/componentWarningPlate/componentWarningPlate.less deleted file mode 100644 index 09e4fd5b60..0000000000 --- a/src/modules/app/directives/componentWarningPlate/componentWarningPlate.less +++ /dev/null @@ -1,203 +0,0 @@ -@import (reference) 'config'; -@import (reference) "icons"; - -w-warning-plate { - .warning-plate { - display: block; - - &__content { - display: flex; - flex-direction: row; - background: @color-warning-600; - height: 40px; - justify-content: center; - color: #fff; - font-size: 15px; - line-height: 20px; - padding: 9px; - - &.info { - background: @color-submit-300; - } - - &_no-user { - .warning-plate__text { - margin-right: auto; - } - } - } - - &__button { - cursor: pointer; - border-radius: 4px; - background-color: #fff; - color: @color-warning-600; - padding: 4px 10px; - font-size: 13px; - display: flex; - justify-content: center; - align-items: center; - line-height: 13px; - min-width: 82px; - height: 22px; - margin-right: auto; - font-weight: bold; - - &.info { - color: @color-submit-300; - } - } - - &__text { - margin: 0 15px 0 auto; - display: flex; - align-items: center; - - a { - color: #fff; - text-decoration: underline; - margin-left: 3px; - } - - &-icon { - background: @warning-icon-700; - height: 14px; - width: 14px; - margin-right: 10px; - - &_circle { - background: @info-icon-300; - } - } - } - - &__timer { - display: flex; - flex-direction: row; - padding-left: 20px; - position: relative; - align-items: center; - height: 22px; - font-family: @font-roboto-medium; - - @media screen and (max-width: 1000px) { - display: none; - } - - &::before { - content: ""; - display: block; - height: 14px; - width: 14px; - position: absolute; - top: 4px; - left: 0; - background: @timer-icon; - } - - &-value { - margin-left: 3px; - } - } - } -} - -.warning-timer_active { - position: relative; - z-index: 11; - display: block; - - & + .ui-view { - height: calc(100% ~"- 40px"); - - .main-header_new-user { - top: 40px; - - &.fixed { - .main-header__header { - top: 40px; - } - } - } - } -} - -body.desktopUpdate:not(.web) { - .warning-timer { - & + .ui-view { - height: 100%; - @media screen and (max-width: 860px) { - height: 100%; - } - } - } -} - -@media screen and (max-width: 860px) { - w-warning-plate { - .warning-plate { - &__content { - height: 72px; - justify-content: space-between; - padding: 10px; - flex-wrap: wrap; - transition: all .2s; - - &_no-user { - justify-content: flex-start; - - .warning-plate__text { - max-width: none; - margin: 0; - } - } - } - - - &__text { - text-align: left; - margin-left: 0; - margin-right: 10px; - font-size: 13px; - max-width: calc(100% ~"- 94px"); - line-height: 16px; - - &-icon { - display: none; - } - } - - &__timer { - display: none; - } - - &__button { - margin: 3px 0; - height: 42px; - width: 84px; - } - } - } - - .menu-is-shown { - .warning-plate__content { - transform: translateX(-261px); - } - } - - .warning-timer_active { - & + .ui-view { - height: calc(100% ~"- 72px"); - - .main-header_new-user { - top: 72px; - - &.fixed { - .main-header__header { - top: 72px; - } - } - } - } - } -} \ No newline at end of file diff --git a/src/modules/app/initialize/AppConfig.js b/src/modules/app/initialize/AppConfig.js index 1323476a77..74cc238329 100644 --- a/src/modules/app/initialize/AppConfig.js +++ b/src/modules/app/initialize/AppConfig.js @@ -184,7 +184,7 @@ i18next.on('initialized', () => { const localeData = WavesApp.getLocaleData().separators; - + const lang = localStorage.getItem('lng') || i18next.language; BigNumber.config.set({ ROUNDING_MODE: BigNumber.ROUND_MODE.ROUND_DOWN, FORMAT: tsUtils.merge(Object.create(null), BIG_NUMBER_FORMAT, { @@ -194,7 +194,7 @@ }); if (WavesApp.isDesktop()) { - transfer('setLanguage', i18next.language); + transfer('setLanguage', lang); } i18next.on('languageChanged', () => { diff --git a/src/modules/app/initialize/AppRun.js b/src/modules/app/initialize/AppRun.js index 1f703a61c9..1e3ea948eb 100644 --- a/src/modules/app/initialize/AppRun.js +++ b/src/modules/app/initialize/AppRun.js @@ -6,8 +6,6 @@ // const onContentLoad = new Promise((resolve) => { // document.addEventListener('DOMContentLoaded', resolve); // }); - - const { Money } = require('@waves/data-entities'); const { libs } = require('@waves/waves-transactions'); const { base64Encode, blake2b, stringToBytes } = libs.crypto; @@ -70,12 +68,9 @@ * @param {State} state * @param {ModalManager} modalManager * @param {Storage} storage - * @param {BalanceWatcher} balanceWatcher - * @param {Matcher} matcher * @param {INotification} notification * @param {app.utils.decorators} decorators * @param {MultiAccount} multiAccount - * @param {ModalRouter} ModalRouter * @param {ConfigService} configService * @param {INotification} userNotification * @return {AppRun} @@ -90,12 +85,9 @@ state, modalManager, storage, - balanceWatcher, - matcher, notification, decorators, multiAccount, - ModalRouter, configService, userNotification ) { @@ -143,11 +135,6 @@ * @type {Array} */ this.activeClasses = []; - /** - * @type {ModalRouter} - * @private - */ - this._modalRouter = new ModalRouter(); /** * Configure library generation avatar by address @@ -157,7 +144,6 @@ this._setHandlers(); this._initializeLogin(); this._initializeOutLinks(); - this._openMigrationModal(); if (WavesApp.isDesktop()) { window.listenMainProcessEvent((type, url) => { @@ -234,9 +220,6 @@ return Promise.resolve(true); default: return Promise.resolve(true); - // return modalManager.showTryDesktopModal() - // .then(() => this._runDesktop()) - // .catch(() => true); } }); } @@ -397,8 +380,6 @@ clearInterval(this._notifyTimer); this._notifyTimer = setInterval(() => this._updateUserNotifications(), 10000); }); - - balanceWatcher.change.once(this._onBalanceChange, this); }); } @@ -407,18 +388,21 @@ const START_STATES = WavesApp.stateTree.where({ noLogin: true }) .map((item) => WavesApp.stateTree.getPath(item.id).join('.')); - const DEXW_LOCKED_STATES = ['migration']; + const DEXW_LOCKED_STATES = [ + 'welcome', + 'desktopUpdate', + 'switch' + ]; const offInitialTransitions = $transitions.onStart({}, transition => { - const DEXW_LOCKED = configService.get('DEXW_LOCKED'); const toState = transition.to(); const fromState = transition.from(); const params = transition.params(); let tryDesktop; - if (DEXW_LOCKED && DEXW_LOCKED_STATES.indexOf(toState.name) === -1) { - return $state.target('migration'); + if (DEXW_LOCKED_STATES.indexOf(toState.name) === -1) { + return $state.target(DEXW_LOCKED_STATES[0]); } if (START_STATES.indexOf(toState.name) === -1) { @@ -427,7 +411,6 @@ } if (!multiAccount.isSignedIn) { - user.setInitRouteState(toState.name, params); return $state.target(START_STATES[0]); } } @@ -466,11 +449,7 @@ user.goToActiveState(); } - i18next.changeLanguage(user.getSetting('lng')); - - this._initializeTermsAccepted().then(() => { - this._modalRouter.initialize(); - }); + this._initializeTermsAccepted(); const offInnerTransitions = this._onInnerTransitions( START_STATES.filter(state => state !== 'desktopUpdate'), @@ -488,62 +467,15 @@ _onInnerTransitions(START_STATES, DEXW_LOCKED_STATES) { return $transitions.onStart({}, transition => { const toState = transition.to(); - const { custom } = transition.options(); - const DEXW_LOCKED = configService.get('DEXW_LOCKED'); - if (DEXW_LOCKED && DEXW_LOCKED_STATES.indexOf(toState.name) === -1) { - return $state.target('migration'); - } - - if (START_STATES.indexOf(toState.name) !== -1 && !custom.logout && !DEXW_LOCKED) { - return false; + if (DEXW_LOCKED_STATES.indexOf(toState.name) === -1) { + return $state.target(DEXW_LOCKED_STATES[0]); } else { state.signals.changeRouterStateStart.dispatch(transition); } }); } - _onBalanceChange() { - if (user.getSetting('hasBackup')) { - return; - } - - const balance = balanceWatcher.getBalance(); - const pairs = Object.entries(balance).reduce((acc, [assetId, asset]) => { - if (asset.toTokens() !== '0') { - acc.push([assetId, WavesApp.defaultAssets.USD]); - } - - return acc; - }, []); - - if (pairs.length === 0) { - return; - } - - Promise.all([ - ds.api.assets.get(WavesApp.defaultAssets.USD), - ds.api.matchers.getRates(matcher.currentMatcherAddress, pairs) - ]).then(([usdAsset, rates]) => { - const usd = rates.data.reduce((acc, rate) => { - const amountAsset = balance[rate.amountAsset]; - const amountAssetInUsd = amountAsset.convertTo(usdAsset, rate.data.rate); - - return acc.add(amountAssetInUsd); - }, new Money(0, usdAsset)); - - if (usd.gte(usd.cloneWithTokens(100))) { - modalManager.showTutorialModals(); - - return; - } - - if (usd.gte(usd.cloneWithTokens(1))) { - this._initializeBackupWarning(); - } - }); - } - /** * @return Promise * @private @@ -558,69 +490,6 @@ }); } - /** - * @param {object} [scope] - * @param {boolean} scope.closeByModal - * @private - */ - @decorators.scope({ closeByModal: false }) - _initializeBackupWarning(scope) { - const id = '_hasBackupId'; - - if (!notification.has(id)) { - const changeModalsHandler = (modal) => { - scope.closeByModal = true; - notification.remove(id); - scope.closeByModal = false; - - modal.catch(() => null) - .then(() => { - if (!user.getSetting('hasBackup')) { - this._initializeBackupWarning(); - } - }); - }; - - modalManager.openModal.once(changeModalsHandler); - - analytics.send({ name: 'Create Save Phrase Show', target: 'ui' }); - - notification.error({ - id, - ns: 'app.utils', - title: { - literal: 'notification.backup.title' - }, - body: { - literal: 'notification.backup.body' - }, - action: { - literal: 'notification.backup.action', - callback: () => { - analytics.send({ name: 'Create Save Phrase Yes Click', target: 'ui' }); - modalManager.showSeedBackupModal(); - } - }, - onClose: () => { - analytics.send({ name: 'Create Save Phrase No Click', target: 'ui' }); - - notification.remove(id); - - if (scope.closeByModal || user.getSetting('hasBackup')) { - return null; - } - - modalManager.openModal.off(changeModalsHandler); - - const stop = $transitions.onSuccess({}, () => { - stop(); - this._initializeBackupWarning(); - }); - } - }, -1); - } - } - /** * @param {{name: string}} currentState * @param {boolean} canChangeState @@ -762,21 +631,6 @@ }); } - /** - * @private - */ - _openMigrationModal() { - Promise.all([ - user.getMultiAccountData(), - user.getFilteredUserList(), - storage.load('notAutoOpenMigrationModal') - ]).then(([multiAccountData, userList, notAutoOpenMigrationModal]) => { - if (!notAutoOpenMigrationModal && !multiAccountData && userList && userList.length) { - modalManager.showMigrateModal(); - } - }); - } - /** * @private */ @@ -801,15 +655,11 @@ 'state', 'modalManager', 'storage', - 'balanceWatcher', - 'matcher', 'notification', 'decorators', 'multiAccount', - 'ModalRouter', 'configService', - 'userNotification', - 'whatsNew' + 'userNotification' ]; angular.module('app').run(run); diff --git a/src/modules/app/less/app.less b/src/modules/app/less/app.less index 2dd4e8cb55..f4410683d9 100644 --- a/src/modules/app/less/app.less +++ b/src/modules/app/less/app.less @@ -80,7 +80,7 @@ body.ledger, body.desktop, body.fromBackup { .main-container { - min-height: calc(100vh ~'- 60px'); + height: calc(100vh ~'- 60px'); flex-shrink: 0; } } @@ -143,12 +143,11 @@ body.portfolio { } .ui-view { - display: block; + display: flex; + flex-direction: column; height: 100%; - - &_main { - overflow: auto; - } + overflow: hidden; + overflow-y: auto; } .logo { diff --git a/src/modules/app/less/classes.less b/src/modules/app/less/classes.less index dce655bbfc..0a2b3947ad 100644 --- a/src/modules/app/less/classes.less +++ b/src/modules/app/less/classes.less @@ -143,4 +143,8 @@ .width-100 { width: 100%; +} + +.height-100 { + height: 100%; } \ No newline at end of file diff --git a/src/modules/app/services/BalanceWatcher.js b/src/modules/app/services/BalanceWatcher.js deleted file mode 100644 index 3734c43d79..0000000000 --- a/src/modules/app/services/BalanceWatcher.js +++ /dev/null @@ -1,208 +0,0 @@ -(function () { - 'use strict'; - - const { Signal } = require('ts-utils'); - const { Money } = require('@waves/data-entities'); - const { not, pathEq } = require('ramda'); - - /** - * @param {User} user - * @param {Poll} Poll - * @param {app.utils} utils - * @param {Waves} waves - */ - const factory = function (user, Poll, utils, waves) { - - class BalanceWatcher { - - /** - * @type {Signal} - */ - change = new Signal(); - /** - * @type {Promise} - */ - ready; - /** - * @type {Array} - * @private - */ - _balance = []; - /** - * @type {Poll} - * @private - */ - _poll = null; - /** - * @type {Function} - * @private - */ - _resolve; - /** - * @type {Function} - * @private - */ - _reject; - - constructor() { - this.ready = new Promise((resolve, reject) => { - this._resolve = resolve; - this._reject = reject; - }); - - user.onLogin().then( - () => this._handleLogin(), - () => this._handleLogout() - ); - } - - /** - * @return {Record} - */ - getBalance() { - return this._getHash(); - } - - /** - * @param {Asset} asset - * @return Money - */ - getBalanceByAsset(asset) { - const hash = this.getBalance(); - return hash[asset.id] ? hash[asset.id] : new Money(0, asset); - } - - /** - * @param {Array} assetList - * @return Array - */ - getBalanceByAssetList(assetList) { - return assetList.map(this.getBalanceByAsset, this); - } - - /** - * @param {string} id - * @return {Promise} - */ - getBalanceByAssetId(id) { - return waves.node.assets.getAsset(id) - .then(this.getBalanceByAsset.bind(this)); - } - - /** - * @param {string} id - * @return {Promise} - */ - getFullBalanceByAssetId(id) { - const balance = this._balance.find(pathEq(['asset', 'id'], id)); - if (balance) { - return Promise.resolve(balance); - } - return waves.node.assets.getAsset(id).then(asset => { - const empty = new Money(0, asset); - return { - asset, - regular: empty, - available: empty, - inOrders: empty, - leasedOut: empty, - leasedIn: empty - }; - }); - } - - /** - * @return {Array} - */ - getFullBalanceList() { - return this._balance.map(item => ({ ...item })); - } - - /** - * @private - */ - _handleLogin() { - this._watch(); - - user.logoutSignal.once(this._handleLogout, this); - } - - /** - * @private - */ - _handleLogout() { - if (this._poll) { - this._poll.destroy(); - } - - user.loginSignal.once(this._handleLogin, this); - } - - /** - * @private - */ - _watch() { - const get = () => BalanceWatcher._getBalanceList(); - const set = list => this._setBalanceList(list); - this._poll = new Poll(get, set, 1000); - this._poll.ready.then(this._resolve, this._reject); - } - - /** - * @private - */ - _dispatch() { - this.change.dispatch(this._getHash()); - } - - /** - * @return {*} - * @private - */ - _getHash() { - return utils.toHash(this._balance.map(item => item.available), 'asset.id'); - } - - /** - * @param {Array} list - * @return {null} - * @private - */ - _setBalanceList(list) { - const dispatch = () => { - this._balance = list; - this._dispatch(); - }; - - if (list.length !== this._balance.length) { - dispatch(); - return null; - } - - - const itemNotEqual = (a, b) => not(utils.isEqual(a.available, b.available)); - const isNeedDispatch = list.length && - list.some((item, i) => itemNotEqual(item, this._balance[i])); - - if (isNeedDispatch) { - dispatch(); - } - } - - /** - * @return {Promise} - * @private - */ - static _getBalanceList() { - return waves.node.assets.userBalances(); - } - - } - - return new BalanceWatcher(); - }; - - factory.$inject = ['user', 'Poll', 'utils', 'waves']; - - angular.module('app').factory('balanceWatcher', factory); -})(); diff --git a/src/modules/app/services/ConfigService.js b/src/modules/app/services/ConfigService.js index 602a02655b..2d786a1ea7 100644 --- a/src/modules/app/services/ConfigService.js +++ b/src/modules/app/services/ConfigService.js @@ -5,7 +5,7 @@ const BaseConfigService = utils.ConfigService; - const factory = function (Base, createPoll) { + const factory = function (Base) { class ConfigService extends Base { @@ -26,7 +26,6 @@ super(); this.change = this.service.change; this.configReadyPromise = this.service.configReady; - this.configReady = createPoll(this, () => this.service.fetchConfig(), () => null, 30000); } /** @@ -48,7 +47,7 @@ return new ConfigService(); }; - factory.$inject = ['Base', 'createPoll']; + factory.$inject = ['Base']; angular.module('app').factory('configService', factory); })(); diff --git a/src/modules/app/services/EventManager.js b/src/modules/app/services/EventManager.js index dc462e6e3b..9714edeb89 100644 --- a/src/modules/app/services/EventManager.js +++ b/src/modules/app/services/EventManager.js @@ -85,21 +85,21 @@ */ _initialize() { this._waves = $injector.get('waves'); - this._waves.node.transactions.listUtx() - .then((list) => { - const events = user.getSetting('events'); - const utxHash = utils.toHash(list, 'id'); - - Object.keys(events).forEach((id) => { - if (!utxHash[id]) { - this._removeEvent(id, true); - } - }); - - if (list && list.length) { - this._resetPoll(); - } - }); + // this._waves.node.transactions.listUtx() + // .then((list) => { + // const events = user.getSetting('events'); + // const utxHash = utils.toHash(list, 'id'); + // + // Object.keys(events).forEach((id) => { + // if (!utxHash[id]) { + // this._removeEvent(id, true); + // } + // }); + // + // if (list && list.length) { + // this._resetPoll(); + // } + // }); } /** diff --git a/src/modules/app/services/SessionBridge.js b/src/modules/app/services/SessionBridge.js deleted file mode 100644 index c1f33c2a0f..0000000000 --- a/src/modules/app/services/SessionBridge.js +++ /dev/null @@ -1,469 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {User} user - * @param {app.utils} utils - * @return {SessionBridge} - */ - const factory = function (user, utils) { - const tsUtils = require('ts-utils'); - - class SessionBridge { - - /** - * @return {string} - * @private - */ - get _sessionListKey() { - return `${this._key}-sessionList`; - } - - constructor() { - /** - * @type {string} - * @private - */ - this._sessionId = `s_${Date.now()}`; - /** - * @type {string} - * @private - */ - this._key = '__sb'; - /** - * @type {any} - * @private - */ - this._messageHash = Object.create(null); - /** - * @type {IBridgeSignals} - */ - this.signals = utils.liteObject({ - changeSessions: new tsUtils.Signal() - }); - - this._api = utils.liteObject({ - getLoginData: (commandData) => this._getLoginData(commandData), - sign: (commandData) => this._sign(commandData), - response: (commandData) => this._onResponse(commandData) - }); - - this._setHandlers(); - - user.onLogin().then( - () => this._handleLogin(), - () => this._handleLogout() - ); - } - - /** - * @return {ISessionUserData[]} - */ - getSessionsData() { - /** - * @type {object} - */ - const userDataHash = this._getOtherSessions().reduce((result, sessionId) => { - const userData = this._getUserDataBySession(sessionId); - if (userData) { - result[userData.address] = userData; - } else { - this._clearCommand(this._getSessionDataKey(sessionId)); - } - return result; - }, Object.create(null)); - return Object.values(userDataHash); - } - - /** - * @param {string} sessionId - * @return Promise - */ - login(sessionId) { - return this._runCommand('getLoginData', sessionId) - .then((response) => { - if (response.status === 'success') { - user.login(response.data); - } else { - // console.error(response); TODO - } - }); - } - - /** - * @param {string} type - * @param {object} tx - */ - sign(type, tx) { - /** - * @type {void|ISessionUserData} - */ - const master = this._getMasterSessionId(user.address); - return this._runCommand('sign', master && master.id, { type, tx }); - } - - _handleLogin() { - this._addSession(); - this._addUserData(); - - user.logoutSignal.once(this._handleLogout, this); - } - - _handleLogout() { - this._destroy(); - - user.loginSignal.once(this._handleLogin, this); - } - - /** - * @param request - * @param {string} request.id - * @param {string} request.referer - * @private - */ - _getLoginData(request) { - return this._setResponseSuccess(request, { - address: user.address - }); - } - - /** - * @param request - * @param {string} request.id - * @param {string} request.referer - * @param {object} request.data - * @param {string} request.data.type - * @param {object} request.data.tx - * @private - */ - _sign(/* request */) { - /** - * @type {ITransactionClass} - */ - // let transaction; - - // switch (request.data.type) { - // case 'order': - // transaction = new Waves.Transactions.Order(request.data.tx); - // break; - // case Waves.constants.ISSUE_TX_NAME: - // transaction = new Waves.Transactions.IssueTransaction(request.data.tx); - // break; - // case Waves.constants.TRANSFER_TX_NAME: - // transaction = new Waves.Transactions.TransferTransaction(request.data.tx); - // break; - // case Waves.constants.REISSUE_TX_NAME: - // transaction = new Waves.Transactions.ReissueTransaction(request.data.tx); - // break; - // case Waves.constants.BURN_TX_NAME: - // transaction = new Waves.Transactions.BurnTransaction(request.data.tx); - // break; - // case Waves.constants.LEASE_TX_NAME: - // transaction = new Waves.Transactions.LeaseTransaction(request.data.tx); - // break; - // case Waves.constants.CANCEL_LEASING_TX_NAME: - // transaction = new Waves.Transactions.CancelLeasingTransaction(request.data.tx); - // break; - // case Waves.constants.CREATE_ALIAS_TX_NAME: - // transaction = new Waves.Transactions.CreateAliasTransaction(request.data.tx); - // break; - // case Waves.constants.MASS_TRANSFER_TX_NAME: - // throw new Error('Unsupported method mass transfer!'); - // default: - // throw new Error('Unknown transaction type!'); - // } - - // user.getSeed() - // .then((seed) => transaction.prepareForAPI(seed.keyPair.privateKey)) - // .then((prepareData) => this._setResponseSuccess(request, prepareData)) - // .catch((e) => { - // this._setResponseError(request, e); - // }); - } - - /** - * @param {object} request - * @param {string} request.id - * @param {string} request.referer - * @param {object} body - * @private - */ - _setResponseSuccess(request, body) { - this._setResponse(request, 'success', { data: body }); - } - - /** - * @param {object} request - * @param {string} request.id - * @param {string} request.referer - * @param {object} body - * @private - */ - _setResponseError(request, message) { - this._setResponse(request, 'error', { message }); - } - - /** - * @param {object} request - * @param {string} request.id - * @param {string} request.referer - * @param {'error'|'success'} status - * @param {object} data - * @private - */ - _setResponse(request, status, data) { - const command = this._getCommandKey(request.referer, 'response'); - this._dispatch(command, { - id: request.id, - referer: this._sessionId, - data: { - status, - ...data - } - }); - setTimeout(() => { - this._clearCommand(command); - }, 100); - } - - /** - * @param {string} apiMethod - * @param {string} targetSessionId - * @param {*} [data] - * @return {Promise} - * @private - */ - _runCommand(apiMethod, targetSessionId, data) { - return new Promise((resolve) => { - const id = tsUtils.uniqueId('cmd__'); - const params = { id, data, referer: this._sessionId }; - const command = this._getCommandKey(targetSessionId, apiMethod); - - this._messageHash[id] = (result) => { - delete this._messageHash[id]; - this._clearCommand(command); - resolve(result); - }; - - this._dispatch(command, params); - - setTimeout(() => { - if (this._messageHash[id]) { - this._messageHash[id]({ - status: 'error', - message: new Error('Timeout limit error!') - }); - } - }, 1000); - }); - } - - /** - * @param {string} storageKey - * @param {ICommandData} data - * @private - */ - _dispatch(storageKey, data) { - localStorage.setItem(storageKey, JSON.stringify(data)); - } - - /** - * @param {string} storageKey - * @private - */ - _clearCommand(storageKey) { - localStorage.removeItem(storageKey); - } - - /** - * @param {ICommandData} commandData - * @private - */ - _onResponse(commandData) { - if (this._messageHash[commandData.id]) { - this._messageHash[commandData.id](commandData.data); - } - } - - /** - * @private - */ - _setHandlers() { - window.addEventListener('storage', (event) => this._onStorageEvent(event), false); - window.addEventListener('unload', () => this._destroy(), false); - } - - /** - * @param {StorageEvent} event - * @private - */ - _onStorageEvent(event) { - if (event.newValue) { - const cmd = this._parseCommand(event.key); - if (cmd && cmd in this._api) { - const commandData = JSON.parse(localStorage.getItem(event.key)); - try { - this._api[cmd](commandData); - } catch (e) { - if (cmd !== 'response') { - this._setResponseError(commandData, e); - } - } - } else if (event.key === this._sessionListKey) { - this.signals.changeSessions.dispatch(this.getSessionsData()); - } - } - } - - /** - * @private - */ - _destroy() { - this._removeSession(); - this._removeUserData(); - } - - /** - * @private - */ - _addSession() { - const sessions = JSON.parse(localStorage.getItem(this._sessionListKey) || '[]'); - sessions.push(this._sessionId); - localStorage.setItem(this._sessionListKey, JSON.stringify(sessions)); - } - - /** - * @private - */ - _removeSession() { - const sessions = JSON.parse(localStorage.getItem(this._sessionListKey) || '[]'); - const index = sessions.indexOf(this._sessionId); - if (index !== -1) { - sessions.splice(index, 1); - localStorage.setItem(this._sessionListKey, JSON.stringify(sessions)); - } - } - - /** - * @private - */ - _addUserData() { - localStorage.setItem(this._getSessionDataKey(), JSON.stringify({ - name: user.name, - address: user.address, - id: this._sessionId, - isMaster: user.isMaster() - })); - } - - /** - * @param {string} address - * @return {void | ISessionUserData} - * @private - */ - _getMasterSessionId(address) { - return tsUtils.find(this.getSessionsData(), { address, isMaster: true }); - } - - /** - * @return {Array} - * @private - */ - _getAllSessions() { - return JSON.parse(localStorage.getItem(this._sessionListKey) || '[]'); - } - - /** - * @return {string[]} - * @private - */ - _getOtherSessions() { - return this._getAllSessions().filter((sessionId) => sessionId !== this._sessionId); - } - - /** - * @param {string} [sessionId] - * @private - */ - _removeUserData(sessionId) { - localStorage.removeItem(this._getSessionDataKey(sessionId)); - } - - /** - * @param {string} sessionId - * @return {ISessionUserData} - * @private - */ - _getUserDataBySession(sessionId) { - return JSON.parse(localStorage.getItem(this._getSessionDataKey(sessionId))); - } - - /** - * @param {string} [sessionId] - * @return {string} - * @private - */ - _getSessionDataKey(sessionId = this._sessionId) { - return `${this._key}-${sessionId}`; - } - - /** - * @param {string} sessionId - * @param {string} cmd - * @return {string} - * @private - */ - _getCommandKey(sessionId, cmd) { - return `${this._getSessionDataKey(sessionId)}-${cmd}-cmd`; - } - - /** - * @param {string} localStorageKey - * @return {string|null} - * @private - */ - _parseCommand(localStorageKey) { - const [sessionId, cmd] = localStorageKey.split('-').slice(1, -1); - if (sessionId && cmd && sessionId === this._sessionId) { - return cmd; - } else { - return null; - } - } - - } - - return new SessionBridge(); - }; - - factory.$inject = ['user', 'utils']; - - angular.module('app').factory('sessionBridge', factory); -})(); - -/** - * @typedef {object} ISessionUserData - * @property {string} name - * @property {string} address - * @property {string} id - * @property {boolean} isMaster - */ - -/** - * @typedef {object} ICommandData - * @property {string} id - * @property {string} referer - * @property {object} data - */ - -/** - * @typedef {object} IResponse - * @property {'error'|'success'} status - * @property {string} [message] - * @property {object} [data] - */ - -/** - * @typedef {object} IBridgeSignals - * @property {Signal} changeSessions - */ diff --git a/src/modules/app/services/StateManager.js b/src/modules/app/services/StateManager.js deleted file mode 100644 index b1a355b4cf..0000000000 --- a/src/modules/app/services/StateManager.js +++ /dev/null @@ -1,87 +0,0 @@ -(function () { - 'use strict'; - - /** - * - * @param {State} state - * @param {User} user - * @param {$state} $state - * @return {StateManager} - */ - const factory = function (state, user, $state) { - - class StateManager { - - constructor() { - this.rootStateList = []; - this.subStateList = []; - - state.signals.changeRouterStateSuccess.on(this._currentStateLists, this); - this.changeRouteState = state.signals.changeRouterStateSuccess; - this._currentStateLists(); - } - - getSrefByState(state) { - return WavesApp.stateTree.getPath(state.id).join('.'); - } - - getStateTree(fromId = 'main') { - const root = WavesApp.stateTree.find(fromId); - return root.getChildren().filter((child) => child.get('noLogin') !== true) - .map(StateManager._remapStateItem); - } - - /** - * @private - */ - _currentStateLists() { - if (!$state.$current || !$state.$current.name) { - return false; - } - - const root = WavesApp.stateTree.find('main'); - const rootPath = WavesApp.stateTree.getPath(root.id).join('.'); - this.rootStateList = root.getChildren() - .map((item) => { - const path = user.getActiveState(item.id); - const base = `${rootPath}.${item.id}`; - return { path, name: item.id, base }; - }); - const idList = $state.$current.name.split('.'); - const parent = idList[idList.length - 2]; - const stateData = WavesApp.stateTree.find(parent); - if (stateData && !stateData.get('abstract')) { - this.subStateList = stateData.getChildren().map((item) => { - const path = WavesApp.stateTree.getPath(item.id).join('.'); - return { name: item.id, path }; - }); - } else { - this.subStateList = []; - } - } - - static _remapStateItem(item) { - const list = item.getChildren().map(StateManager._remapStateItem); - const isLeaf = list.length === 0; - const result = { list, isLeaf, id: item.id }; - - if (list.length) { - Object.defineProperty(result, 'sref', { - get: () => user.getActiveState(item.id) - }); - } else { - result.sref = user.getActiveState(item.id); - } - - return result; - } - - } - - return new StateManager(); - }; - - factory.$inject = ['state', 'user', '$state']; - - angular.module('app').factory('stateManager', factory); -})(); diff --git a/src/modules/app/services/User.js b/src/modules/app/services/User.js index b26e9c447f..d00c3f7110 100644 --- a/src/modules/app/services/User.js +++ b/src/modules/app/services/User.js @@ -164,10 +164,6 @@ return this.currentUser ? this.currentUser.publicKey : null; } - get matcherSign() { - return this.currentUser ? this.currentUser.matcherSign : null; - } - /** * @type {boolean} */ @@ -262,20 +258,6 @@ return list.includes(value); } - getDefaultUserSettings(settings) { - const { common } = this._settings.getSettings(); - - return defaultSettings.create({ ...settings }, { ...common }); - } - - /** - * @param {*} user - * @return {DefaultSettings} - */ - getSettingsByUser(user) { - return this.getDefaultUserSettings(user.settings); - } - /** * @param {string} name * @param {*} value @@ -313,7 +295,7 @@ */ getMultiAccountUsersCount() { return storage.load('multiAccountUsers').then(users => { - return Object.keys(users).length; + return users ? Object.keys(users).length : 0; }); } @@ -349,7 +331,6 @@ [userHash]: { // TODO map user settings to a new schema name: user.name, settings: user.settings, - matcherSign: user.matcherSign, lastLogin: user.lastLogin } })); @@ -412,13 +393,7 @@ } initScriptInfoPolling() { - clearTimeout(this._scriptInfoPollTimeoutId); - this._scriptInfoPollTimeoutId = setTimeout(() => { - if (this._scriptInfoPoll) { - this._scriptInfoPoll.destroy(); - } - this._scriptInfoPoll = new Poll(() => this.updateScriptAccountData(), () => null, 10000); - }, 30000); + this.updateScriptAccountData(); } /** @@ -435,21 +410,7 @@ } goToActiveState() { - if (!this.initRouteState) { - $state.go(this.getActiveState('wallet')); - } - } - - /** - * @param {string} name - * @param {string} params - */ - setInitRouteState(name, params) { - if (this.initRouteState) { - return; - } - this.initRouteState = true; - this.loginSignal.once(() => $state.go(name, params)); + $state.go(this.getActiveState('welcome')); } /** @@ -544,29 +505,21 @@ ds.app.logOut(); clearTimeout(this._scriptInfoPollTimeoutId); - if (this._scriptInfoPoll) { - this._scriptInfoPoll.destroy(); - } - - if (stateName) { - this._resetFields(); - - if (isSwitch) { - $state.go(stateName); + if (!isSwitch) { + if (WavesApp.isDesktop()) { + transfer('reload'); + } else { + window.location.reload(); } + return; + } + this._resetFields(); - this.logoutSignal.dispatch({}); - - if (!isSwitch) { - this.changeTheme(themes.getDefaultTheme(), { dontSave: true }); - multiAccount.signOut(); - $state.go(stateName, undefined, { custom: { logout: true } }); - } - } else if (WavesApp.isDesktop()) { - transfer('reload'); - } else { - window.location.reload(); + if (isSwitch) { + $state.go(stateName || ''); } + + this.logoutSignal.dispatch({}); } resetAll() { @@ -716,18 +669,6 @@ } } - /** - * @returns {Promise<{signature: string, timestamp: number}>} - */ - addMatcherSign() { - return utils.signUserOrders({ - matcherSign: this.matcherSign - }).then(matcherSign => { - this.currentUser.matcherSign = matcherSign; - ds.app.addMatcherSign(matcherSign.timestamp, matcherSign.signature); - }); - } - /** * @private */ @@ -772,7 +713,6 @@ * @param {string} userData.hash * @param {string} [userData.id] * @param {string} [userData.publicKey] - * @param {string} [userData.matcherSign] * @param {object} [userData.settings] * @return {Promise} * @private @@ -786,7 +726,6 @@ publicKey: userData.publicKey, userType: userData.userType, settings: userData.settings, - matcherSign: userData.matcherSign, lastLogin: Date.now() }; @@ -805,12 +744,6 @@ this._settings = defaultSettings.create(this.currentUser.settings, commonSettings); this._settings.change.on(() => this._onChangeSettings()); - const states = WavesApp.stateTree.find('main').getChildren(); - this._stateList = states.map((baseTree) => { - const id = baseTree.id; - return new UserRouteState('main', id, this._settings.get(`${id}.activeState`)); - }); - Object.keys(WavesApp.network).forEach((key) => { ds.config.set(key, this._settings.get(`network.${key}`)); }); @@ -819,14 +752,10 @@ ds.app.login(userData); - return this.addMatcherSign() - .catch(() => Promise.resolve()) - .then(() => { - this.changeTheme(this._settings.get('theme')); - this.changeCandle(); + this.changeTheme(this._settings.get('theme')); + this.changeCandle(); - return this.saveMultiAccountUser(this.currentUser, this.currentUser.hash); - }) + return this.saveMultiAccountUser(this.currentUser, this.currentUser.hash) .then(() => this._logoutTimer()) .then(() => this.updateScriptAccountData()) .then(() => this.loginSignal.dispatch()) @@ -951,5 +880,4 @@ * @property {string} userType * @property {number} lastLogin * @property {object} settings - * @property {object} matcherSign */ diff --git a/src/modules/app/services/waves/Waves.js b/src/modules/app/services/waves/Waves.js index 37a1440c56..47a57bc14c 100644 --- a/src/modules/app/services/waves/Waves.js +++ b/src/modules/app/services/waves/Waves.js @@ -3,12 +3,10 @@ /** * @param {Node} node - * @param {Matcher} matcher - * @param {WavesUtils} wavesUtils * @param {app.utils} utils * @return {Waves} */ - const factory = function (node, matcher, wavesUtils, utils) { + const factory = function (node, utils) { class Waves { @@ -17,14 +15,6 @@ * @type {Node} */ this.node = node; - /** - * @type {Matcher} - */ - this.matcher = matcher; - /** - * @type {WavesUtils} - */ - this.utils = wavesUtils; } } @@ -32,7 +22,7 @@ return utils.bind(new Waves()); }; - factory.$inject = ['node', 'matcher', 'wavesUtils', 'utils']; + factory.$inject = ['node', 'utils']; angular.module('app').factory('waves', factory); })(); diff --git a/src/modules/app/services/waves/WavesUtils.js b/src/modules/app/services/waves/WavesUtils.js deleted file mode 100644 index e66c00e9da..0000000000 --- a/src/modules/app/services/waves/WavesUtils.js +++ /dev/null @@ -1,344 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {Assets} assets - * @param {app.utils} utils - * @param {app.utils.decorators} decorators - * @param {Transactions} transactions - * @param {Matcher} matcher - * @return {WavesUtils} - */ - const factory = function (assets, utils, decorators, transactions, matcher) { - - const ds = require('data-service'); - const entities = require('@waves/data-entities'); - const { BigNumber } = require('@waves/bignumber'); - const { - flatten, pipe, map, - where, prop, gte, allPass, - lte, filter, length, equals, - __ - } = require('ramda'); - - class WavesUtils { - - @decorators.cachable(5) - searchAsset(userInput) { - return ds.fetch(`${WavesApp.network.api}/assets/search/${userInput}`); - } - - /** - * Get rate (now or from date) - * @param {string|Asset} assetFrom - * @param {string|Asset} assetTo - * @param {Date|number|Moment} [date] timestamp or Date - * @return {Promise} - */ - @decorators.cachable(350) - getRate(assetFrom, assetTo, date) { - const WavesId = WavesApp.defaultAssets.WAVES; - const from = WavesUtils.toId(assetFrom); - const to = WavesUtils.toId(assetTo); - - if (from === to) { - return Promise.resolve(new BigNumber(1)); - } - - if (date) { - // TODO Add rate by date API. Author Tsigel at 22/11/2017 15:04 - } else if (from === WavesId || to === WavesId) { - return this._getRate(from, to); - } else { - return utils.whenAll([ - this._getRate(from, WavesId), - this._getRate(to, WavesId) - ]) - .then(([rateFrom, rateTo]) => { - return rateTo.eq(0) ? rateTo : rateFrom.div(rateTo); - }); - } - } - - /** - * Get api for current balance from another balance - * @param {string|Asset} assetFrom - * @param {string|Asset} assetTo - * @return {Promise} - */ - getRateApi(assetFrom, assetTo) { - return utils.whenAll([ - assets.getAsset(WavesUtils.toId(assetFrom)), - assets.getAsset(WavesUtils.toId(assetTo)), - this.getRate(assetFrom, assetTo) - ]) - .then(([from, to, rate]) => { - return this._generateRateApi(from, to, rate); - }); - } - - /** - * @param {string|Asset} assetFrom - * @param {string|Asset} assetTo - * @param {Date|number|Moment} from - * @param {Date|number|Moment} [to] - * @return {Promise<{rate: BigNumber, timestamp: Date}[]>} - */ - @decorators.cachable(60) - getRateHistory(assetFrom, assetTo, from, to) { - const idFrom = WavesUtils.toId(assetFrom); - const idTo = WavesUtils.toId(assetTo); - const wavesId = WavesApp.defaultAssets.WAVES; - to = to || Date.now(); - - if (idFrom === idTo) { - return Promise.resolve([]); - } else if (idFrom === wavesId || idTo === wavesId) { - return this._getRateHistory(idFrom, idTo, utils.moment(from), utils.moment(to)); - } else { - return Promise.all([ - this._getRateHistory(idFrom, wavesId, utils.moment(from), utils.moment(to)), - this._getRateHistory(idTo, wavesId, utils.moment(from), utils.moment(to)) - ]) - .then(([from, to]) => { - const toHash = function (list) { - return list.reduce((result, item) => { - result[item.timestamp.valueOf()] = item; - return result; - }, Object.create(null)); - }; - - const hash = toHash(to); - - return from.reduce((result, item) => { - if (hash[item.timestamp.valueOf()]) { - item.rate = item.rate.div(hash[item.timestamp.valueOf()].rate); - result.push(item); - } - return result; - }, []); - }); - } - } - - /** - * @param {string|Asset} assetFrom - * @param {string|Asset} assetTo - * @return {Promise} - */ - @decorators.cachable(60) - getChange(assetFrom, assetTo) { - const idFrom = WavesUtils.toId(assetFrom); - const idTo = WavesUtils.toId(assetTo); - - if (idFrom === idTo) { - return Promise.resolve(new BigNumber(0)); - } - - return this._getChange(idFrom, idTo); - } - - /** - * @param pair - * @returns {Promise} - */ - getVolume(pair) { - return this._getVolume(pair, matcher.currentMatcherAddress); - } - - /** - * @param pair - * @param {string} currentMatcherAddress - * @returns {Promise} - */ - @decorators.cachable(60) - _getVolume(pair, currentMatcherAddress) { - return ds.api.pairs.info(currentMatcherAddress, [pair]) - .then((data) => { - const [pair = {}] = data.filter(Boolean); - return pair && String(pair.volume) || '0'; - }); - } - - /** - * @param {string} from - * @param {string} to - * @return {Promise} - * @private - */ - _getChange(from, to) { - const getChange = (open, close) => { - if (open.eq(0)) { - return new BigNumber(0); - } else { - return close.sub(open).div(open).mul(100).roundTo(2); - } - }; - - return ds.api.pairs.get(from, to) - .then(pair => ds.api.pairs.info(matcher.currentMatcherAddress, [pair]) - .then(([data]) => { - - if (!data || data.status === 'error') { - return 0; - } - - const open = data.firstPrice || new entities.Money(0, pair.priceAsset); - const close = data.lastPrice || new entities.Money(0, pair.priceAsset); - const change24 = Number(getChange(open.getTokens(), close.getTokens()).toFixed()); - - if (pair.amountAsset.id === from) { - return change24; - } else { - return -change24; - } - })) - .catch(() => 0); - } - - /** - * @param {string} fromId - * @param {string} toId - * @return {Promise} - * @private - */ - _getRate(fromId, toId) { - - const calculateCurrentRate = function (trades) { - return ( - trades - .reduce((result, item) => { - return result.add(new BigNumber(item.price.getTokens())); - }, new BigNumber(0)) - .div(trades.length) - ); - }; - - const currentRate = (trades) => { - return trades && trades.length ? calculateCurrentRate(trades) : new BigNumber(0); - }; - - return ds.api.pairs.get(fromId, toId) - .then((pair) => { - return transactions.getExchangeTxList({ - limit: 5, - amountAsset: pair.amountAsset, - priceAsset: pair.priceAsset - }) - .then(currentRate) - .then((rate) => { - if (fromId !== pair.priceAsset.id) { - return rate; - } else { - return rate.eq(0) ? rate : new BigNumber(1).div(rate); - } - }) - .catch(() => new BigNumber(0)); - }); - } - - /** - * @param {string} fromId - * @param {string} toId - * @param {Moment} from - * @param {Moment} to - * @return {Promise<{rate: BigNumber, timestamp: Date}[]>} - * @private - */ - _getRateHistory(fromId, toId, from, to) { - const formattedFrom = from.getDate().getTime(); - const formattedTo = to.getDate().getTime(); - - return ds.api.pairs.get(fromId, toId) - .then(pair => { - const amountId = pair.amountAsset.id; - const priceId = pair.priceAsset.id; - const dataService = ds.config.getDataService(); - const int = utils.getMaxInterval(formattedFrom, formattedTo); - const { options } = utils.getValidCandleOptions(formattedFrom, formattedTo, int); - /** - * @type {Array>>} - */ - const promises = options - .map(option => dataService.getCandles(amountId, priceId, option)); - - return Promise.all(promises) - .then(pipe(map(prop('data')), flatten)) - .then(map(item => ({ - close: item.close, - timestamp: new Date(item.time).getTime() - }))) - .then(filter(where({ - close: close => close.gt(0), - timestamp: allPass([gte(__, formattedFrom), lte(__, formattedTo)]) - }))) - .then(list => { - if (equals(length(list), 0)) { - return Promise.reject(new Error(`Nor found by pair ${pair}`)); - } - return list; - }) - .then(map(({ timestamp, close }) => ({ - timestamp: new Date(timestamp), - rate: fromId !== pair.priceAsset.id ? close : new BigNumber(1).div(close) - }))); - }); - } - - /** - * @param {Asset} from - * @param {Asset} to - * @param {BigNumber} rate - * @return {WavesUtils.rateApi} - * @private - */ - _generateRateApi(from, to, rate) { - return { - /** - * @name WavesUtils.rateApi#exchange - * @param {BigNumber} balance - * @return {BigNumber} - */ - exchange(balance) { - return balance.mul(rate.toFixed(8)) - .roundTo(to.precision); - }, - - /** - * @name WavesUtils.rateApi#exchangeReverse - * @param {BigNumber} balance - * @return {BigNumber} - */ - exchangeReverse(balance) { - return (rate ? balance.div(rate) : new BigNumber(0)).roundTo(from.precision); - }, - - /** - * @name WavesUtils.rateApi#rate - */ - rate - }; - } - - /** - * @param {string|Asset} asset - * @return {string} - */ - static toId(asset) { - return typeof asset === 'string' ? asset : asset.id; - } - - } - - return new WavesUtils(); - }; - - factory.$inject = ['assets', 'utils', 'decorators', 'transactions', 'matcher']; - - angular.module('app') - .factory('wavesUtils', factory); -})(); - -/** - * @name WavesUtils.rateApi - */ diff --git a/src/modules/app/services/waves/matcher/Matcher.js b/src/modules/app/services/waves/matcher/Matcher.js deleted file mode 100644 index 6a156c4aa8..0000000000 --- a/src/modules/app/services/waves/matcher/Matcher.js +++ /dev/null @@ -1,458 +0,0 @@ -(function () { - 'use strict'; - - const ds = require('data-service'); - const { Money } = require('@waves/data-entities'); - const { BigNumber } = require('@waves/bignumber'); - const { currentCreateOrderFactory } = require('@waves/signature-adapter'); - const { libs } = require('@waves/waves-transactions'); - const { address } = libs.crypto; - - /** - * @param {app.utils} utils - * @param {app.utils.decorators} decorators - * @param {User} user - * @param {PollCache} PollCache - * @param {ConfigService} configService - * @return {Matcher} - */ - const factory = function (utils, decorators, user, PollCache, configService) { - - /** - * @class - */ - class Matcher { - - /** - * @type {string} - */ - currentMatcherAddress = ''; - - constructor() { - this._orderBookCacheHash = Object.create(null); - - user.onLogin().then( - () => this._handleLogin(), - () => this._handleLogout() - ); - - this._updateCurrentMatcherAddress(); - } - - /** - * @param bids - * @param asks - * @param pair - * @returns {Promise} - * @private - */ - static _remapOrderBook({ bids, asks, pair }) { - return { - pair, - bids: Matcher._remapBidAsks(bids, pair), - asks: Matcher._remapBidAsks(asks, pair) - }; - } - - /** - * @param list - * @param pair - * @returns {Promise<(any[])[]>} - * @private - */ - static _remapBidAsks(list, pair) { - return (list || []).map((item) => { - const amount = item.amount.getTokens(); - const price = item.price.getTokens(); - const total = amount.mul(price); - - return { - amount: amount.toFixed(pair.amountAsset.precision), - price: price.toFixed(pair.priceAsset.precision), - total: total.toFixed(pair.priceAsset.precision) - }; - }); - } - - /** - * @param {Array} bids - * @param {Array} asks - * @returns {Matcher.ISpread} - * @private - */ - static _getSpread(bids, asks) { - const [lastAsk] = asks; - const [firstBid] = bids; - const sell = new BigNumber(firstBid && firstBid.price); - const buy = new BigNumber(lastAsk && lastAsk.price); - const percent = (buy.gt(0)) ? buy.sub(sell).mul(100).div(buy) : new BigNumber(0); - - return firstBid && lastAsk && { - lastAsk, - firstBid, - buy, - sell, - percent - } || null; - } - - /** - * @param options - * @return {Promise>} - */ - getOrders(options) { - return this._getOrders(options, user.address); - } - - /** - * @param {AssetPair} pair - * @return {Promise<{price: Money, lastSide: string}r>} - */ - @decorators.cachable(0.5) - getLastPrice(pair) { - return ds.api.matcher.getLastPrice(pair); - } - - /** - * @param {string} address - * @return {Promise>} - */ - @decorators.cachable(2) - _scriptInfo(address) { - return ds.api.address.getScriptInfo(address); - } - - /** - * @param order - * @return {Promise} - */ - getCreateOrderFee(order) { - const config = configService.getFeeConfig(); - return this.getMinOrderFee() - .then(minFee => { - const currentFee = currentCreateOrderFactory(config, minFee); - const matcherAddress = address({ publicKey: order.matcherPublicKey }, WavesApp.network.code); - - return Promise.all([ - this._scriptInfo(matcherAddress), - ds.api.assets.get('WAVES') - ]).then(([info, asset]) => ({ - asset, - hasScript: info.extraFee.getTokens().gt(0), - currentFee - })); - }) - .then(({ hasScript, currentFee, asset }) => { - const smartAssetIdList = [order.amount.asset, order.price.asset] - .filter(asset => asset.hasScript) - .map(asset => asset.id); - const fee = currentFee({ - assetPair: { - amountAsset: order.amount.asset.id, - priceAsset: order.price.asset.id - }, - matcherPublicKey: order.matcherPublicKey - }, hasScript, smartAssetIdList); - return new Money(fee, asset); - }); - } - - /** - * @param {object} order - * @return {object} - */ - calculateCustomFeeMap(order) { - const smartAssetExtraFee = new BigNumber(configService.getFeeConfig().smart_asset_extra_fee); - const baseFee = new BigNumber(order.baseFee); - const hasScript = order.matcherInfo.extraFee.getTokens().gt(0); - const smartPairAssets = [order.pair.amountAsset, order.pair.priceAsset] - .filter(asset => asset.hasScript); - - const getSmartAssetsQuantity = (feeAsset) => { - const feeIsSmartAndNotInPair = - feeAsset.hasScript && - (smartPairAssets.some(asset => asset.id === feeAsset.id)); - return smartPairAssets.length + Number(feeIsSmartAndNotInPair); - }; - - const feeMap = order.feeAssets.reduce((acc, asset) => { - acc[asset.id] = baseFee - .add(smartAssetExtraFee.mul(getSmartAssetsQuantity(asset))) - .add(smartAssetExtraFee.mul(Number(hasScript))); - return acc; - }, Object.create(null)); - - return feeMap; - - // const feeMap = order.feeAssets.reduce((acc, asset) => { - // acc[asset.id] = baseFee.add(smartAssetExtraFee * getSmartAssetsQuantity(asset)); - // return acc; - // }, Object.create(null)); - // - // return feeMap; - } - - /** - * @return {Promise} - */ - getMinOrderFee() { - return Promise.resolve(new BigNumber(300000)); - } - - /** - * @param {string} asset1 - * @param {string} asset2 - * @return {Promise} - */ - getOrderBook(asset1, asset2) { - return this._getOrderBookCache(asset1, asset2).get(); - } - - /** - * @return {Promise} - */ - @decorators.cachable(5) - getFeeRates() { - return ds.api.matcher.getFeeRates(); - } - - /** - * @return {Promise} - */ - getSettings() { - return ds.api.matcher.getSettings(); - } - - /** - * @param pair - * @param matcherPublicKey - * @return {Promise} - */ - getCreateOrderSettings(pair, matcherPublicKey) { - return this.getSettings() - .then(data => { - const matcherPublicKeyBytes = libs.crypto.base58Decode(matcherPublicKey); - const matcherAddress = libs.crypto.address( - { - publicKey: matcherPublicKeyBytes - }, - ds.config.get('code')); - - if (data.orderFee.dynamic) { - return Promise.all([ - this._scriptInfo(matcherAddress), - ...Object.keys(data.orderFee.dynamic.rates).map(id => ds.api.assets.get(id)) - ]).then(([matcherInfo, ...feeAssets]) => { - if (!feeAssets.length) { - throw new Error('Fee list is empty'); - } - return ({ - basedCustomFee: this.calculateCustomFeeMap({ - pair, - matcherInfo, - feeAssets, - baseFee: data.orderFee.dynamic.baseFee - }), - feeMode: 'dynamic' - }); - }); - } else if (data.orderFee.fixed) { - const feeValue = data.orderFee.fixed['min-fee']; - const feeAsset = data.orderFee.fixed.asset; - return ({ - fee: new Money(feeValue, feeAsset), - feeMode: 'fixed' - }); - } - - throw new Error('Matcher settings are incorrect'); - }) - .catch(() => { - return this.getCreateOrderFee({ - amount: new Money(0, pair.amountAsset), - price: new Money(0, pair.priceAsset), - matcherPublicKey - }).then(fee => { - return ({ - feeMode: 'waves', - fee: fee - }); - }); - }); - } - - /** - * @param {any} [options] - * @param {string} [address] - * @return {Promise>} - * @private - */ - @decorators.cachable(1) - _getOrders(options, address) { - if (address) { - return ds.api.matcher.getOrders(options).then(ds.processOrdersWithStore); - } else { - return Promise.resolve([]); - } - } - - /** - * @param {string} asset1 - * @param {string} asset2 - * @return {Promise<{bids, asks, pair: IAssetPair, spread: {amount: string, price: string, total: string}}>} - * @private - */ - _getOrderBook(asset1, asset2) { - return ds.api.matcher.getOrderBook(asset1, asset2) - .then((orderBook) => Matcher._remapOrderBook(orderBook)) - .then(({ bids, asks, pair }) => ({ - bids, - asks, - pair, - spread: Matcher._getSpread(bids, asks, pair) - })); - } - - /** - * @param {string} asset1 - * @param {string} asset2 - * @return {PollCache} - * @private - */ - _getOrderBookCache(asset1, asset2) { - const hash = this._orderBookCacheHash; - const id = [asset1, asset2].sort(utils.comparators.asc).join('-'); - if (hash[id]) { - clearTimeout(hash[id].timer); - hash[id].timer = setTimeout(() => { - hash[id].cache.destroy(); - delete hash[id]; - }, 2000); - return hash[id].cache; - } else { - hash[id] = { - timer: setTimeout(() => { - hash[id].cache.destroy(); - delete hash[id]; - }, 2000), - cache: new PollCache({ - getData: () => this._getOrderBook(asset1, asset2), - timeout: 1000 - }) - }; - return hash[id].cache; - } - } - - /** - * @private - */ - _updateCurrentMatcherAddress() { - const networkMatcher = user.getSetting('network.matcher'); - - ds.fetch(networkMatcher).then(matcherPublicKey => { - if (matcherPublicKey) { - const matcherPublicKeyBytes = libs.crypto.base58Decode(matcherPublicKey); - const matcherAddress = libs.crypto.address( - { - publicKey: matcherPublicKeyBytes - }, - ds.config.get('code')); - - this.currentMatcherAddress = matcherAddress; - } - }); - } - - /** - * @private - */ - _handleLogin() { - user.changeSetting.on(this._onUserChangeSetting, this); - user.logoutSignal.once(this._handleLogout, this); - } - - /** - * @private - */ - _handleLogout() { - user.changeSetting.off(this._onUserChangeSetting); - user.loginSignal.once(this._handleLogin, this); - } - - _onUserChangeSetting(path) { - if (path === 'network.matcher') { - this._updateCurrentMatcherAddress(); - } - } - - } - - return new Matcher(); - }; - - factory.$inject = ['utils', 'decorators', 'user', 'PollCache', 'configService']; - - angular.module('app').factory('matcher', factory); -})(); - -/** - * @name Matcher - */ - -/** - * @typedef {object} Matcher#IOrderApi - * @property {string} price - * @property {string} amount - */ - -/** - * @typedef {object} Matcher#IOrder - * @property {string} price - * @property {string} amount - * @property {string} total - */ - -/** - * @typedef {object} Matcher#IPair - * @property {string} priceAsset - * @property {string} amountAsset - */ - -/** - * @typedef {object} Matcher#ISpread - * @property {Matcher.IOrderApi} lastAsk - * @property {Matcher.IOrderApi} firstBid - * @property {BigNumber} buy - * @property {BigNumber} sell - * @property {BigNumber} percent - */ - -/** - * @typedef {object} Matcher#IOrderBookResult - * @property {Array} asks - * @property {Array} bids - * @property {Matcher.IPair} pair - * @property {Matcher.ISpread} spread - * @property {number} timestamp - */ - -/** - * @typedef {object} Matcher#IOrder - * @property {string} id - * @property {IAssetPair} assetPair - * @property {Money} filled - * @property {boolean} isActive - * @property {string} pair - * @property {BigNumber} percent - * @property {Money} price - * @property {string} state - * @property {string} status - * @property {Money} total - * @property {string} type - */ - -/** - * @typedef {object} Matcher#IFeeMap - * @property {number} - */ diff --git a/src/modules/app/services/waves/node/content/Assets.js b/src/modules/app/services/waves/node/content/Assets.js index 0059f6d32c..f0f4ddd038 100644 --- a/src/modules/app/services/waves/node/content/Assets.js +++ b/src/modules/app/services/waves/node/content/Assets.js @@ -13,7 +13,7 @@ * @param {IPollCreate} createPoll * @return {Assets} */ - const factory = function (BaseNodeComponent, utils, user, decorators, createPoll) { + const factory = function (BaseNodeComponent, utils, user, decorators) { class Assets extends BaseNodeComponent { @@ -146,23 +146,15 @@ * @return {Promise} */ userBalances() { - return ds.dataManager.getBalances(); + return Promise.resolve([]); } giveMyScamBack() { user.scam = Object.create(null); - if (this._pollScam) { - this._pollScam.destroy(); - this._pollScam = null; - } } giveMyTokensNameBack() { user.tokensName = Object.create(null); - if (this._pollTokensNames) { - this._pollTokensNames.destroy(); - this._pollTokensNames = null; - } } stopScam() { @@ -170,7 +162,6 @@ * @type {Poll} * @private */ - this._pollScam = createPoll(this, this._getScamAssetList, this._setScamAssetList, 15000); } tokensNameList() { @@ -178,32 +169,8 @@ * @type {Poll} * @private */ - this._pollTokensNames = createPoll( - this, - this._getTokensNameList, - hash => user.setTokensNameList(hash), - 20000 - ); } - /** - * @return {Promise>} - * @private - */ - _getTokensNameList() { - return ds.fetch(`${user.getSetting('tokensNameListUrl')}?${WavesApp.version}-${Date.now()}`) - .then((text) => { - const papa = require('papaparse'); - const hash = Object.create(null); - papa.parse(text).data.forEach(([id]) => { - if (id) { - hash[id] = true; - } - }); - return hash; - }) - .catch(() => Object.create(null)); - } /** * @private @@ -272,8 +239,7 @@ 'BaseNodeComponent', 'utils', 'user', - 'decorators', - 'createPoll' + 'decorators' ]; angular.module('app') diff --git a/src/modules/app/services/waves/node/content/Transactions.js b/src/modules/app/services/waves/node/content/Transactions.js index a79d904d0e..bcc6bcc6e5 100644 --- a/src/modules/app/services/waves/node/content/Transactions.js +++ b/src/modules/app/services/waves/node/content/Transactions.js @@ -7,10 +7,9 @@ * @param {Aliases} aliases * @param {app.utils.decorators} decorators * @param {BaseNodeComponent} BaseNodeComponent - * @param {Matcher} matcher * @return {Transactions} */ - const factory = function (user, utils, aliases, decorators, BaseNodeComponent, matcher) { + const factory = function (user, utils, aliases, decorators, BaseNodeComponent) { const tsUtils = require('ts-utils'); const R = require('ramda'); @@ -103,18 +102,6 @@ .then(([utxTxList, txList]) => utxTxList.concat(txList)); } - /** - * @param {ExchangeTxFilters} prams - * @param {IGetExchangeOptions} [options] - * @returns {Promise} - */ - getExchangeTxList(prams, options) { - return ds.api.transactions.getExchangeTxList({ - matcher: matcher.currentMatcherAddress, - ...prams - }, options); - } - createTransaction(txData) { const tx = { sender: user.address, @@ -298,7 +285,7 @@ return utils.bind(new Transactions()); }; - factory.$inject = ['user', 'utils', 'aliases', 'decorators', 'BaseNodeComponent', 'matcher']; + factory.$inject = ['user', 'utils', 'aliases', 'decorators', 'BaseNodeComponent']; angular.module('app') .factory('transactions', factory); diff --git a/src/modules/create/controllers/CreateCtrl.js b/src/modules/create/controllers/CreateCtrl.js deleted file mode 100644 index ef7c0ff645..0000000000 --- a/src/modules/create/controllers/CreateCtrl.js +++ /dev/null @@ -1,211 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {typeof Base} Base - * @param {ng.IScope} $scope - * @param {ng.IQService} $q - * @param {*} $state - * @param {User} user - * @param {ModalManager} modalManager - * @param {ISeedService} seedService - * @return {CreateCtrl} - */ - const controller = function (Base, $scope, $q, $state, user, modalManager, seedService) { - - const analytics = require('@waves/event-sender'); - const PATH = 'modules/create/templates'; - const ORDER_LIST = [ - 'createAccount', - 'createAccountData' - ]; - - const STATE_HASH = { - CREATE_ACCOUNT: 0, - CREATE_ACCOUNT_DATA: 1, - SHOW_NO_BACKUP_NOW_MONEY: 2, - BACKUP: 3, - CONFIRM_BACKUP: 4 - }; - - class CreateCtrl extends Base { - - constructor() { - super($scope); - - this.invitationStep = 0; - this.stepIndex = 0; - this.name = ''; - this.seed = ''; - this.address = ''; - this.seedList = []; - this.seedIsValid = false; - this.seedConfirmWasFilled = false; - this.saveUserData = true; - - this.resetAddress(); - } - - onSeedConfirmFulfilled(isValid) { - this.seedIsValid = isValid; - this.seedConfirmWasFilled = true; - - this.observeOnce('stepIndex', this.clearSeedConfirm); - } - - seedOnTouch() { - this.seedConfirmWasFilled = false; - } - - clearSeedConfirm() { - seedService.clear.dispatch(); - this.seedIsValid = false; - this.seedConfirmWasFilled = false; - } - - setActiveSeed(item) { - const old = tsUtils.find(this.seedList, { active: true }); - if (old) { - old.active = false; - } - item.active = true; - this.seed = item.seed; - this.address = item.address; - } - - getStepUrl() { - return `${PATH}/${ORDER_LIST[this.stepIndex]}.html`; - } - - create() { - analytics.send({ name: 'Create Confirm Phrase Confirm Click' }); - - return this._create(true); - } - - createWithoutBackup() { - analytics.send({ name: 'Create Do It Later Click' }); - - return this._create(false); - } - - clickCopySeed() { - analytics.send({ name: 'Create Backup Phrase Copy Click' }); - } - - /** - * @param {number} [index] - */ - next(index) { - - if (!index) { - index = this.stepIndex + 1; - } - - if (index < 0) { - index = this.stepIndex + index; - } - - if (index === STATE_HASH.CREATE_ACCOUNT_DATA) { - analytics.send({ name: 'Create Protect Your Account Show' }); - } - if (this.stepIndex === STATE_HASH.CREATE_ACCOUNT_DATA && index > this.stepIndex) { - analytics.send({ name: 'Create Protect Your Account Continue Click' }); - } - if (index === STATE_HASH.SHOW_NO_BACKUP_NOW_MONEY) { - analytics.send({ name: 'Create No Backup Show' }); - } - if (this.stepIndex === STATE_HASH.SHOW_NO_BACKUP_NOW_MONEY && index > this.stepIndex) { - analytics.send({ name: 'Create Back Up Now Click' }); - } - if (index === STATE_HASH.BACKUP) { - analytics.send({ name: 'Create Backup Phrase Show' }); - } - if (this.stepIndex === STATE_HASH.BACKUP && index > this.stepIndex) { - analytics.send({ name: 'Create Backup Phrase I Written Click' }); - } - if (index === STATE_HASH.CONFIRM_BACKUP) { - analytics.send({ name: 'Create Confirm Phrase Show' }); - } - - if (!ORDER_LIST[index]) { - throw new Error('Wrong order list index!'); - } else { - return this.checkNext() - .then(() => { - this.stepIndex = index; - if (index === STATE_HASH.BACKUP) { - analytics.send({ name: 'Create Backup Phrase Show' }); - } - if (index === STATE_HASH.CONFIRM_BACKUP) { - analytics.send({ name: 'Create Confirm Phrase Show' }); - } - }); - } - } - - nextInvitationStep() { - this.invitationStep += 1; - } - - checkNext() { - const step = ORDER_LIST[this.stepIndex]; - if (step === 'noBackupNoMoney') { - analytics.send({ name: 'Create Warning Show' }); - return this.showBackupWarningPopup() - .then(() => { - analytics.send({ name: 'Create Warning I Understand Click' }); - }); - } - return $q.when(); - } - - resetAddress() { - const list = []; - for (let i = 0; i < 5; i++) { - const phrase = ds.Seed.create().phrase; - const seedData = new ds.Seed(phrase, window.WavesApp.network.code); - list.push({ seed: seedData.phrase, address: seedData.address }); - } - - this.setActiveSeed(list[0]); - this.seedList = list; - } - - showBackupWarningPopup() { - return modalManager.showCustomModal({ - templateUrl: 'modules/create/templates/noBackupNoMoney.modal.html', - clickOutsideToClose: false, - escapeToClose: false - }); - } - - /** - * @param hasBackup - * @return {Promise} - * @private - */ - _create(hasBackup) { - const newUser = { - userType: 'seed', - networkByte: WavesApp.network.code.charCodeAt(0), - name: this.name, - seed: this.seed - }; - - return user.create(newUser, hasBackup).then(() => { - $state.go(user.getActiveState('wallet')); - }); - } - - } - - return new CreateCtrl(); - }; - - controller.$inject = [ - 'Base', '$scope', '$q', '$state', 'user', 'modalManager', 'seedService' - ]; - - angular.module('app.create').controller('CreateCtrl', controller); -})(); diff --git a/src/modules/create/create.js b/src/modules/create/create.js deleted file mode 100644 index 7d5ffcaf83..0000000000 --- a/src/modules/create/create.js +++ /dev/null @@ -1,5 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.create', []); -})(); diff --git a/src/modules/create/less/backup-seed.less b/src/modules/create/less/backup-seed.less deleted file mode 100644 index 0e70ae5fbb..0000000000 --- a/src/modules/create/less/backup-seed.less +++ /dev/null @@ -1,16 +0,0 @@ -@import (reference) 'config'; -@import (reference) '../../app/less/app'; - -.backup-seed { - w-seed-read { - display: block; - margin: 5px 0 30px 0; - } -} - -md-dialog-content { - .backup-seed, - .confirm-backup { - margin-top: 60px; - } -} \ No newline at end of file diff --git a/src/modules/create/less/confirm-backup.less b/src/modules/create/less/confirm-backup.less deleted file mode 100644 index 139597f9cb..0000000000 --- a/src/modules/create/less/confirm-backup.less +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/src/modules/create/less/create-account.less b/src/modules/create/less/create-account.less deleted file mode 100644 index 76d47469d6..0000000000 --- a/src/modules/create/less/create-account.less +++ /dev/null @@ -1,33 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; -@import (reference) '../../app/less/app'; - -@createAvatarBorder: 4px; -@createAvatarSize: 50px; -@createAvatarHoverSize: 60px; -@createAvatarSizePhone: @createAvatarSize - 10px; -@createAvatarHoverSizePhone: @createAvatarHoverSize - 10px; -@createAvatarWrapperSize: @createAvatarHoverSize + @createAvatarBorder * 2; -@createAvatarWrapperSizePhone: @createAvatarHoverSizePhone + @createAvatarBorder * 2; - -.avatars { - &-list { - flex-direction: row; - overflow: hidden; - display: flex; - - &-wrap { // .avatar__wrap - display: flex; - align-items: center; - justify-content: center; - width: 20% !important; - padding: 20px 0; - flex-shrink: 0; - } - } - - &-scroll { - display: flex; - flex-direction: column; - } -} diff --git a/src/modules/create/less/create.less b/src/modules/create/less/create.less deleted file mode 100644 index 8d074a7309..0000000000 --- a/src/modules/create/less/create.less +++ /dev/null @@ -1,28 +0,0 @@ -@import (reference) 'config'; - -.create { - .create-hidden { - display: none; - } - - md-dialog-content { - padding: 20px 40px 40px; - } - - .create-account { - .input-like { - background-color: @color-basic-50; - } - - } -} - -.create-account__checkbox { - margin: 20px 0 30px; -} - -@media screen and (max-width: 480px) { - .create-account__checkbox { - margin: 15px 0 20px; - } -} \ No newline at end of file diff --git a/src/modules/create/less/no-backup-no-money.less b/src/modules/create/less/no-backup-no-money.less deleted file mode 100644 index 72e36b315d..0000000000 --- a/src/modules/create/less/no-backup-no-money.less +++ /dev/null @@ -1,64 +0,0 @@ -@import (reference) 'icons'; -@import (reference) '../../app/less/app'; - -.no-backup-no-money { - .icon { - background: @slide-backup-icon no-repeat center center; - background-size: cover; - width: 260px; - height: 216px; - margin: 0 auto 25px; - } -} - -.no-backup-no-money-modal { - padding: 40px 50px 0 50px; - display: flex; - flex-direction: column; - justify-content: flex-start; - text-align: center; - - //FF ignores padding bottom fix - &::after { - content: ''; - min-height: 40px; - display: block; - position: relative; - width: 100%; - } - - .icon { - background: @slide-seed-icon no-repeat center center; - width: 106px; - height: 106px; - min-height: 106px; - margin: 0 auto 30px; - } - - w-button { - width: 224px; - margin: 40px auto 0; - } -} - -@media screen and (max-width: 480px) { - .no-backup-no-money-modal { - padding: 20px; - min-height: calc(100vh ~'- 20px'); - min-width: calc(100vw ~'- 20px'); - - //FF ignores padding bottom fix - &::after { - min-height: 20px; - } - } -} - -@media screen and (max-width: 768px) { - .no-backup-no-money { - .icon { - width: 240px; - height: 200px; - } - } -} \ No newline at end of file diff --git a/src/modules/create/templates/backupSeed.html b/src/modules/create/templates/backupSeed.html deleted file mode 100644 index 60c77f0b7f..0000000000 --- a/src/modules/create/templates/backupSeed.html +++ /dev/null @@ -1,34 +0,0 @@ -
-
- -
- -
- - -
- -
- -   -   - - - -
- - - -
- -
- -
- - - -
- -
diff --git a/src/modules/create/templates/confirmBackup.html b/src/modules/create/templates/confirmBackup.html deleted file mode 100644 index bc05b9a3f9..0000000000 --- a/src/modules/create/templates/confirmBackup.html +++ /dev/null @@ -1,40 +0,0 @@ -
- -
- -
- -
- - -
- - - -
- -
- - - -
- -
- - -
- - - - - -
diff --git a/src/modules/create/templates/create.html b/src/modules/create/templates/create.html deleted file mode 100644 index 72f0128732..0000000000 --- a/src/modules/create/templates/create.html +++ /dev/null @@ -1,5 +0,0 @@ - -
- -
- diff --git a/src/modules/create/templates/createAccount.html b/src/modules/create/templates/createAccount.html deleted file mode 100644 index cfb6bb0827..0000000000 --- a/src/modules/create/templates/createAccount.html +++ /dev/null @@ -1,82 +0,0 @@ - diff --git a/src/modules/create/templates/createAccountData.html b/src/modules/create/templates/createAccountData.html deleted file mode 100644 index d3d2438da6..0000000000 --- a/src/modules/create/templates/createAccountData.html +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/src/modules/create/templates/noBackupNoMoney.html b/src/modules/create/templates/noBackupNoMoney.html deleted file mode 100644 index 80ae04f9ed..0000000000 --- a/src/modules/create/templates/noBackupNoMoney.html +++ /dev/null @@ -1,31 +0,0 @@ -
- -
- -
-
- -
- -
- -
- -
- - - -
- -
- -
- -
- - - -
-
- -
diff --git a/src/modules/create/templates/noBackupNoMoney.modal.html b/src/modules/create/templates/noBackupNoMoney.modal.html deleted file mode 100644 index db2fc3cd93..0000000000 --- a/src/modules/create/templates/noBackupNoMoney.modal.html +++ /dev/null @@ -1,19 +0,0 @@ - -
-
- -
- -
- -
-
-
-
-
- - - - -
- diff --git a/src/modules/desktop/controllers/DesktopCtrl.js b/src/modules/desktop/controllers/DesktopCtrl.js deleted file mode 100644 index 9dcfa8dcfb..0000000000 --- a/src/modules/desktop/controllers/DesktopCtrl.js +++ /dev/null @@ -1,51 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {ModalManager} modalManager - * @param {*} $state - */ - const controller = function (modalManager, $state, Base, storage) { - - class DesktopCtrl extends Base { - - get openLinkViaDesktop() { - return this.openClientMode === 'desktop'; - } - - set openLinkViaDesktop(value) { - if (value) { - this.openClientMode = 'desktop'; - } else { - this.openClientMode = null; - } - storage.save('openClientMode', this.openClientMode); - } - - openClientMode = null; - - constructor() { - super(); - - storage.load('openClientMode').then(mode => { - this.openClientMode = mode; - }); - } - - showTutorialModals() { - return modalManager.showTutorialModals(); - } - - openMainPage() { - return $state.go('welcome'); - } - - } - - return new DesktopCtrl(); - }; - - controller.$inject = ['modalManager', '$state', 'Base', 'storage']; - - angular.module('app.desktop').controller('DesktopCtrl', controller); -})(); diff --git a/src/modules/desktop/desktop.js b/src/modules/desktop/desktop.js deleted file mode 100644 index cd6e285c4e..0000000000 --- a/src/modules/desktop/desktop.js +++ /dev/null @@ -1,5 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.desktop', []); -})(); diff --git a/src/modules/desktop/less/desktop.less b/src/modules/desktop/less/desktop.less deleted file mode 100644 index b5938a49c0..0000000000 --- a/src/modules/desktop/less/desktop.less +++ /dev/null @@ -1,23 +0,0 @@ -@import (reference) "icons"; - -body.web.desktop { - .login-buttons { - display: none; - } -} - -.desktop-page { - &__icon { - width: 100%; - height: 209px; - background: @desktop-page-icon no-repeat center bottom; - } - - &__checkbox { - margin: 20px 0 30px; - - @media screen and (max-width: 480px) { - margin: 15px 0 20px; - } - } -} diff --git a/src/modules/desktop/less/electron.less b/src/modules/desktop/less/electron.less deleted file mode 100644 index 9687b3c2fa..0000000000 --- a/src/modules/desktop/less/electron.less +++ /dev/null @@ -1,201 +0,0 @@ -@import (reference) 'config'; -@import (reference) "icons"; -@import (reference) '../../app/less/typography'; - - -body.desktop:not(.web) { - w-web-only { - &:empty { - display: none; - } - } - - .import-modal__blocks-wrapper { - flex-direction: column; - max-width: @getStartedContentWidth; - margin: auto; - margin-top: 40px; - } - - .import-modal__block { - padding: 20px; - margin: 0 0 10px; - display: flex; - flex-direction: row; - } - - .import-modal__icon { - margin: 0; - width: 40px; - height: 40px; - } - - .import-modal__content { - text-align: left; - margin-left: 20px; - - &-title { - margin-bottom: 4px; - } - } - - ui-view[name="main"] { - display: flex; - flex-direction: column; - } - - .main-container { - min-height: calc(100vh ~'- 136px'); - - &-wrapper { - min-height: auto; - @media screen and (max-height: 768px) { - min-height: 700px; - } - } - } - - div.wrapper { - display: flex; - flex-direction: column; - background: @color-white; - } - - .section-contest { - display: none; - } - - .footer { - background: @color-info-50; - width: 100%; - - &__wrap { - display: flex; - flex-direction: row; - align-items: center; - padding: 20px; - color: @color-basic-500; - font-size: 13px; - } - - &__left { - margin-left: auto; - flex-direction: row-reverse; - display: flex; - align-items: center; - - &-item { - white-space: nowrap; - .footnote-1(); - color: @color-basic-500; - margin-left: 15px; - margin-bottom: 0; - } - } - - &-actions { - display: flex; - } - - &-action { - align-items: center; - display: inline-flex; - - &:not(:first-child) { - margin-left: 10px; - - &:before { - content: ''; - height: 14px; - width: 1px; - margin-right: 10px; - background: @color-basic-300; - } - } - } - - &-copyright { - white-space: nowrap; - .footnote-1(); - color: @color-basic-500; - margin-left: 15px; - margin-bottom: 0; - } - - .select .select__wrap .select__title { - background: transparent; - - &:after { - width: 10px; - height: 10px; - background: @select-arrow-icon; - } - } - - .lng-item span { - color: @color-basic-700; - } - } - - .section-welcome { - padding: 40px 0; - height: auto; - min-height: calc(~'100%' - 76px); - margin: auto; - display: flex; - - .dex-screenshot { - display: none; - } - - .left-side { - max-width: 600px; - display: flex; - flex-direction: column; - text-align: center; - align-items: center; - margin: auto; - } - - .welcome-text { - font-size: 38px; - } - - &__wrapper { - justify-content: center; - text-align: center; - } - } - - &.welcome { - .footer { - background: @color-white; - } - } - - .logo-header { - margin: auto; - } - - @media screen and (max-width: 1440px) { - .section-wrapper { - padding-left: 20px; - padding-right: 20px; - } - } -} - - - -body.desktopUpdate:not(.web) { - .main-container { - min-height: 100vh; - - &-wrapper { - min-height: auto; - @media screen and (max-height: 768px) { - min-height: 700px; - } - } - } -} \ No newline at end of file diff --git a/src/modules/desktop/templates/desktop.html b/src/modules/desktop/templates/desktop.html deleted file mode 100644 index b7b917b289..0000000000 --- a/src/modules/desktop/templates/desktop.html +++ /dev/null @@ -1,30 +0,0 @@ - -
- -
-
-
- -
- -

- -
- -
- - -
- - - - -
-
-
-
- - diff --git a/src/modules/desktopUpdate/controllers/DesktopUpdateCtrl.js b/src/modules/desktopUpdate/controllers/DesktopUpdateCtrl.js index 481f4e308a..e0143d8a1e 100644 --- a/src/modules/desktopUpdate/controllers/DesktopUpdateCtrl.js +++ b/src/modules/desktopUpdate/controllers/DesktopUpdateCtrl.js @@ -14,6 +14,7 @@ * @param {*} configService * @param {*} modalManager * @param {*} multiAccount + * @param {Base} Base */ const controller = ( $scope, @@ -25,9 +26,10 @@ user, utils, modalManager, - multiAccount + multiAccount, + Base ) => { - class DesktopUpdateCtrl { + class DesktopUpdateCtrl extends Base { /** * @type {'askDownload' | 'downloading' | 'installAndRun' | 'success' | 'fail' } @@ -42,34 +44,40 @@ signInForm = null; password = ''; showPasswordError = false; - isOldDesktop = false; hasUserList = false; _isCanceled = null; _showSteps = false; _timer = 10; downloadDone = false; + hasAccount = false; constructor() { + super(); if (!WavesApp.isDesktop()) { $state.go(user.getActiveState('wallet')); } - this.isOldDesktop = utils.isVersionLte('1.4.0'); - this._showMoving = !this.isOldDesktop; - - storage.load('userList').then(list => { - if (list && list.length > 0) { - this.hasUserList = true; - } - }); - Promise.all([ user.getMultiAccountData(), - user.getMultiAccountHash() - ]).then(([multiAccountData, multiAccountHash]) => { + user.getMultiAccountHash(), + user.getFilteredUserList() + ]).then(([multiAccountData, multiAccountHash, userList]) => { this.multiAccountData = multiAccountData; this.multiAccountHash = multiAccountHash; this.hasMultiAccount = !!multiAccountData; + if (userList && userList.length > 0) { + this.hasUserList = true; + } + this.hasAccount = this.hasMultiAccount || this.hasUserList; + + if (!this.hasAccount) { + this.download(); + this.observe('state', () => { + if (this.state !== 'downloading') { + $state.go('welcome'); + } + }); + } }); } @@ -88,7 +96,7 @@ exportStorageService.export({ provider: connectProvider, attempts: 1000, - timeout: 1500 + timeout: 6000 }); exportStorageService.onData().then(result => { @@ -126,9 +134,7 @@ this.password, undefined, this.multiAccountHash - ).then(() => { - this.toMigration(); - }).catch(() => { + ).catch(() => { this.password = ''; this.showPasswordError = true; }); @@ -213,11 +219,7 @@ } toHome() { - $state.go(user.getActiveState('wallet')); - } - - toMigration() { - this._showMoving = true; + $state.go('welcome'); } _toInstallAndRun() { @@ -280,12 +282,18 @@ ds.utils.abortDownloading(); } + cancelDownloadAndGoWelcome() { + this.cancelDownload(); + $state.go('welcome'); + } + showFAQ() { modalManager.showMigrateFAQ(); } _decreaseTimer() { this._timer = this._timer - 1; + $scope.$apply(); } // @TODO сделать плюризацию @@ -317,7 +325,8 @@ 'user', 'utils', 'modalManager', - 'multiAccount' + 'multiAccount', + 'Base' ]; angular.module('app.desktopUpdate').controller('DesktopUpdateCtrl', controller); diff --git a/src/modules/desktopUpdate/less/desktopUpdate.less b/src/modules/desktopUpdate/less/desktopUpdate.less index 7e8d3384d9..aa01bd4f0e 100644 --- a/src/modules/desktopUpdate/less/desktopUpdate.less +++ b/src/modules/desktopUpdate/less/desktopUpdate.less @@ -326,11 +326,3 @@ margin: auto; font-size: 12px; } - -//.warning-timer + .ui-view { -// height: 100%; -//} -// -//body.desktop:not(.web) .main-container { -// min-height: 100%; -//} diff --git a/src/modules/desktopUpdate/less/electron.less b/src/modules/desktopUpdate/less/electron.less new file mode 100644 index 0000000000..0f14aa4819 --- /dev/null +++ b/src/modules/desktopUpdate/less/electron.less @@ -0,0 +1,214 @@ +@import (reference) 'config'; +@import (reference) "icons"; +@import (reference) '../../app/less/typography'; + + +body.desktop:not(.web) { + w-web-only { + &:empty { + display: none; + } + } + + .dexw-locked { + background: @color-white; + padding: 20px 0; + + &_authorised { + background: transparent; + } + } + + .import-modal__blocks-wrapper { + flex-direction: column; + max-width: @getStartedContentWidth; + margin: auto; + margin-top: 40px; + } + + .import-modal__block { + padding: 20px; + margin: 0 0 10px; + display: flex; + flex-direction: row; + } + + .import-modal__icon { + margin: 0; + width: 40px; + height: 40px; + } + + .import-modal__content { + text-align: left; + margin-left: 20px; + + &-title { + margin-bottom: 4px; + } + } + + ui-view[name="main"] { + display: flex; + flex-direction: column; + } + + .main-container { + min-height: calc(100vh ~'- 136px'); + + &-wrapper { + min-height: auto; + + @media screen and (max-height: 768px) { + min-height: 700px; + } + } + } + + div.wrapper { + display: flex; + flex-direction: column; + background: @color-white; + } + + .section-contest { + display: none; + } + + .footer { + background: @color-info-50; + width: 100%; + + &__wrap { + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; + padding: 12px; + color: @color-basic-500; + font-size: 13px; + } + + &__left { + margin-left: auto; + flex-direction: row-reverse; + display: flex; + align-items: center; + + &-item { + white-space: nowrap; + .footnote-1(); + color: @color-basic-500; + margin-left: 15px; + margin-bottom: 0; + } + } + + &-actions { + display: flex; + } + + &-action { + align-items: center; + display: inline-flex; + + &:not(:first-child) { + margin-left: 10px; + + &:before { + content: ''; + height: 14px; + width: 1px; + margin-right: 10px; + background: @color-basic-300; + } + } + } + + &-copyright { + white-space: nowrap; + .footnote-1(); + color: @color-basic-500; + margin-left: 15px; + margin-bottom: 0; + } + + .select .select__wrap .select__title { + background: transparent; + + &:after { + width: 10px; + height: 10px; + background: @select-arrow-icon; + } + } + + .lng-item span { + color: @color-basic-700; + } + } + + .section-welcome { + padding: 40px 0; + height: auto; + min-height: calc(~'100%' - 76px); + margin: auto; + display: flex; + + .dex-screenshot { + display: none; + } + + .left-side { + max-width: 600px; + display: flex; + flex-direction: column; + text-align: center; + align-items: center; + margin: auto; + } + + .welcome-text { + font-size: 38px; + } + + &__wrapper { + justify-content: center; + text-align: center; + } + } + + &.welcome { + .footer_no-authorised { + background: @color-white; + } + } + + a.logo-header { + margin: auto; + } + + @media screen and (max-width: 1440px) { + .section-wrapper { + padding-left: 20px; + padding-right: 20px; + } + } +} + + + +body.desktopUpdate:not(.web) { + .main-container { + min-height: 100vh; + + &-wrapper { + min-height: auto; + background: @color-white; + + @media screen and (max-height: 768px) { + min-height: 700px; + } + } + } +} \ No newline at end of file diff --git a/src/modules/desktopUpdate/templates/desktopUpdate.html b/src/modules/desktopUpdate/templates/desktopUpdate.html index f8d6a6e815..fd8b6ff55e 100644 --- a/src/modules/desktopUpdate/templates/desktopUpdate.html +++ b/src/modules/desktopUpdate/templates/desktopUpdate.html @@ -3,7 +3,11 @@
-
+
@@ -12,111 +16,7 @@
-
-
-
-
-

- -
-
-
-
-
-
-
- -
-
-
- -
- -
- - - - - - - - - - -
- -
-
- -
-
-
-
- - - - - - - - - -
-
-
-
-
-
- -
-
-

-
-
-
- 1. - -
-
- 2. - -
-
-
-
- -
-

-
-
-
-
- -
-
-
- -
+
@@ -205,7 +105,7 @@

- +
@@ -229,6 +129,18 @@

+ +
+
+
+
+
+
+
+ +
+
+
diff --git a/src/modules/dex/controllers/DexCtrl.js b/src/modules/dex/controllers/DexCtrl.js deleted file mode 100644 index 82ad6288cf..0000000000 --- a/src/modules/dex/controllers/DexCtrl.js +++ /dev/null @@ -1,286 +0,0 @@ -(function () { - 'use strict'; - - const ds = require('data-service'); - - /** - * @param {Base} Base - * @param {JQuery} $element - * @param {$state} $state - * @param {$location} $location - * @param {User} user - * @param {$rootScope.Scope} $scope - * @param {IPollCreate} createPoll - * @param {Waves} waves - * @param {utils} utils - * @param {ModalManager} modalManager - * @return {DexCtrl} - */ - const controller = function ( - Base, - $element, - $state, - $location, - user, - $scope, - createPoll, - waves, - utils, - modalManager) { - - const analytics = require('@waves/event-sender'); - - const ANALYTICS_TABS_NAMES = { - myOpenOrders: 'My Open Orders', - myTradeHistory: 'My Trade History', - tradeHistory: 'Trade History', - myBalance: 'My Balance' - }; - - class DexCtrl extends Base { - - /** - * @type {string} - */ - _titleTxt; - - constructor() { - super($scope); - /** - * @type {boolean} - */ - this.ready = false; - /** - * @type {boolean} - */ - this.isLogined = !!user.address; - /** - * @type {boolean} - * @private - */ - this._leftHidden = false; - /** - * @type {boolean} - * @private - */ - this._rightHidden = false; - /** - * @type {{price: string, amount: string}} - * @private - */ - this._assetIdPair = null; - - this.observe('tab', this._onChangeTab); - - this.syncSettings({ - tab: 'dex.layout.bottomleft.tab', - _leftHidden: 'dex.layout.leftColumnState', - _rightHidden: 'dex.layout.rightColumnState', - _assetIdPair: 'dex.assetIdPair' - }); - - if (!this.isLogined) { - this.tab = 'tradeHistory'; - } - - const matcherSign = () => { - return user.address ? user.addMatcherSign() : Promise.resolve(); - }; - - matcherSign() - .catch(() => Promise.resolve()) - .then(() => { - this._initializePair().then(() => { - this.ready = true; - $scope.$apply(); - }); - }); - - createPoll(this, this._getLastPrice, '_titleTxt', 1000); - - this.observe('_assetIdPair', this._onChangePair); - this.observe('_titleTxt', this._setTitle); - this.observe(['_leftHidden', '_rightHidden'], this._onChangeProperty); - } - - $onDestroy() { - super.$onDestroy(); - window.document.title = 'Waves DEX'; - } - - // hide and show graph to force its resize - toggleColumn(column) { - this[`_${column}Hidden`] = !this[`_${column}Hidden`]; - } - - /** - * @private - */ - async _onChangePair() { - const userAssetIdPair = user.getSetting('dex.assetIdPair'); - if (utils.isLockedInDex(userAssetIdPair.amount, userAssetIdPair.price)) { - return this._showModalAndRedirect(userAssetIdPair.amount, userAssetIdPair.price); - } - const pair = await this._getPair(); - $location.search('assetId2', pair.amountAsset.id); - $location.search('assetId1', pair.priceAsset.id); - } - - /** - * @return {Promise} - * @private - */ - _showModalAndRedirect(amountAssetId, priceAssetId) { - Promise.all([ - waves.node.assets.getAsset(amountAssetId), - waves.node.assets.getAsset(priceAssetId) - ]).then(([priceAsset, amountAsset]) => { - const amountAssetName = amountAsset.ticker || amountAsset.displayName; - const priceAssetName = priceAsset.ticker || priceAsset.displayName; - - const findUnlocked = assetId => assetId !== 'WAVES' && !utils.isLockedInDex(assetId); - - const unLockedAsset = utils.isLockedInDex(WavesApp.defaultAssets.BTC) ? - Object.values(WavesApp.defaultAssets).find(findUnlocked) : - WavesApp.defaultAssets.BTC; - - - user.setSetting('dex.assetIdPair', { - amount: WavesApp.defaultAssets.WAVES, - price: unLockedAsset - }); - - return modalManager.showLockPairWarning(amountAssetName, priceAssetName) - .then(() => { - $location.search('assetId2', WavesApp.defaultAssets.WAVES); - $location.search('assetId1', unLockedAsset); - this._initializePair(); - }); - }); - } - - /** - * @private - */ - _onChangeTab() { - if (ANALYTICS_TABS_NAMES[this.tab]) { - analytics.send({ name: `DEX ${ANALYTICS_TABS_NAMES[this.tab]} Show`, target: 'ui' }); - } - } - - /** - * @return {Promise} - * @private - */ - _getLastPrice() { - return this._getPair().then(pair => { - const pairText = `| ${pair.amountAsset.displayName}/${pair.priceAsset.displayName}`; - return waves.matcher.getLastPrice(pair).then(data => { - const priceText = data.price.getTokens().isNaN() ? '-' : data.price.toFormat(); - return `${priceText} ${pairText}`; - }, () => { - return `- ${pairText}`; - }); - }); - } - - /** - * @return {Promise} - * @private - */ - _initializePair() { - return new Promise((resolve) => { - setTimeout(() => { - const urlPair = this._getPairFromState(); - if (urlPair) { - return this._getPair(urlPair) - .catch(() => this._getPair({ - amount: WavesApp.defaultAssets.WAVES, - price: WavesApp.defaultAssets.BTC - })) - .then(({ amountAsset, priceAsset }) => { - const activeTab = user.getSetting('dex.watchlist.activeTab'); - - if (activeTab !== 'all' && - activeTab !== amountAsset.id && - activeTab !== priceAsset.id) { - user.setSetting('dex.watchlist.activeTab', 'all'); - } - - this._assetIdPair = { - amount: amountAsset.id, - price: priceAsset.id - }; - }) - .then(resolve); - } else { - this._onChangePair(); - resolve(); - } - }, 200); - }); - } - - /** - * @private - */ - _getPair(pair = this._assetIdPair) { - if (pair) { - return ds.api.pairs.get(pair.amount, pair.price); - } else { - return ds.api.pairs.get(WavesApp.defaultAssets.WAVES, WavesApp.defaultAssets.BTC); - } - } - - /** - * @private - */ - _getPairFromState() { - if (!($state.params.assetId1 && $state.params.assetId2)) { - return null; - } - - return { - amount: $state.params.assetId1, - price: $state.params.assetId2 - }; - } - - /** - * @private - */ - _onChangeProperty() { - const $graphWrapper = $element.find('.graph-wrapper'); - $graphWrapper.hide(); - setTimeout(() => $graphWrapper.show(), 100); - } - - /** - * @private - */ - _setTitle() { - window.document.title = this._titleTxt; - } - - } - - return new DexCtrl(); - }; - - - controller.$inject = [ - 'Base', - '$element', - '$state', - '$location', - 'user', - '$scope', - 'createPoll', - 'waves', - 'utils', - 'modalManager' - ]; - - angular.module('app.dex') - .controller('DexCtrl', controller); -})(); diff --git a/src/modules/dex/dex.js b/src/modules/dex/dex.js deleted file mode 100644 index 406d20839f..0000000000 --- a/src/modules/dex/dex.js +++ /dev/null @@ -1,5 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.dex', []); -})(); diff --git a/src/modules/dex/directives/createOrder/CreateOrder.js b/src/modules/dex/directives/createOrder/CreateOrder.js deleted file mode 100644 index b122b1c4aa..0000000000 --- a/src/modules/dex/directives/createOrder/CreateOrder.js +++ /dev/null @@ -1,1057 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param {Waves} waves - * @param {User} user - * @param {app.utils} utils - * @param {IPollCreate} createPoll - * @param {$rootScope.Scope} $scope - * @param {JQuery} $element - * @param {INotification} notification - * @param {DexDataService} dexDataService - * @param {Ease} ease - * @param {$state} $state - * @param {ModalManager} modalManager - * @param {BalanceWatcher} balanceWatcher - * @param {Transactions} transactions - * @return {CreateOrder} - */ - const controller = function (Base, waves, user, utils, createPoll, $scope, $element, notification, - dexDataService, ease, $state, modalManager, balanceWatcher, transactions) { - - const { without, keys, last } = require('ramda'); - const { Money } = require('@waves/data-entities'); - const { BigNumber } = require('@waves/bignumber'); - const ds = require('data-service'); - const analytics = require('@waves/event-sender'); - - class CreateOrder extends Base { - - - /** - * @return {string} - */ - get priceDisplayName() { - return this.priceBalance && this.priceBalance.asset.displayName || ''; - } - - /** - * @return {string} - */ - get amountDisplayName() { - return this.amountBalance && this.amountBalance.asset.displayName || ''; - } - - get loaded() { - return this.amountBalance && this.priceBalance && this.fee; - } - - /** - * Max amount (with fee) - * @type {Money} - */ - maxAmountBalance = null; - /** - * Has price balance for buy amount - * @type {boolean} - */ - canBuyOrder = true; - /** - * Amount asset balance - * @type {Money} - */ - amountBalance = null; - /** - * Price asset balance - * @type {Money} - */ - priceBalance = null; - /** - * Order type - * @type {string} - */ - type = 'buy'; - /** - * Max balance in price asset - * @type {Money} - */ - maxPriceBalance = null; - /** - * Total price (amount multiply price) - * @type {Money} - */ - total = null; - /** - * @type {Money} - */ - amount = null; - /** - * @type {Money} - */ - price = null; - /** - * @type {boolean} - */ - loadingError = false; - /** - * @type {boolean} - */ - idDemo = !user.address; - /** - * @type {number} - */ - ERROR_DISPLAY_INTERVAL = 3; - /** - * @type {{amount: string, price: string}} - * @private - */ - _assetIdPair = null; - /** - * @type string - * @private - */ - analyticsPair = null; - /** - * @type {Money} - * @private - */ - lastTradePrice = null; - /** - * @type {Array} - */ - changedInputName = []; - /** - * @type {boolean} - */ - _silenceNow = false; - /** - * @type {Array} - */ - _userList = []; - /** - * - * @type {boolean} - */ - expirationValues = [ - { name: '5min', value: () => utils.moment().add().minute(5).getDate().getTime() }, - { name: '30min', value: () => utils.moment().add().minute(30).getDate().getTime() }, - { name: '1hour', value: () => utils.moment().add().hour(1).getDate().getTime() }, - { name: '1day', value: () => utils.moment().add().day(1).getDate().getTime() }, - { name: '1week', value: () => utils.moment().add().week(1).getDate().getTime() }, - { name: '30day', value: () => utils.moment().add().day(29).getDate().getTime() } - ]; - /** - * @type {Money} - */ - maxAmount = null; - /** - * @type {Array} - */ - feeList = []; - /** - * @type {Object} - */ - matcherSettings = {}; - /** - * @type {Poll} - */ - feePoll = null; - - - constructor() { - super(); - - this.observe(['type', 'amount', 'price', 'amountBalance', 'fee'], this._currentMaxAmount); - - this.receive(dexDataService.chooseOrderBook, ({ type, price, amount }) => { - this.expand(type); - switch (type) { - case 'buy': - this._onClickBuyOrder(price, amount); - break; - case 'sell': - this._onClickSellOrder(price, amount); - break; - default: - throw new Error('Wrong order type!'); - } - $scope.$digest(); - }); - - this.syncSettings({ - _assetIdPair: 'dex.assetIdPair', - expiration: 'dex.createOrder.expirationName' - }); - - this.analyticsPair = `${this._assetIdPair.amount} / ${this._assetIdPair.price}`; - - /** - * @type {Poll} - */ - let lastTraderPoll; - /** - * @type {Poll} - */ - const spreadPoll = createPoll(this, this._getData, this._setData, 1000); - /** - * @type {Poll} - */ - - const onChangeBalanceWatcher = () => { - this._updateBalances(); - if (this.matcherSettings.mode === 'dynamic') { - this._updateFeeList(); - } - }; - this.receive(balanceWatcher.change, onChangeBalanceWatcher, this); - this._updateBalances(); - - const lastTradePromise = new Promise((resolve) => { - balanceWatcher.ready.then(() => { - lastTraderPoll = createPoll(this, this._getLastPrice, 'lastTradePrice', 1000); - resolve(); - }); - }); - - Promise.all([ - ds.api.pairs.get(this._assetIdPair.amount, this._assetIdPair.price), - lastTradePromise, - spreadPoll.ready - ]).then(([pair]) => { - this.amount = new Money(0, pair.amountAsset); - if (this.lastTradePrice && this.lastTradePrice.getTokens().gt(0)) { - this.price = this.lastTradePrice; - } else { - this.price = this._getCurrentPrice(); - } - }); - - this.observe(['amountBalance', 'type', 'fee', 'priceBalance'], this._updateMaxAmountOrPriceBalance); - - this.observe('_assetIdPair', () => { - this.amount = null; - this.price = null; - this.total = null; - this.bid = null; - this.ask = null; - this._updateBalances(); - spreadPoll.restart(); - const form = this.order; - form.$setUntouched(); - form.$setPristine(); - if (lastTraderPoll) { - lastTraderPoll.restart(); - } - - this.isLockedPair = utils.isLockedInDex(this._assetIdPair.amount, this._assetIdPair.price); - - this.analyticsPair = `${this._assetIdPair.amount} / ${this._assetIdPair.price}`; - this.observeOnce(['bid', 'ask'], utils.debounce(() => { - if (this.type) { - this.amount = this.amountBalance.cloneWithTokens('0'); - this.price = this._getCurrentPrice(); - this.total = this.priceBalance.cloneWithTokens('0'); - $scope.$apply(); - } - })); - this._setMatcherSettings(); - }); - - this.observe(['priceBalance', 'total', 'maxPriceBalance'], this._setIfCanBuyOrder); - - this.observe('amount', () => ( - !this._silenceNow && this._updateField({ amount: this.amount }) - )); - - this.observe('price', () => ( - !this._silenceNow && this._updateField({ price: this.price }) - )); - - this.observe('total', () => ( - !this._silenceNow && this._updateField({ total: this.total }) - )); - - // TODO Add directive for stop propagation (catch move for draggable) - $element.on('mousedown touchstart', '.body', (e) => { - e.stopPropagation(); - }); - - user.getMultiAccountUsers().then(list => { - this._userList = list; - }); - - this._setMatcherSettings(); - this.observe('matcherSettings', () => { - if (this.matcherSettings.feeMode === 'dynamic') { - this._updateFeeList(); - if (!this.feePoll) { - this.feePoll = createPoll(this, this._getFeeRates, this._updateFeeList, 20000); - } - } else { - this.fee = this.matcherSettings.fee; - this.feeList = []; - if (this.feePoll) { - this.feePoll.destroy(); - this.feePoll = null; - } - } - $scope.$apply(); - }); - } - - /** - * @param {number} factor - * @return {boolean} - */ - isActiveBalanceButton(factor) { - const amount = this.amount; - - if (!amount || amount.getTokens().eq(0)) { - return false; - } - - return this.maxAmount.cloneWithTokens(this.maxAmount.getTokens().mul(factor)).eq(amount); - } - - /** - * @param {number} factor - */ - setAmountByBalance(factor) { - const amount = this.maxAmount.cloneWithTokens(this.maxAmount.getTokens().mul(factor)); - this._updateField({ amount }); - return Promise.resolve(); - } - - /** - * @return {boolean} - */ - hasBalance() { - return !this.maxAmount.getTokens().isZero(); - } - - - expand(type) { - this.type = type; - if (!this.price || this.price.getTokens().eq('0')) { - this.price = this._getCurrentPrice(); - } - - // todo: refactor after getting rid of Layout-DEX coupling. - $element.parent().parent().parent().parent().parent().addClass('expanded'); - } - - closeCreateOrder() { - // todo: refactor after getting rid of Layout-DEX coupling. - $element.parent().parent().parent().parent().parent().removeClass('expanded'); - } - - /** - * @returns {boolean} - */ - isAmountInvalid() { - return this.isDirtyAndInvalid(this.order.amount); - } - - /** - * @returns {boolean} - */ - isPriceInvalid() { - return this.isDirtyAndInvalid(this.order.price); - } - - /** - * @returns {boolean} - */ - isTotalInvalid() { - return this.isDirtyAndInvalid(this.order.total); - } - - /** - * @param field - * @returns {boolean} - */ - isDirtyAndInvalid(field) { - return field.$touched && field.$invalid; - } - - setMaxAmount() { - const amount = this.maxAmount; - this._updateField({ amount }); - } - - setMaxPrice() { - const amount = this.maxAmount; - const total = this.priceBalance.cloneWithTokens( - this.price.getTokens().mul(amount.getTokens()) - ); - const price = this.price; - this._updateField({ amount, total, price }); - } - - setBidPrice() { - const price = this.priceBalance.cloneWithTokens(String(this.bid.price)); - this._updateField({ price }); - } - - setAskPrice() { - const price = this.priceBalance.cloneWithTokens(String(this.ask.price)); - this._updateField({ price }); - } - - setLastPrice() { - const price = this.lastTradePrice; - this._updateField({ price }); - } - - /** - * @public - * @param field {string} - */ - setChangedInput(field) { - if (last(this.changedInputName) === field) { - return null; - } - if (this.changedInputName.length === 2) { - this.changedInputName.shift(); - } - this.changedInputName.push(field); - } - - /** - * @return {*} - */ - createOrder($event) { - if (this.idDemo) { - return this._showDemoModal(); - } - - const form = this.order; - $event.preventDefault(); - const notify = $element.find('.js-order-notification'); - notify.removeClass('success').removeClass('error'); - - return ds.fetch(ds.config.get('matcher')) - .then((matcherPublicKey) => { - form.$setUntouched(); - $scope.$apply(); - - const data = { - orderType: this.type, - price: this.price, - amount: this.amount, - matcherFee: this.fee, - matcherPublicKey - }; - - this._checkScriptAssets() - .then(() => this._checkOrder(data)) - .then(() => this._sendOrder(data)) - .then(data => { - if (!data) { - return null; - } - - notify.addClass('success'); - this.createOrderFailed = false; - analytics.send({ - name: `DEX ${this.type} Order Transaction Success`, - params: this.analyticsPair - }); - dexDataService.createOrder.dispatch(); - CreateOrder._animateNotification(notify); - }) - .catch(() => { - this.createOrderFailed = true; - notify.addClass('error'); - analytics.send({ - name: `DEX ${this.type} Order Transaction Error`, - params: this.analyticsPair - }); - $scope.$apply(); - CreateOrder._animateNotification(notify); - }); - }); - } - - /** - * @param data - * @return {*|Promise} - * @private - */ - _sendOrder(data) { - const expiration = ds.utils.normalizeTime( - this.expirationValues.find(el => el.name === this.expiration).value() - ); - const clone = { ...data, expiration }; - - return utils.createOrder(clone); - } - - - /** - * @return {Promise} - * @private - */ - _checkScriptAssets() { - if (user.getSetting('tradeWithScriptAssets')) { - return Promise.resolve(); - } - - const scriptAssets = [ - this.amountBalance.asset, - this.priceBalance.asset - ].filter(asset => asset.hasScript); - - if (scriptAssets.length > 0) { - return modalManager.showDexScriptedPair(scriptAssets); - } else { - return Promise.resolve(); - } - } - - /** - * @param orderData - * @private - */ - _checkOrder(orderData) { - const isBuy = orderData.orderType === 'buy'; - const factor = isBuy ? 1 : -1; - const limit = 1 + factor * (Number(user.getSetting('orderLimit')) || 0); - const price = (new BigNumber(isBuy ? this.ask.price : this.bid.price)).mul(limit); - const orderPrice = orderData.price.getTokens(); - - if (price.isNaN() || price.eq(0)) { - return Promise.resolve(); - } - - /** - * @type {BigNumber} - */ - const delta = isBuy ? orderPrice.sub(price) : price.sub(orderPrice); - - if (delta.isNegative()) { - return Promise.resolve(); - } - - return modalManager.showConfirmOrder({ - ...orderData, - orderLimit: Number(user.getSetting('orderLimit')) * 100 - }).catch(() => { - throw new Error('You have cancelled the creation of this order'); - }); - } - - /** - * @return {Promise} - * @private - */ - _showDemoModal() { - return modalManager.showDialogModal({ - iconClass: 'open-main-dex-account-info', - message: { literal: 'modal.createOrder.message' }, - buttons: [ - { - success: false, - classes: 'big', - text: { literal: 'modal.createOrder.cancel' }, - click: () => $state.go('create') - }, - { - success: true, - classes: 'big submit', - text: { literal: 'modal.createOrder.ok' }, - click: () => $state.go(`${this._userList.length > 0 ? 'signIn' : 'welcome'}`) - } - ] - }) - .catch(() => null) - .then(() => { - const form = this.order; - this.amount = null; - form.$setUntouched(); - form.$setPristine(); - }); - } - - /** - * @param {string} priceStr - * @param {string} amountStr - * @private - */ - _onClickBuyOrder(priceStr, amountStr) { - this.changedInputName = ['price']; - const price = this.priceBalance.cloneWithTokens(priceStr); - const maxAmount = this.amountBalance.cloneWithTokens(this.priceBalance.getTokens().div(priceStr)); - const amount = Money.min(this.amountBalance.cloneWithTokens(amountStr), maxAmount); - this._updateField({ amount, price }); - } - - /** - * @param {string} priceStr - * @param {string} amountStr - * @private - */ - _onClickSellOrder(priceStr, amountStr) { - this.changedInputName = ['price']; - const price = this.priceBalance.cloneWithTokens(priceStr); - const amountMoney = this.amountBalance.cloneWithTokens(amountStr); - const amount = Money.min(amountMoney, this.maxAmount); - this._updateField({ amount, price }); - } - - /** - * @return {Money} - * @private - */ - _getMaxAmountForSell() { - const fee = this.fee; - const balance = this.amountBalance; - return balance.safeSub(fee).toNonNegative(); - } - - - /** - * @return {Money} - * @private - */ - _getMaxAmountForBuy() { - const fee = this.fee; - - if (!fee || !this.price || this.price.getTokens().eq(0)) { - return this.amountBalance.cloneWithTokens('0'); - } - - return this.amountBalance.cloneWithTokens( - this.priceBalance.safeSub(fee) - .toNonNegative() - .getTokens() - .div(this.price.getTokens()) - .roundTo(this.amountBalance.asset.precision) - ); - } - - _currentMaxAmount() { - if (this.type === 'buy') { - this.maxAmount = this._getMaxAmountForBuy(); - } else { - this.maxAmount = this._getMaxAmountForSell(); - } - } - - /** - * @return {Promise} - * @private - */ - _getLastPrice() { - return transactions.getExchangeTxList({ - amountAsset: this._assetIdPair.amount, - priceAsset: this._assetIdPair.price, - limit: 1 - }).then(([tx]) => tx && tx.price || null).catch(() => (this.loadingError = false)); - } - - /** - * @private - */ - _updateMaxAmountOrPriceBalance() { - if (!this.amountBalance || !this.fee || !this.priceBalance) { - return null; - } - - if (this.type === 'sell') { - this.maxAmountBalance = this._getMaxAmountForSell(); - this.maxPriceBalance = null; - } else { - this.maxAmountBalance = null; - this.maxPriceBalance = this.priceBalance.safeSub(this.fee).toNonNegative(); - } - } - - /** - * @return {Money} - * @private - */ - _getCurrentPrice() { - switch (this.type) { - case 'sell': - return this.priceBalance.cloneWithTokens(String(this.bid && this.bid.price || 0)); - case 'buy': - return this.priceBalance.cloneWithTokens(String(this.ask && this.ask.price || 0)); - default: - throw new Error('Wrong type'); - } - } - - /** - * @return {Promise} - * @private - */ - _updateBalances() { - if (!this.idDemo) { - return ds.api.pairs.get(this._assetIdPair.amount, this._assetIdPair.price).then(pair => { - this.amountBalance = balanceWatcher.getBalanceByAsset(pair.amountAsset); - this.priceBalance = balanceWatcher.getBalanceByAsset(pair.priceAsset); - utils.safeApply($scope); - }); - } else { - return ds.api.pairs.get(this._assetIdPair.amount, this._assetIdPair.price).then(pair => { - this.amountBalance = Money.fromTokens(10, pair.amountAsset); - this.priceBalance = Money.fromTokens(10, pair.priceAsset); - utils.safeApply($scope); - }); - } - } - - - /** - * @param {object} newState - * @private - */ - _updateField(newState) { - if (this.loaded) { - this._setSilence(() => { - this._applyState(newState); - - const inputKeys = ['price', 'total', 'amount']; - const changingValues = without(keys(newState), inputKeys); - - let changingValue; - if (changingValues.length === 1) { - changingValue = changingValues[0]; - } else { - if (this.changedInputName.length === 0) { - this.changedInputName.push('price'); - } - - if (changingValues.some(el => el === last(this.changedInputName))) { - changingValue = changingValues.find(el => el !== last(this.changedInputName)); - } else { - changingValue = without(this.changedInputName, changingValues)[0]; - } - } - - this._calculateField(changingValue); - this._setIfCanBuyOrder(); - }); - } - } - - /** - * @param {object} newState - * @private - */ - _applyState(newState) { - keys(newState).forEach(key => { - this[key] = newState[key]; - }); - this.order.$setDirty(); - } - - - /** - * @param {function} cb - * @private - */ - _setSilence(cb) { - this._silenceNow = true; - cb(); - this._silenceNow = false; - } - - - /** - * @param {string} fieldName - * @private - */ - _calculateField(fieldName) { - switch (fieldName) { - case 'total': - this._calculateTotal(); - break; - case 'price': - this._calculatePrice(); - break; - case 'amount': - this._calculateAmount(); - break; - default: - break; - } - } - - /** - * @private - */ - _calculateTotal() { - if (!this.price || !this.amount) { - return null; - } - const price = this._validPrice(); - const amount = this._validAmount(); - this._setDirtyField('total', this.priceBalance.cloneWithTokens( - price.mul(amount) - )); - this._silenceNow = true; - } - - /** - * @private - */ - _calculatePrice() { - if (!this.total || !this.amount) { - return null; - } - const total = this._validTotal(); - const amount = this._validAmount(); - this._setDirtyField('price', this.priceBalance.cloneWithTokens( - total.div(amount) - )); - this._silenceNow = true; - } - - /** - * @private - */ - _calculateAmount() { - if (!this.total || !this.price) { - return null; - } - const total = this._validTotal(); - const price = this._validPrice(); - - this._setDirtyField('amount', this.amountBalance.cloneWithTokens( - total.div(price) - )); - this._silenceNow = true; - } - - /** - * @private - */ - _validTotal() { - return this.order.total.$viewValue === '' ? - this.priceBalance.cloneWithTokens('0').getTokens() : - this.total.getTokens(); - } - - /** - * @private - */ - _validPrice() { - return this.order.price.$viewValue === '' ? - this.amountBalance.cloneWithTokens('0').getTokens() : - this.price.getTokens(); - } - - /** - * @private - */ - _validAmount() { - return this.order.amount.$viewValue === '' ? - this.amountBalance.cloneWithTokens('0').getTokens() : - this.amount.getTokens(); - } - - /** - * @private - */ - _setIfCanBuyOrder() { - if (this.type === 'buy' && - this.total && - this.priceBalance && - this.total.asset.id === this.priceBalance.asset.id) { - - if (this.maxPriceBalance) { - this.canBuyOrder = ( - this.total.lte(this.maxPriceBalance) && this.maxPriceBalance.getTokens().gt(0) - ); - } - } else { - this.canBuyOrder = true; - } - } - - /** - * @private - */ - _getData() { - this.loadingError = false; - return waves.matcher.getOrderBook(this._assetIdPair.amount, this._assetIdPair.price) - .then(({ bids, asks, spread }) => { - const [lastAsk] = asks; - const [firstBid] = bids; - - return { lastAsk, firstBid, spread }; - }).catch(() => (this.loadingError = true)); - } - - /** - * @param lastAsk - * @param firstBid - * @param spread - * @private - */ - _setData({ lastAsk, firstBid }) { - this.bid = firstBid || { price: 0 }; - this.ask = lastAsk || { price: 0 }; - - const sell = Number(this.bid.price); - const buy = Number(this.ask.price); - - this.spreadPercent = buy ? (((buy - sell) * 100 / buy) || 0).toFixed(2) : '0.00'; - $scope.$digest(); - } - - /** - * Set only non-zero amount values - * @param {string} field - * @param {Money} value - * @private - */ - _setDirtyField(field, value) { - if (value.getTokens().isNaN() || !value.getTokens().isFinite()) { - return null; - } - this[field] = value; - this.order.$setDirty(); - } - - /** - * - * @return {Promise} - * @private - */ - _updateFeeList() { - return this._getFeeRates() - .then(list => { - const assetsId = this._getOrderedCustomFeeAssetsList(list); - Promise.all( - assetsId.map(id => balanceWatcher.getBalanceByAssetId(id)) - ).then(balances => { - const { basedCustomFee } = this.matcherSettings; - - const feeList = balances - .map(balance => { - const { id } = balance.asset; - const rate = new BigNumber(list[id]); - return balance.cloneWithCoins( - rate.mul(basedCustomFee[id]).roundTo(0, 2) - ); - }); - - const filteredFeeList = feeList.filter((fee, i) => { - return fee.lte(balances[i]) || fee.asset.id === WavesApp.defaultAssets.WAVES; - }); - - if (!filteredFeeList.length) { - this.fee = feeList[0]; - this.feeList = []; - } else if (filteredFeeList.length === 1) { - this.fee = filteredFeeList[0]; - this.feeList = []; - } else { - this.fee = filteredFeeList[0]; - this.feeList = filteredFeeList; - } - }); - - }) - .catch(() => { - this.feeList = []; - }); - } - - /** - * @return {Promise} - * @private - */ - _getFeeRates() { - return waves.matcher.getFeeRates(); - } - - /** - * @return {Promise} - * @private - */ - _setMatcherSettings() { - return Promise.all([ - ds.api.pairs.get(this._assetIdPair.amount, this._assetIdPair.price), - ds.fetch(ds.config.get('matcher')) - ]).then(([pair, matcherPublicKey]) => { - waves.matcher.getCreateOrderSettings(pair, matcherPublicKey) - .then(data => { - this.matcherSettings = data; - }) - .catch(() => null); - }); - } - - /** - * @param {object} list - * @return {string[]} - * @private - */ - _getOrderedCustomFeeAssetsList(list) { - const currentFeeAsset = (this.fee && this.fee.asset.id) || WavesApp.defaultAssets.WAVES; - const { currentFee, otherFee } = Object.keys(list).reduce((acc, id) => { - if (id === currentFeeAsset) { - acc.currentFee.push(id); - } else { - acc.otherFee.push(id); - } - return acc; - }, { currentFee: [], otherFee: [] }); - return [...currentFee, ...otherFee]; - } - - static _animateNotification($element) { - return utils.animate($element, { t: 100 }, { - duration: 1200, - step: function (tween) { - const progress = ease.bounceOut(tween / 100); - $element.css('transform', `translate(0, ${-100 + progress * 100}%)`); - } - }) - .then(() => utils.wait(700)) - .then(() => { - return utils.animate($element, { t: 0 }, { - duration: 500, - step: function (tween) { - const progress = ease.linear(tween / 100); - $element.css('transform', `translate(0, ${(-((1 - progress) * 100))}%)`); - } - }); - }); - } - - } - - return new CreateOrder(); - }; - - controller.$inject = [ - 'Base', - 'waves', - 'user', - 'utils', - 'createPoll', - '$scope', - '$element', - 'notification', - 'dexDataService', - 'ease', - '$state', - 'modalManager', - 'balanceWatcher', - 'transactions' - ]; - - angular.module('app.dex').component('wCreateOrder', { - bindings: {}, - templateUrl: 'modules/dex/directives/createOrder/createOrder.html', - transclude: false, - controller - }); -})(); diff --git a/src/modules/dex/directives/createOrder/createOrder.html b/src/modules/dex/directives/createOrder/createOrder.html deleted file mode 100644 index dab60f5cd7..0000000000 --- a/src/modules/dex/directives/createOrder/createOrder.html +++ /dev/null @@ -1,277 +0,0 @@ - - -
- -
-
-
{{$ctrl.amountDisplayName}} / {{$ctrl.priceDisplayName}}
-
-
- -
- -
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
{{$ctrl.spreadPercent}}%
-
-
-
-
-
-
- -
-
- -
-
- -
-
- - -
- -
-
diff --git a/src/modules/dex/directives/createOrder/createOrder.less b/src/modules/dex/directives/createOrder/createOrder.less deleted file mode 100644 index fe3a9065a3..0000000000 --- a/src/modules/dex/directives/createOrder/createOrder.less +++ /dev/null @@ -1,406 +0,0 @@ -@import (reference) 'config'; -@import (reference) '../../../app/less/typography'; -@import (reference) 'icons'; - -w-button.inactive-order-button { - width: 100%; - - & > *:not(.transparent) { - width: 100%; - background-color: @color-basic-50; - border: 0 none; - cursor: default; - color: @color-basic-500; - - &:hover { - color: @color-basic-500; - } - } -} - -w-create-order { - display: block; - width: 100%; - max-height: 100%; - overflow: hidden; - - .plate-note { - padding: 6px 14px; - } - - .split-half { - display: flex; - justify-content: space-between; - align-items: center; - - .flex { - display: flex; - justify-content: flex-end; - - & > span { - margin-left: 20px; - height: 13px; - } - } - } - - .amount { - .underline-dashed { - font-family: @font-roboto-medium; - } - } - - .underline { - cursor: pointer; - - &::after { - content: ''; - border-bottom: 1px solid @color-basic-200; - display: block; - position: relative; - top: -1px; - } - } - - .underline-dashed { - cursor: pointer; - position: relative; - - &:hover { - &::after { - content: ''; - border-bottom: 1px dashed @color-disabled-400; - display: block; - position: absolute; - bottom: 0; - width: 100%; - height: 1px; - } - } - } - - .icon-close { - position: absolute; - top: 0; - display: none; - height: 30px; - width: 30px; - right: 15px; - background-size: 10px; - background-position: center; - } -} - -.create-order { - position: relative; - - w-input { - .w-input-wrap { - input { - color: @color-disabled-900; - background: @color-white; - - &[type="text"].tiny { - padding: 0 16px; - } - } - } - } - .head { - align-items: center; - width: 100%; - padding: 0 16px; - height: 30px; - position: relative; - display: none; - border-bottom: 1px solid @color-disabled-100; - } - - .body { - .choice { - display: none; - flex-direction: row; - position: relative; - z-index: 2; - text-transform: uppercase; - background-color: @color-white; - - .choose { - width: 50%; - flex-grow: 1; - height: 50px; - padding-top: 8px; - text-align: center; - cursor: pointer; - color: @white-only; - - .name { - font-size: @font-size-caption-2; - text-transform: uppercase; - } - - .price { - .footnote-2(); - } - - &.sell { - background: @color-error-400; - } - - &.buy { - background: @color-submit-400; - } - - &.inactive { - background: black; - } - } - - .middle { - width: 70px; - padding-top: 15px; - text-align: center; - } - } - - .making-order { - .create-order-notification { - z-index: 1; - } - - .areas { - display: flex; - flex-direction: row; - position: relative; - z-index: 3; - - .area { - width: 50%; - flex-grow: 1; - height: 38px; - color: @color-disabled-400; - border-bottom: 1px solid @color-basic-100; - cursor: pointer; - background: @color-white; - text-align: center; - border-top: 2px solid @color-white; - - .name { - line-height: 32px; - text-transform: uppercase; - } - - &:first-child { - border-right: 1px solid @color-basic-100; - } - - .spread { - position: absolute; - left: 50%; - transform: translate(-50%, 50px); - margin-top: -12px; - - span { - display: block; - text-align: center; - } - - .spread-label { - font-size: 9px; - } - } - } - } - - .fields { - padding: 6px 25px 17px; - background: @color-white; - - .field-label { - margin-top: 8px; - padding-bottom: 4px; - } - - .field-fee { - margin: 13px 0; - - span:last-child { - margin-left: 5px; - } - } - - w-input-container.invalid { - .input-like { - border: 1px solid @color-error-200; - } - } - - .input-like { - padding: 0; - display: flex; - align-items: center; - border-radius: @border-radius / 2; - - w-input { - display: block; - width: 50%; - - input { - height: 28px; - border: none; - } - } - - .asset-name-wrap { - position: relative; - height: 100%; - width: 50%; - padding: 6px 11px; - background-color: @color-basic-50; - border-top-right-radius: @border-radius / 2; - border-bottom-right-radius: @border-radius / 2; - text-align: right; - } - } - - .summary { - display: flex; - padding-top: 14px; - padding-bottom: 25px; - justify-content: space-between; - } - - .place-order { - width: 100%; - color: @white-only; - border: none; - height: 36px; - box-shadow: none; - border-radius: @border-radius / 2; - } - } - - button.micro { - &[disabled] { - border: 1px solid @color-accent-50; - color: @color-basic-500; - } - } - - &.buy { - .areas .area.buy { - border-top: 2px solid @color-submit-400; - border-bottom: 1px solid @color-white; - cursor: default; - opacity: 1; - } - - button.place-order { - background: @color-submit-400; - &:hover { - background: @color-submit-600; - } - &:active { - background: @color-submit-700; - } - &[disabled] { - background: @color-submit-400; - opacity: 0.3; - } - } - } - - &.sell { - .areas .area.sell { - border-top: 2px solid @color-error-400; - border-bottom: 1px solid @color-white; - cursor: default; - opacity: 1; - } - - button.place-order { - background: @color-error-400; - &:hover { - background: @color-error-600; - } - &:active { - background: @color-error-700; - } - &[disabled] { - background: @color-error-400; - opacity: 0.3; - } - } - } - - .price { - font-size: @font-size-caption-2; - line-height: 12px; - - span.link { - color: @color-disabled-900; - font-size: @font-size-caption-2; - line-height: 13px; - height: auto; - - &.active { - color: @color-disabled-600; - } - } - } - } - } -} - -.amount { - .field-buttons { - display: flex; - justify-content: space-between; - margin-top: 7px; - - w-button { - width: ~'calc(25% - 6px)'; - - > * { - box-shadow: none; - } - } - } -} - -@media screen and (max-width: 1024px) { - w-create-order { - .create-order { - .body { - .making-order { - .create-order-notification { - z-index: 1; - } - - .choice { - display: flex; - - .price { - span { - color: @white-only; - } - } - } - - .areas { - display: none; - } - } - } - - .expandable { - display: block; - } - - .head { - display: flex; - } - - } - } -} diff --git a/src/modules/dex/directives/createOrder/expiration.less b/src/modules/dex/directives/createOrder/expiration.less deleted file mode 100644 index 75a5ac1365..0000000000 --- a/src/modules/dex/directives/createOrder/expiration.less +++ /dev/null @@ -1,50 +0,0 @@ -@import (reference) 'config'; -@import (reference) '../../../app/less/typography'; -@import (reference) 'icons'; - -.create-order { - .expiration { - display: flex; - justify-content: space-between; - margin: 7px 0; - - &__item { - display: flex; - flex: 1 0; - max-width: 50%; - white-space: nowrap; - align-items: center; - position: relative; - font-size: @font-size-caption-2; - - &-acting { - justify-content: flex-end; - } - } - - &__label { - color: @color-basic-500; - max-width: 50%; - overflow: hidden; - text-overflow: ellipsis; - } - - &__value { - margin-left: 5px; - } - - w-option { - .option { - display: block; - text-align: right; - overflow: hidden; - width: 100%; - text-overflow: ellipsis; - padding: 2px 12px; - line-height: 20px; - font-size: @font-size-caption-2; - color: @color-basic-900; - } - } - } -} diff --git a/src/modules/dex/directives/dexBlock/DexBlock.js b/src/modules/dex/directives/dexBlock/DexBlock.js deleted file mode 100644 index 77c561e3e5..0000000000 --- a/src/modules/dex/directives/dexBlock/DexBlock.js +++ /dev/null @@ -1,109 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param {JQuery} $element - * @param {app.utils} utils - * @param {app.i18n} i18n - * @param {DexDataService} dexDataService - * @return {DexBlock} - */ - const controller = function (Base, $element, utils, i18n, dexDataService) { - - const analytics = require('@waves/event-sender'); - - class DexBlock extends Base { - - constructor() { - super(); - /** - * For find assets in watchlist - * @type {string} - */ - this.search = ''; - /** - * Literal for i18n - * @type {string} - */ - this.titleLiteral = null; - /** - * @type {boolean} - */ - this.collapsed = false; - /** - * For find assets in watchlist - * @type {boolean} - */ - this.focused = false; - /** - * @type {string} - */ - this.block = null; - /** - * @type {Layout} - * @private - */ - this._parent = null; - - i18n.translateField(this, 'titleLiteral', 'title', 'app.dex'); - } - - scrollToSpread() { - dexDataService.showSpread.dispatch(); - } - - $postLink() { - - this.syncSettings({ - collapsed: `dex.layout.${this.block}.collapsed` - }); - - this._parent.collapseBlock(this.block, this.collapsed); - this._parent.registerItem($element, this); - } - - toggleCollapse() { - const collapsed = this.collapsed; - if (collapsed) { - this.collapsed = !collapsed; - utils.wait(100) - .then(() => { - analytics.send({ name: `${this.analyticsText} Show`, target: 'ui' }); - this._parent.collapseBlock(this.block, this.collapsed); - }); - } else { - this._parent.collapseBlock(this.block, !this.collapsed); - utils.wait(300) - .then(() => { - analytics.send({ name: `${this.analyticsText} Hide`, target: 'ui' }); - this.collapsed = !collapsed; - }); - } - } - - } - - return new DexBlock(); - }; - - controller.$inject = ['Base', '$element', 'utils', 'i18n', 'dexDataService']; - - angular.module('app.dex') - .component('wDexBlock', { - require: { - _parent: '^wLayout' - }, - bindings: { - titleLiteral: '@titleName', - block: '@', - hasSearch: '@', - canCollapse: '@', - analyticsText: '<', - isActiveScroll: '<' - }, - templateUrl: 'modules/dex/directives/dexBlock/dexBlock.html', - transclude: true, - controller - }); -})(); diff --git a/src/modules/dex/directives/dexBlock/dexBlock.html b/src/modules/dex/directives/dexBlock/dexBlock.html deleted file mode 100644 index 4fdc74899f..0000000000 --- a/src/modules/dex/directives/dexBlock/dexBlock.html +++ /dev/null @@ -1,28 +0,0 @@ -
-
-
- - - -
-
- {{$ctrl.title}} -
-
-
- -
-
-
-
diff --git a/src/modules/dex/directives/dexBlock/dexBlock.less b/src/modules/dex/directives/dexBlock/dexBlock.less deleted file mode 100644 index 69161133a4..0000000000 --- a/src/modules/dex/directives/dexBlock/dexBlock.less +++ /dev/null @@ -1,78 +0,0 @@ -@import (reference) "../../../app/less/app-icons"; -@import (reference) 'config'; -@import (reference) 'icons'; - -.dex-block { - display: block; - width: 100%; - height: 100%; - - .block-title { - position: relative; - padding: 0 4px 0 16px; - display: flex; - align-items: center; - justify-content: space-between; - height: 38px; - background-color: @color-white; - border-bottom: 1px solid @color-basic-100; - flex-shrink: 0; - } - - .block-wrapper { - width: 100%; - height: 100%; - background-color: @color-white; - display: flex; - flex-direction: column; - - .dex-block-top-btn { - padding: 6px; - width: 32px; - height: 32px; - vertical-align: middle; - - i.collapse { - display: block; - width: 20px; - height: 20px; - cursor: pointer; - transition: transform 0.3s ease-in-out, all 0.3s; - border-radius: @border-radius / 2; - .icon-dex-arrow(); - background-color: @color-basic-50; - } - i.collapse:hover { - background-color: @color-basic-100; - } - - i.tospread { - display: block; - width: 20px; - height: 20px; - cursor: pointer; - transition: transform 0.3s ease-in-out, all 0.3s; - border-radius: @border-radius / 2; - .icon-dex-tospread(); - background-color: @color-basic-50; - } - i.tospread:hover { - background-color: @color-basic-100; - } - - &.active { - cursor: default; - i.tospread { - background: @color-submit-400; - .icon-dex-tospread-active(); - } - } - } - - .dex-block-content { - height: 100%; - display: flex; - flex-direction: column; - } - } -} diff --git a/src/modules/dex/directives/dexCandleChart/DexCandleChart.js b/src/modules/dex/directives/dexCandleChart/DexCandleChart.js deleted file mode 100644 index f9d00295ad..0000000000 --- a/src/modules/dex/directives/dexCandleChart/DexCandleChart.js +++ /dev/null @@ -1,314 +0,0 @@ -/* eslint-disable no-console */ -(function () { - 'use strict'; - - const DISABLED_FEATURES = [ - 'header_screenshot', - 'header_symbol_search', - 'symbol_search_hot_key', - 'display_market_status', - 'control_bar', - 'timeframes_toolbar', - 'volume_force_overlay', - 'header_compare' - ]; - - // TODO : added in version 1.12 - // const ENABLED_FEATURES = [ - // 'hide_left_toolbar_by_default' - // ]; - - function getOverrides(candleUpColor, candleDownColor) { - return { - 'mainSeriesProperties.candleStyle.upColor': candleUpColor, - 'mainSeriesProperties.candleStyle.downColor': candleDownColor, - 'mainSeriesProperties.candleStyle.drawBorder': false, - 'mainSeriesProperties.hollowCandleStyle.upColor': candleUpColor, - 'mainSeriesProperties.hollowCandleStyle.downColor': candleDownColor, - 'mainSeriesProperties.hollowCandleStyle.drawBorder': false, - 'mainSeriesProperties.barStyle.upColor': candleUpColor, - 'mainSeriesProperties.barStyle.downColor': candleDownColor, - 'mainSeriesProperties.haStyle.upColor': candleUpColor, - 'mainSeriesProperties.haStyle.downColor': candleDownColor, - 'mainSeriesProperties.haStyle.drawBorder': false, - 'mainSeriesProperties.lineStyle.color': candleUpColor, - 'mainSeriesProperties.areaStyle.color1': candleUpColor, - 'mainSeriesProperties.areaStyle.color2': candleUpColor, - 'mainSeriesProperties.areaStyle.linecolor': candleUpColor, - 'volumePaneSize': 'medium' - }; - } - - function getStudiesOverrides({ volume0, volume1 }) { - return { - 'volume.volume.color.0': volume0, - 'volume.volume.color.1': volume1 - }; - } - - let counter = 0; - - /** - * - * @param {Base} Base - * @param candlesService - * @param {$rootScope.Scope} $scope - * @param {app.themes} themes - * @return {DexCandleChart} - */ - const controller = function (Base, candlesService, $scope, themes, user) { - - class DexCandleChart extends Base { - - constructor() { - super(); - /** - * @type {string} - */ - this.elementId = `tradingview${counter++}`; - /** - * @type {boolean} - */ - this.notLoaded = false; - /** - * @type {TradingView} - * @private - */ - this._chart = null; - /** - * @type {boolean} - * @private - */ - this._chartReady = false; - /** - * @type {boolean} - * @private - */ - this._assetIdPairWasChanged = false; - /** - * @type {boolean} - * @private - */ - this._changeTheme = true; - /** - * @type {{price: string, amount: string}} - */ - this._assetIdPair = null; - /** - * @type {boolean} - * @private - */ - this.loadingTradingView = true; - /** - * @type {string} - * @private - */ - this.theme = user.getSetting('theme'); - /** - * @type {string} - * @private - */ - this.candle = user.getSetting('candle'); - - this.observe('_assetIdPair', this._onChangeAssetPair); - this.observe('theme', () => { - this._changeTheme = true; - this._resetTradingView(); - }); - this.observe('candle', this._refreshTradingView); - this.syncSettings({ _assetIdPair: 'dex.assetIdPair' }); - this.syncSettings({ theme: 'theme' }); - this.syncSettings({ candle: 'candle' }); - } - - $postLink() { - controller.load() - .then(() => { - this._createTradingView(); - this.listenEventEmitter(i18next, 'languageChanged', this._changeLangHandler.bind(this)); - }, () => { - console.warn('Error 403!'); - this.notLoaded = true; - }) - .then(() => { - $scope.$apply(); - }); - } - - $onDestroy() { - super.$onDestroy(); - this._removeTradingView(); - } - - /** - * @private - */ - _onChangeAssetPair() { - if (this._chartReady) { - this._setChartPair(); - } else { - this._assetIdPairWasChanged = true; - } - } - - /** - * @return {*} - * @private - */ - _resetTradingView() { - try { - return this._removeTradingView() - ._createTradingView(); - } catch (e) { - // Trading view not loaded - } - } - - /** - * @return {DexCandleChart} - * @private - */ - _removeTradingView() { - candlesService.unsubscribeBars(); - try { - if (this._chart) { - this._chart.remove(); - } - } catch (e) { - // Can't remove _chart - } - this._chart = null; - return this; - } - - /** - * @private - */ - _refreshTradingView() { - if (!this._chart) { - return null; - } - const { up, down, volume0, volume1 } = themes.getCurrentCandleSColor(this.candle); - const overrides = getOverrides(up, down); - const studiesOverrides = getStudiesOverrides({ volume0, volume1 }); - this._chart.applyOverrides(overrides); - this._chart.applyStudiesOverrides(studiesOverrides); - } - - /** - * @return {DexCandleChart} - * @private - */ - _createTradingView() { - this.loadingTradingView = true; - - const { up, down, volume0, volume1 } = themes.getCurrentCandleSColor(this.candle); - const themeConf = themes.getTradingViewConfig(this.theme); - const overrides = { ...getOverrides(up, down), ...themeConf.OVERRIDES }; - const studies_overrides = { - ...getStudiesOverrides({ volume0, volume1 }), - ...themeConf.STUDIES_OVERRIDES - }; - const toolbar_bg = themeConf.toolbarBg; - const custom_css_url = themeConf.customCssUrl; - - this._chart = new TradingView.widget({ - // debug: true, - locale: DexCandleChart._remapLanguageCode(i18next.language), - symbol: `${this._assetIdPair.amount}/${this._assetIdPair.price}`, - interval: user.getSetting('lastInterval'), - container_id: this.elementId, - datafeed: candlesService, - library_path: 'trading-view/', - autosize: true, - toolbar_bg, - disabled_features: DISABLED_FEATURES, - // enabled_features: ENABLED_FEATURES, - overrides, - studies_overrides, - custom_css_url, - timezone: Intl.DateTimeFormat().resolvedOptions().timeZone - }); - - this._chart.onChartReady(() => { - if (this._changeTheme) { - this._chart.applyOverrides(overrides); - this._chart.applyStudiesOverrides(studies_overrides); - } - - this._changeTheme = false; - this.loadingTradingView = false; - - if (this._assetIdPairWasChanged) { - this._setChartPair(); - this._assetIdPairWasChanged = false; - this._chartReady = true; - } - - this._chart.subscribe('onIntervalChange', (e) => { - user.setSetting('lastInterval', e); - }); - }); - this._chart.options.datafeed.onLoadError = () => { - this.notLoaded = true; - }; - return this; - } - - /** - * @private - */ - _setChartPair() { - this._chart.symbolInterval(({ interval }) => { - this._chart.setSymbol(`${this._assetIdPair.amount}/${this._assetIdPair.price}`, interval); - }); - } - - /** - * @private - */ - _changeLangHandler() { - return this._resetTradingView(); - } - - static _remapLanguageCode(code) { - switch (code) { - case 'hi_IN': - return 'en'; - case 'id': - return 'en'; - case 'zh_CN': - return 'zh'; - case 'pt_BR': - return 'pt'; - default: - return code; - } - } - - } - - return new DexCandleChart(); - }; - - controller.$inject = ['Base', 'candlesService', '$scope', 'themes', 'user']; - - controller.load = function () { - const script = document.createElement('script'); - script.src = '/trading-view/charting_library.min.js'; - const promise = new Promise((resolve, reject) => { - script.onload = resolve; - script.onerror = reject; - document.head.appendChild(script); - }); - controller.load = () => promise; - return promise; - }; - - angular.module('app.dex').component('wDexCandleChart', { - bindings: {}, - templateUrl: 'modules/dex/directives/dexCandleChart/dex-candle-chart.html', - transclude: false, - controller - }); -})(); diff --git a/src/modules/dex/directives/dexCandleChart/dex-candle-chart.html b/src/modules/dex/directives/dexCandleChart/dex-candle-chart.html deleted file mode 100644 index 83f9516687..0000000000 --- a/src/modules/dex/directives/dexCandleChart/dex-candle-chart.html +++ /dev/null @@ -1,15 +0,0 @@ -
- -
-
- - -
-
- -
- -
-
diff --git a/src/modules/dex/directives/dexCandleChart/dexCandleChart.less b/src/modules/dex/directives/dexCandleChart/dexCandleChart.less deleted file mode 100644 index 1cf9ac3c73..0000000000 --- a/src/modules/dex/directives/dexCandleChart/dexCandleChart.less +++ /dev/null @@ -1,46 +0,0 @@ -@import (reference) 'config'; -@import (reference) '../../../app/less/typography'; -@import (reference) 'icons'; - -.dex-candle-chart { - display: block; - width: 100%; - height: 100%; - - .candle-chart-wrapper { - width: 100%; - transition: .3s; - height: 100%; - - &.error { - display: flex; - - & > div { - text-align: center; - display: flex; - margin: auto; - - div:first-child { - .body-1(); - margin: 0 auto 5px auto; - color: @color-basic-700; - - &::before { - background-image: url(/img/icons/icon-empty.svg); - background-repeat: no-repeat; - width: 50px; - height: 52px; - margin: 0 auto 20px; - display: block; - content: ''; - } - } - - div:last-child { - color: @color-basic-500; - padding: 0 140px; - } - } - } - } -} diff --git a/src/modules/dex/directives/dexMyOrders/DexMyOrders.js b/src/modules/dex/directives/dexMyOrders/DexMyOrders.js deleted file mode 100644 index d56b5ba31b..0000000000 --- a/src/modules/dex/directives/dexMyOrders/DexMyOrders.js +++ /dev/null @@ -1,613 +0,0 @@ -(function () { - 'use strict'; - - const { SIGN_TYPE } = require('@waves/signature-adapter'); - const { filter, whereEq, uniqBy, prop, where, gt, pick, __, map } = require('ramda'); - const ds = require('data-service'); - const analytics = require('@waves/event-sender'); - const { BigNumber } = require('@waves/bignumber'); - const MAX_EXCHANGE_COUNT = 2000; - const { Money } = require('@waves/data-entities'); - - /** - * @param Base - * @param {Waves} waves - * @param {User} user - * @param {IPollCreate} createPoll - * @param {INotification} notification - * @param {app.utils} utils - * @param {$rootScope.Scope} $scope - * @param {DexDataService} dexDataService - * @param {ModalManager} modalManager - * @param {PermissionManager} permissionManager, - * @param {Ease} ease - * @param {JQuery} $element - * @param {Transactions} transactions - * @return {DexMyOrders} - */ - const controller = function ( - Base, - waves, - user, - createPoll, - notification, - utils, - $scope, - dexDataService, - modalManager, - permissionManager, - ease, - $element, - transactions - ) { - - /** - * @class - */ - class DexMyOrders extends Base { - - /** - * @type {{amount: string, price: string}} - * @private - */ - _assetIdPair; - /** - * @type {Promise} - * @private - */ - _matcherPublicKeyPromise = ds.fetch(user.getSetting('network.matcher')); - /** - * @type {Array} - */ - orders = []; - /** - * @type {boolean} - */ - isDemo = !user.address; - /** - * @type {boolean} - */ - pending = !!user.address; - /** - * @type {boolean} - */ - loadingError = false; - /** - * @type {boolean} - */ - showAnimations = false; - /** - * @type {boolean} - */ - isActiveOrders = false; - /** - * @type {Array} - */ - userList = []; - - - constructor() { - super(); - - this.syncSettings({ - _assetIdPair: 'dex.assetIdPair', - _matcherUrl: 'network.matcher' - }); - - this.observe('_matcherUrl', () => { - this._matcherPublicKeyPromise = ds.fetch(user.getSetting('network.matcher')); - }); - - user.getMultiAccountUsers().then(list => { - this.userList = list; - }); - } - - $postLink() { - this.headers = [ - { - id: 'pair', - valuePath: 'item.pair', - search: true, - placeholder: 'directives.filter' - }, - { - id: 'type', - title: { literal: 'directives.myOrders.type' }, - valuePath: 'item.type', - sort: true - }, - { - id: 'time', - title: { literal: 'directives.myOrders.time' }, - valuePath: 'item.timestamp', - sort: true, - sortActive: true, - isAsc: false - }, - { - id: 'amount', - title: { literal: 'directives.myOrders.amount' }, - valuePath: 'item.amount', - sort: true - }, - { - id: 'price', - title: { literal: 'directives.myOrders.price' }, - valuePath: 'item.price', - sort: true - }, - { - id: 'average', - title: { literal: 'directives.myOrders.average' }, - valuePath: 'item.average', - sort: true - }, - { - id: 'total', - title: { literal: 'directives.myOrders.total' }, - valuePath: 'item.total', - sort: true - }, - { - id: 'filled', - title: { literal: 'directives.myOrders.filled' }, - valuePath: 'item.filledTotal', - sort: true - }, - { - id: 'fee', - title: { literal: 'directives.myOrders.tableTitle.fee' }, - valuePath: 'item.userFee', - sort: true - }, - { - id: 'status', - title: { literal: 'directives.myOrders.status' }, - valuePath: 'item.progress', - sort: true - }, - this.isActiveOrders && { - id: 'controls', - templatePath: 'modules/dex/directives/dexMyOrders/header-control-cell.html', - scopeData: { - cancelAllOrdersClick: () => { - this.cancelAllOrders(); - }, - $ctrl: this - } - } || null - ].filter(Boolean); - - if (!this.isDemo) { - const poll = createPoll(this, this._getAllOrders, this._setOrders, 1000); - poll.ready.then(() => { - this.pending = false; - }); - this.receive(dexDataService.createOrder, () => poll.restart()); - this.poll = poll; - } - } - - /** - * @param {IOrder} order - */ - setPair(order) { - if (this.isLockedPair(order.assetPair.amountAsset.id, order.assetPair.priceAsset.id)) { - return null; - } - user.setSetting('dex.assetIdPair', { - amount: order.assetPair.amountAsset.id, - price: order.assetPair.priceAsset.id - }); - } - - cancelAllOrders() { - if (!permissionManager.isPermitted('CAN_CANCEL_ORDER')) { - const $notify = $element.find('.js-order-notification'); - DexMyOrders._animateNotification($notify); - return null; - } - - ds.cancelAllOrders({ - sender: user.publicKey, - timestamp: user.matcherSign.timestamp, - signature: user.matcherSign.signature - }) - .then(() => { - analytics.send({ name: 'Cancel All Orders', target: 'all' }); - - notification.info({ - ns: 'app.dex', - title: { literal: 'directives.myOrders.notifications.canceledAll' } - }); - - if (this.poll) { - this.poll.restart(); - } - }) - .catch(e => { - const error = utils.parseError(e); - notification.error({ - ns: 'app.dex', - title: { literal: 'directives.myOrders.notifications.somethingWentWrong' }, - body: { literal: error && error.message || error } - }); - }); - } - - /** - * @param data - * @return {number} - */ - round(data) { - return Math.round(Number(data)); - } - - /** - * @param {IOrder} order - * @return boolean - */ - isSelected(order) { - return this._assetIdPair.amount === order.amount.asset.id && - this._assetIdPair.price === order.price.asset.id; - } - - isLockedPair(amountAssetId, priceAssetId) { - return utils.isLockedInDex(amountAssetId, priceAssetId); - } - - /** - * - * @param order - * @return {Promise} - */ - dropOrderGetSignData(order) { - const { id } = order; - const data = { id }; - const signable = ds.signature.getSignatureApi().makeSignable({ - type: SIGN_TYPE.CANCEL_ORDER, - data - }); - - return utils.signMatcher(signable, order) - .then(signable => signable.getDataForApi()); - } - - /** - * @param order - */ - dropOrder(order) { - if (!permissionManager.isPermitted('CAN_CANCEL_ORDER')) { - const $notify = $element.find('.js-order-notification'); - DexMyOrders._animateNotification($notify); - return null; - } - - const dataPromise = this.dropOrderGetSignData(order); - - const classNameToOrder = (className, isRemove = false) => { - const $row = $element.find(`.order_${order.id}`).closest('.order-row'); - - if (isRemove) { - $row.removeClass(className); - } else { - $row.addClass(className); - } - }; - - classNameToOrder('pre-leave'); - - dataPromise - .then((signedTxData) => ds.cancelOrder(signedTxData, order.amount.asset.id, order.price.asset.id)) - .then(() => { - analytics.send({ name: 'Cancel Order', target: 'all' }); - - classNameToOrder('force-leave'); - const canceledOrder = this.orders.find(whereEq({ id: order.id })); - canceledOrder.state = 'Canceled'; - notification.info({ - ns: 'app.dex', - title: { literal: 'directives.myOrders.notifications.isCanceled' } - }); - - if (this.poll) { - this.poll.restart(); - } - }) - .catch(e => { - classNameToOrder('pre-leave', true); - const error = utils.parseError(e); - notification.error({ - ns: 'app.dex', - title: { literal: 'directives.myOrders.notifications.somethingWentWrong' }, - body: { literal: error && error.message || error } - }); - }); - } - - /** - * @param {Array} orders - * @private - */ - _setOrders(orders) { - let needApply = false; - - orders.forEach(order => { - const isNew = DexMyOrders._isNewOrder(order.timestamp.getTime()); - needApply = needApply || isNew !== order.isNew; - order.isNew = isNew; - }); - - if (needApply) { - $scope.$apply(); - } - - this.orders = orders; - - this.showAnimations = true; - } - - /** - * @return {Promise>} - * @private - */ - _getAllOrders() { - return waves.matcher.getOrders({ isActive: this.isActiveOrders }) - .then(filter(whereEq({ isActive: this.isActiveOrders }))) - .then(map(order => ({ ...order, isCancelled: order.status === 'Cancelled' }))) - .then(orders => { - if (this._isEqualOrders(orders) && this._isAllPartialFilledOrdersHasTransactions()) { - return this.orders; - } - - return this._matcherPublicKeyPromise - .then(matcherPublicKey => - Promise.all(orders.map(DexMyOrders._remapOrders(matcherPublicKey))) - ) - .then(result => { - const lastOrder = result.slice().reverse().find(where({ progress: gt(__, 0) })); - const exchanges = lastOrder ? - DexMyOrders._loadTransactions(lastOrder.timestamp.getTime()) : - Promise.resolve([]); - - return exchanges.then(txList => { - const hash = DexMyOrders._getTransactionsByOrderIdHash(txList); - this.loadingError = false; - return result.map(order => { - if (!hash[order.id]) { - hash[order.id] = []; - } - order.exchange = hash[order.id]; - order.average = - DexMyOrders._getAveragePriceByExchange(order, order.exchange); - order.filledTotal = order.price.cloneWithTokens( - order.average.getTokens().mul(order.filled.getTokens()) - ); - - return order; - }); - }).catch(() => result); - }); - }) - .catch(() => { - this.loadingError = true; - return []; - }); - } - - /** - * @param {Array} newOrders - * @return {boolean} - * @private - */ - _isEqualOrders(newOrders) { - return this.orders.length === newOrders.length && this.orders - .every((item, i) => whereEq(pick(['id', 'progress'], item), newOrders[i])); - } - - /** - * @return {boolean} - * @private - */ - _isAllPartialFilledOrdersHasTransactions() { - const minTimestamp = DexMyOrders._getMinTimestamp(); - let exchangeCount = 0; - return this.orders - .filter(where({ - progress: gt(__, 0), - timestamp: gt(__, minTimestamp) - })) - .every(order => { - exchangeCount += order.exchange.length; - return order.exchange.length && - order.filled.eq( - order.exchange - .map(tx => tx.amount) - .reduce((acc, amount) => acc.add(amount)) - ) || exchangeCount >= MAX_EXCHANGE_COUNT; - }); - } - - /** - * @param {IOrder} order - * @param {Array} exchangeList - * @private - */ - static _getAveragePriceByExchange(order, exchangeList) { - if (!exchangeList.length) { - return order.price; - } - - const sum = exchangeList - .map(tx => ({ - amount: tx.amount.getTokens(), - total: tx.total.getTokens() - })) - .reduce((acc, item) => ({ - amount: acc.amount.add(item.amount), - total: acc.total.add(item.total) - }), { - amount: new BigNumber(0), - total: new BigNumber(0) - }); - - return order.price.cloneWithTokens(sum.total.div(sum.amount)); - } - - /** - * @param $element - * @return {Promise} - * @private - */ - static _animateNotification($element) { - return utils.animate($element, { t: 100 }, { - duration: 1200, - step: function (tween) { - const progress = ease.bounceOut(tween / 100); - $element.css('transform', `translate(0, ${-100 + progress * 100}%)`); - } - }) - .then(() => utils.wait(700)) - .then(() => { - return utils.animate($element, { t: 0 }, { - duration: 500, - step: function (tween) { - const progress = ease.linear(tween / 100); - $element.css('transform', `translate(0, ${(-((1 - progress) * 100))}%)`); - } - }); - }); - } - - /** - * @param txList - * @return {Record} - * @private - */ - static _getTransactionsByOrderIdHash(txList) { - const uniqueList = uniqBy(prop('id'), txList); - const transactionsByOrderHash = Object.create(null); - uniqueList.forEach((tx) => { - ['order1', 'order2'].forEach((orderFieldName) => { - if (!transactionsByOrderHash[tx[orderFieldName].id]) { - transactionsByOrderHash[tx[orderFieldName].id] = []; - } - transactionsByOrderHash[tx[orderFieldName].id].push(DexMyOrders._remapTx(tx)); - }); - }); - return transactionsByOrderHash; - } - - static _remapTx(tx) { - const fee = (tx, order) => order.orderType === 'sell' ? tx.sellMatcherFee : tx.buyMatcherFee; - const userFee = [tx.order1, tx.order2] - .reduce((acc, order) => { - acc[order.orderType] = fee(tx, order); - return acc; - }, Object.create(null)); - - return { ...tx, userFee }; - } - - /** - * @param {IOrder} order - * @private - */ - static _remapOrders(matcherPublicKey) { - return order => { - const assetPair = order.assetPair; - const pair = `${assetPair.amountAsset.displayName} / ${assetPair.priceAsset.displayName}`; - const isNew = DexMyOrders._isNewOrder(order.timestamp.getTime()); - const percent = new BigNumber(order.progress * 100).toFixed(2); - const feeAsset = order.feeAsset || order.matcherFeeAssetId || 'WAVES'; - const matcherFee = order.fee || order.matcherFee; - if (matcherFee) { - if (matcherFee instanceof Money) { - return Promise.resolve({ ...order, isNew, percent, pair, fee: matcherFee }); - } - - return ds.api.assets.get(feeAsset).then(asset => { - const fee = new Money(matcherFee, asset); - return { ...order, isNew, percent, pair, fee }; - }); - } - - return waves.matcher.getCreateOrderFee({ ...order, matcherPublicKey }) - .then(fee => ({ ...order, isNew, percent, pair, fee })); - }; - } - - /** - * @param {number} timestamp - * @return {boolean} - * @private - */ - static _isNewOrder(timestamp) { - return ds.utils.normalizeTime(Date.now()) < timestamp + 1000 * 8; - } - - /** - * @param {number} lastTime - * @return {Promise>} - * @private - */ - static _loadTransactions(lastTime) { - const minTime = DexMyOrders._getMinTimestamp(); - return transactions.getExchangeTxList({ - sender: user.address, - timeStart: ds.utils.normalizeTime(minTime < lastTime ? lastTime : minTime) - }, { getAll: true, limit: MAX_EXCHANGE_COUNT }); - } - - /** - * @return {number} - * @private - */ - static _getMinTimestamp() { - const today = new Date(); - return new Date( - today.getFullYear(), - today.getMonth() - 2, - today.getDate(), - today.getHours(), - today.getMinutes() - ).getTime(); - } - - } - - return new DexMyOrders(); - }; - - controller.$inject = [ - 'Base', - 'waves', - 'user', - 'createPoll', - 'notification', - 'utils', - '$scope', - 'dexDataService', - 'modalManager', - 'permissionManager', - 'ease', - '$element', - 'transactions' - ]; - - angular.module('app.dex').component('wDexMyOrders', { - bindings: { - isActiveOrders: '<' - }, - templateUrl: 'modules/dex/directives/dexMyOrders/myOrders.html', - controller - }); -})(); - -/** - * @typedef {IOrder} IDexOrders - * @property {boolean} isNew - * @property {string} pair - * @property {Array} exchange - */ diff --git a/src/modules/dex/directives/dexMyOrders/header-control-cell.html b/src/modules/dex/directives/dexMyOrders/header-control-cell.html deleted file mode 100644 index 9e01dc21fa..0000000000 --- a/src/modules/dex/directives/dexMyOrders/header-control-cell.html +++ /dev/null @@ -1,10 +0,0 @@ - -
- -
- diff --git a/src/modules/dex/directives/dexMyOrders/myOrders.html b/src/modules/dex/directives/dexMyOrders/myOrders.html deleted file mode 100644 index 25f3d8cbc7..0000000000 --- a/src/modules/dex/directives/dexMyOrders/myOrders.html +++ /dev/null @@ -1,106 +0,0 @@ - - - - -
- -
- - - - - - -
- - - - {{::order.pair}} - - - - - - - - {{ ::order.timestamp | date:'MM-dd HH:mm:ss' }} - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- {{$ctrl.round(order.percent)}}% - -
-
-
-
-
-
- {{$ctrl.round(order.percent)}}% -
-
-
-
-
-
-
-
- - -
- -
- -
- diff --git a/src/modules/dex/directives/dexMyOrders/myOrders.less b/src/modules/dex/directives/dexMyOrders/myOrders.less deleted file mode 100644 index 4ba804990d..0000000000 --- a/src/modules/dex/directives/dexMyOrders/myOrders.less +++ /dev/null @@ -1,141 +0,0 @@ -@import (reference) 'config'; -@import (reference) '../../../app/less/typography'; - -.dex-my-orders { - display: block; - width: 100%; - height: 100%; - overflow: hidden; - overflow-x: auto; - - /* ngRepeat animation*/ - - .repeatItemTransition.ng-enter, - .repeatItemTransition.ng-leave { - transition: ease-in-out 0.4s; - } - - - .repeatItemTransition.ng-enter, - .repeatItemTransition.ng-leave.ng-leave-active { - opacity: 0; - max-height: 0; - } - - .repeatItemTransition.ng-leave, - .repeatItemTransition.ng-enter.ng-enter-active { - opacity: 1; - max-height: 30px; - pointer-events: none; - - &.pre-leave { - opacity: 0.3; - } - - @media screen and (max-width: 1024px) { - max-height: 69px; - } - } - - .repeatItemTransition.pre-leave { - transition: opacity 0.4s; - opacity: 0.3; - max-height: 30px; - pointer-events: none; - - @media screen and (max-width: 1024px) { - max-height: 69px; - } - - &.force-leave { - transition: ease-in-out 0.4s; - opacity: 0; - max-height: 0; - @media screen and (max-width: 1024px) { - max-height: 0 !important; - } - } - } - - //end - .centered { - position: absolute; - width: 100%; - top: 50%; - left: 50%; - padding: 0 20px; - text-align: center; - transform: translate(-50%, -50%); - z-index: 1; - color: @color-basic-500; - } - - .order-side { - &.sell { - color: @color-error-400; - } - - &.buy { - color: @color-submit-400; - } - } - - w-input.orders-filter { - .w-input-wrap { - input[type="text"] { - padding: 0 8px 2px 21px; - background-image: url(/img/icons/input-search-icon.svg); - background-repeat: no-repeat; - background-size: 12px 12px; - background-position: 0 center; - font-size: 11px; - height: 27px; - line-height: 25px; - border: 0 none; - border-radius: 0; - width: 100%; - max-width: 110px; - } - } - } -} - -.tab_myOrderHistory { - .smart-table_dex-my-orders { - .smart-table__cell { - .decimal-muted { - color: @color-basic-900; - } - - &:not(:first-child):nth-child(odd) { - &, - .decimal-muted { - color: @color-basic-600; - } - } - } - } -} - -@media screen and (max-width: 1440px) { - .tab_myOpenOrders { - .smart-table_dex-my-orders { - .smart-table { - &__cell[data-column-id="average"], - &__cell[data-column-id="filled"] { - display: none; - } - } - } - } -} - -@media screen and (max-width: 1190px) { - .tab_myOrderHistory { - .smart-table_dex-my-orders { - .smart-table__tbody .smart-table__row { - padding-right: 14px; - } - } - } -} diff --git a/src/modules/dex/directives/dexMyOrders/order-status-bar.less b/src/modules/dex/directives/dexMyOrders/order-status-bar.less deleted file mode 100644 index bc9526d809..0000000000 --- a/src/modules/dex/directives/dexMyOrders/order-status-bar.less +++ /dev/null @@ -1,112 +0,0 @@ -@import (reference) '../../../app/less/typography'; -@import (reference) 'config'; - -.circle-holder { - position: absolute; - - .circle-loader { - display: none; - position: relative; - padding: 0; - width: 30px; - height: 30px; - border-radius: 50%; - line-height: 30px; - - &::after { - border: none; - position: absolute; - top: 2px; - left: 2px; - text-align: center; - display: block; - border-radius: 50%; - width: 26px; - height: 26px; - background-color: @color-white; - content: ''; - } - - span { - position: absolute; - line-height: 30px; - font-size: @font-size-caption-4; - width: 30px; - text-align: center; - display: block; - z-index: 2; - } - - .left-half-clipper { - border-radius: 50%; - width: 31px; - height: 31px; - position: absolute; - clip: rect(0, 30px, 30px, 15px); - } - - &.over50 .left-half-clipper { - clip: rect(auto, auto, auto, auto); - } - - .value-bar { - position: absolute; - clip: rect(0, 15px, 30px, 0); - width: 30px; - height: 30px; - border-radius: 50%; - box-sizing: border-box; - } - - &.over50 .first50-bar { - position: absolute; - clip: rect(0, 30px, 30px, 15px); - border-radius: 50%; - width: 30px; - height: 30px; - } - - &:not(.over50) .first50-bar { - display: none; - } - } -} - -// colors -.sell { - .circle-loader { - background-color: @circle-loader-bg-sell; // bg color - - .value-bar, - &.over50 .first50-bar { - border: 2px solid @color-error-500; // line color - } - - span { - color: @color-error-500; // text color - } - } -} - -.buy { - .circle-loader { - background-color: @circle-loader-bg-buy; // bg color - - .value-bar, - &.over50 .first50-bar { - border: 2px solid @color-submit-400; // line color - } - - span { - color: @color-submit-400; // text color - } - } -} - -@media screen and (max-width: 1190px) { - .circle-holder { - .circle-loader { - display: block; - } - } -} diff --git a/src/modules/dex/directives/dexWatchlist/DexWatchlist.html b/src/modules/dex/directives/dexWatchlist/DexWatchlist.html deleted file mode 100644 index 4f6bb5d0be..0000000000 --- a/src/modules/dex/directives/dexWatchlist/DexWatchlist.html +++ /dev/null @@ -1,114 +0,0 @@ -
- -
-
- -
- - - - {{::option.name}} - - -
-
- -
- - - - - -
-
-
- - -
-
- - -
-
-
- / - -
-
- -
- - - -
- -
- - - - - - {{::pair.pairNames}} - - - - {{pair.lastPrice.toFormat() || '—'}} - - - {{ pair.change24.toFormat() }}{{ pair.change24 ? '%' : '—' }} - - - - — -
- - {{$ctrl.volumeAsset.displayName}} -
- - -
- {{::pair.amountAsset.id}} / -
- {{::pair.priceAsset.id}} - -
- - -
diff --git a/src/modules/dex/directives/dexWatchlist/DexWatchlist.less b/src/modules/dex/directives/dexWatchlist/DexWatchlist.less deleted file mode 100644 index db99e90e8c..0000000000 --- a/src/modules/dex/directives/dexWatchlist/DexWatchlist.less +++ /dev/null @@ -1,226 +0,0 @@ -@import (reference) 'config'; -@import (reference) "../../../app/less/typography"; -@import (reference) 'icons'; - -.dex-watchlist { - display: flex; - width: 100%; - height: 100%; - - &__wrapper { - width: 100%; - height: 100%; - position: relative; - display: flex; - flex-direction: column; - - @media screen and (max-width: 659px) { - min-height: 320px; - } - } - - .input-container { - position: relative; - display: inline-block; - width: 100%; - z-index: 4; - height: 32px; - min-height: 32px; - - w-help-icon { - position: absolute; - top: 50%; - right: 10px; - z-index: 10; - transform: translate(0, -50%); - - .help-icon { - &__content { - left: 0; - margin-top: 7px; - padding: 12px 12px 8px; - min-width: 235px; - transform: translate(calc(-50% ~'+ 15px'), 16px); - box-shadow: @shadow-tooltip-confirm; - @media screen and (max-width: 1024px) { - transform: translate(calc(-100% ~'+ 30px'), 16px); - } - } - } - } - } - - .search-input { - border-bottom-color: @color-basic-100; - - &:focus { - position: relative; - border-color: @color-submit-300; - z-index: 2; - } - - &.searching { - background-image: url(/img/icons/searching.svg); - } - } - - .not-found { - font-size: @font-size-caption-2; - margin: 14px 0 0 12px; - } - - .titles-wrap { - display: flex; - flex-direction: row; - justify-content: flex-start; - height: 40px; - background-color: @color-white; - box-sizing: border-box; - padding: 0; - position: relative; - border-bottom: 1px solid @color-basic-100; - - &::after { - display: none; - } - - .select { - w-option { - font-size: @font-size-caption-2; - color: @color-basic-700; - background: @color-white; - font-family: @font-roboto-medium; - - .option { - padding: 4px 35px 4px 15px; - color: @color-basic-700; - } - } - } - } - - div.title { - font-size: @font-size-caption-2; - color: @color-basic-700; - font-family: @font-roboto-medium; - display: block; - box-sizing: border-box; - line-height: 40px; - padding: 0 16px; - text-transform: uppercase; - position: relative; - z-index: 1; - margin: 0; - border: 1px solid transparent; - border-top: 0 none; - border-left: 1px solid transparent; - border-right: 1px solid transparent; - - &:not(.active) { - cursor: pointer; - } - - &.active { - border-bottom: 0 none; - position: relative; - border-left: 1px solid @color-basic-100; - border-right: 1px solid @color-basic-100; - - &::after { - display: block; - position: absolute; - top: 0; - left: -1px; - width: calc(100% ~'+ 2px'); - height: 2px; - content: ''; - background: @color-submit-400; - } - - &:first-child { - border-left: 1px solid transparent; - } - - &::before { - position: absolute; - bottom: -2px; - height: 2px; - width: 100%; - top: auto; - left: 0; - content: ''; - display: block; - z-index: 1; - background: @color-white; - } - } - } - - .select-hover { - position: absolute; - width: 50px; - height: 36px; - left: 179px; - z-index: 7; - top: 3px; - } - - i.icon-fav { - cursor: pointer; - margin-top: -3px; - display: inline-block; - vertical-align: middle; - background: @dex-star-icon center no-repeat; - width: 24px; - height: 24px; - float: right; - margin-right: 3px; - - &.active { - background: @dex-star-active-icon center no-repeat; - } - } - - div[data-block="watchlist"] { - w-dex-block { - .block-wrapper { - .dex-block-content { - overflow: visible; - } - } - } - } -} - -@media screen and (min-width: 2400px) { - .dex-watchlist { - &__wrapper a.title { - .titles-wrap { - height: 42px; - } - font-size: 13px; - } - - .wrapper { - .titles-wrap .select__wrap a.select__title { - font-size: 13px; - } - } - } - - - .dex-layout { - &__watchlist { - max-height: calc(100% ~'- 445px'); - width: 360px; - } - - &__watchlist-collapsed { - .dex-layout { - &__candlechart { - width: calc(100% ~'- 365px'); - } - } - } - } -} diff --git a/src/modules/dex/directives/dexWatchlist/FavouritesColumnHeader.html b/src/modules/dex/directives/dexWatchlist/FavouritesColumnHeader.html deleted file mode 100644 index 12a7bfdd60..0000000000 --- a/src/modules/dex/directives/dexWatchlist/FavouritesColumnHeader.html +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/src/modules/dex/directives/dexWatchlist/WatchList.js b/src/modules/dex/directives/dexWatchlist/WatchList.js deleted file mode 100644 index e8697d2285..0000000000 --- a/src/modules/dex/directives/dexWatchlist/WatchList.js +++ /dev/null @@ -1,867 +0,0 @@ -(function () { - 'use strict'; - - const TRADING_ASSETS = WavesApp.tradingPairs; - const DROP_DOWN_ORDER_LIST = ['ETH', 'BCH', 'LTC', 'USD', 'EUR', 'BSV']; - const DROP_DOWN_LIST = []; - - DROP_DOWN_ORDER_LIST.forEach((name) => { - DROP_DOWN_LIST.push({ name, id: WavesApp.defaultAssets[name] }); - }); - Object.keys(WavesApp.defaultAssets).forEach((name) => { - if (!DROP_DOWN_ORDER_LIST.includes(name) && name !== 'WAVES' && name !== 'BTC') { - DROP_DOWN_LIST.push({ name, id: WavesApp.defaultAssets[name] }); - } - }); - - /** - * @param Base - * @param {$rootScope.Scope} $scope - * @param {app.utils} utils - * @param {Waves} waves - * @param {STService} stService - * @param {PromiseControl} PromiseControl - * @param {IPollCreate} createPoll - * @param {JQuery} $element - * @param {ModalManager} modalManager - * @param {ConfigService} configService - * @param {Matcher} matcher - * @returns {WatchList} - */ - const controller = function (Base, $scope, utils, waves, stService, PromiseControl, createPoll, $element, - modalManager, configService, matcher) { - - const { - equals, uniq, not, - find, propEq, filter, - whereEq, uniqBy, prop, - path, flatten, splitEvery - } = require('ramda'); - - const ds = require('data-service'); - const { BigNumber } = require('@waves/bignumber'); - - $scope.WavesApp = WavesApp; - - class WatchList extends Base { - - /** - * @type {boolean} - */ - pending = false; - /** - * @type {boolean} - */ - loadingError = false; - /** - * @type {null} - */ - dropDownId = null; - /** - * @type {Array} - */ - dropDown = DROP_DOWN_LIST; - /** - * @type {boolean} - */ - isActiveSelect = false; - /** - * @type {PromiseControl} - */ - searchRequest = null; - /** - * @type {{name: string, value: string}[]} - */ - tabs = [ - { name: 'directives.watchlist.all', value: 'all' }, - { name: 'WAVES', value: WavesApp.defaultAssets.WAVES }, - { name: 'BTC', value: WavesApp.defaultAssets.BTC } - ]; - /** - * @type {string} - */ - search = ''; - /** - * @type {boolean} - */ - searchInProgress = false; - /** - * @type {string} - */ - activeTab = 'all'; - /** - * @type {boolean} - */ - showOnlyFavorite = false; - /** - * @type {Array} - */ - pairDataList = null; // TODO Remove disgusting hack - /** - * @type {boolean} - * @private - */ - _isSelfSetPair = false; - /** - * @type {Array} - * @private - */ - _searchAssets = []; - /** - * @type {Object} - * @private - */ - _searchAssetsHash = Object.create(null); - // /** - // * @type {Array} - // * @private - // */ - // _lastUserBalanceIdList = []; - /** - * @type {Array} - * @private - */ - _favourite = []; - /** - * @type {Object} - * @private - */ - _favoriteHash = Object.create(null); - /** - * @type {{amount: string, price: string}} - * @private - */ - _assetIdPair; - /** - * @type {Poll} - * @private - */ - _poll; - - /** - * @type {array} - * @private - */ - _lockedPairs = []; - - - constructor() { - super($scope); - /** - * @type {function} - * @private - */ - this._cache = utils.cache( - controller.storage, - WatchList._loadDataByPairs, - WatchList._getKeyByPair, - 1000 * 30, - pair => list => list.find(p => equals(p.pairIdList.slice().sort(), pair.slice().sort())) - ); - /** - * @type {*[]} - */ - this.headers = [ - { - id: 'favourite', - templatePath: 'modules/dex/directives/dexWatchlist/FavouritesColumnHeader.html', - scopeData: { - toggleOnlyFavourite: () => { - this.showOnlyFavorite = !this.showOnlyFavorite; - WatchList._renderSmartTable(); - }, - $ctrl: this - } - }, - { - id: 'pair', - title: { literal: 'directives.watchlist.pair' }, - sort: this._getComparatorByPath('pairNames') - }, - { - id: 'price', - title: { literal: 'directives.watchlist.price' }, - sort: this._getComparatorByPath('lastPrice') - }, - { - id: 'change', - title: { literal: 'directives.watchlist.chg' }, - sort: this._getComparatorByPath('change24') - }, - { - id: 'volume', - title: { literal: 'directives.watchlist.volume' }, - sortActive: true, - isAsc: false, - sort: this._getComparatorByPath('volume') - }, - { - id: 'info' - } - ]; - /** - * @type {SmartTable.ISmartTableOptions} - */ - this.tableOptions = { - filter: this._getTableFilter() - }; - } - - $postLink() { - // this._lastUserBalanceIdList = WatchList._getUserBalanceAssetIdList(); - - // this.receive(balanceWatcher.change, this._onChangeUserBalances, this); - this.observe('dropDownId', this._onChangeDropDown); - this.observe('_favourite', this._updateFavoriteHash); - this.observe('_searchAssets', this._updateSearchAssetHash); - this.observe('search', this._onChangeSearch); - - this.syncSettings({ - activeTab: 'dex.watchlist.activeTab', - showOnlyFavorite: 'dex.watchlist.showOnlyFavorite', - _favourite: 'dex.watchlist.favourite', - _assetIdPair: 'dex.assetIdPair' - }); - - this._initializeActiveTab(); - - this.observe('_assetIdPair', this._onChangeChosenPair); - this.observe('activeTab', this._onChangeActiveTab); - - stService.draw.once(WatchList._onRenderTable); - - this.pending = true; - this._poll = createPoll(this, this._getPairData, 'pairDataList', 1000 * 30, { $scope }); - - this._poll.ready.then(() => { - this.pending = false; - }); - } - - showAssetInfo(event, asset) { - event.preventDefault(); - event.stopPropagation(); - return modalManager.showAssetInfo(asset); - } - - /** - * @param {WatchList.IPairDataItem} pairData - * @return boolean - */ - isChosen(pairData) { - return this._assetIdPair.amount === pairData.amountAsset.id && - this._assetIdPair.price === pairData.priceAsset.id; - } - - isLockedPair(amountAssetId, priceAssetId) { - return utils.isLockedInDex(amountAssetId, priceAssetId); - } - - /** - * @param {WatchList.IPairDataItem} pairData - */ - choosePair(pairData) { - const pair = { - amount: pairData.amountAsset.id, - price: pairData.priceAsset.id - }; - if (this.isLockedPair(pair.amount, pair.price)) { - return null; - } - this._isSelfSetPair = true; - this._assetIdPair = pair; - this._isSelfSetPair = false; - } - - chooseTrading() { - this.isActiveSelect = false; - this.activeTab = 'trading'; - } - - chooseSelect() { - this.isActiveSelect = true; - this.activeTab = this.dropDownId; - } - - /** - * @param {string} id - */ - chooseTab(id) { - this.isActiveSelect = false; - this.activeTab = id; - } - - /** - * @param {JQueryEventObject} $event - * @param pair - */ - toggleFavourite($event, pair) { - $event.stopPropagation(); - - const key = WatchList._getKeyByPair(pair.pairIdList); - const favorite = this._favourite.slice(); - - if (this._favoriteHash[key]) { - const isEqualPair = p => equals(p, pair.pairIdList) || equals(p, pair.pairIdList.reverse()); - const predicate = p => not(isEqualPair(p)); - this._favourite = favorite.filter(predicate); - } else { - favorite.push(pair.pairIdList); - this._favourite = uniq(favorite); - } - WatchList._renderSmartTable(); - } - - /** - * @param pair - * @returns {boolean} - */ - isFavourite(pair) { - return !!this._favoriteHash[WatchList._getKeyByPair(pair.pairIdList)]; - } - - /** - * @return {boolean} - * @private - */ - _isActiveTrading() { - return this.activeTab === 'trading'; - } - - /** - * @private - */ - _initializeActiveTab() { - const isActiveSelect = !find(propEq('value', this.activeTab), this.tabs); - - if (isActiveSelect && !this._isActiveTrading()) { - this.isActiveSelect = true; - this.dropDownId = this.activeTab; - } - } - - /** - * @private - */ - _onChangeChosenPair() { - const pair = this._assetIdPair; - const id = [pair.amount, pair.price].sort().join(); - - if (!this._favoriteHash[id] && this.showOnlyFavorite) { - this.showOnlyFavorite = false; - } - - if (!find(propEq('id', id), this.pairDataList)) { - this._cache([id.split(',')]).then(([item]) => { - this.pairDataList.push(item); - WatchList._renderSmartTable(); - }); - } else { - WatchList._renderSmartTable(); - } - - if (!this._isSelfSetPair) { - this.activeTab = 'all'; - stService.draw.once(WatchList._onRenderTable); - } - } - - /** - * @private - */ - _onChangeDropDown() { - if (this.isActiveSelect) { - this.activeTab = this.dropDownId; - } - } - - /** - * @return {Promise} - * @private - */ - _getPairData() { - const pairs = this._getPairList(); - return Promise.all([ - this._getTabRate(), - this._cache(pairs) - ]) - .then(([rate, pairs]) => { - this.loadingError = false; - return pairs.map(WatchList._addRateForPair(rate)); - }) - .catch(() => { - this.loadingError = true; - }); - } - - /** - * @return {*} - * @private - */ - _getTabRate() { - const activeTab = this.activeTab; - - if (this._isActiveTrading()) { - return Promise.resolve(new BigNumber(1)); - } - - return waves.node.assets.getAsset(activeTab === 'all' ? WavesApp.defaultAssets.WAVES : activeTab) - .then((asset) => { - this.volumeAsset = asset; - - if (activeTab === 'all') { - return Promise.resolve(new BigNumber(1)); - } else { - return waves.utils.getRate(WavesApp.defaultAssets.WAVES, activeTab); - } - }); - } - - /** - * @returns {function (list: Array): Array} - * @private - */ - _getTableFilter() { - return list => { - const hasSearch = this.search !== ''; - if (hasSearch) { - return list.filter((item) => { - return this._filterDataItemByTab(item) && this._filterDataItemByQuery(item); - }); - } else { - return list.filter((item) => { - return this._filterDataItemByTab(item); - }); - } - }; - } - - /** - * @param {WatchList.IPairDataItem} item - * @returns {boolean} - * @private - */ - _filterDataItemByTab(item) { - - if (this._isActiveTrading()) { - return true; - } - - const canShow = this.showOnlyFavorite ? this.isFavourite(item) : true; - - if (this.activeTab === 'all') { - return canShow; - } - return canShow && ( - item.amountAsset.id === this.activeTab || - item.priceAsset.id === this.activeTab - ); - } - - /** - * @param {WatchList.IPairDataItem} item - * @returns {boolean} - * @private - */ - _filterDataItemByQuery(item) { - const query = this.search; - - const amountSearch = { - success: false, - names: [ - item.amountAsset.name.toLowerCase(), - item.amountAsset.ticker && item.amountAsset.ticker.toLowerCase() || null - ].filter(Boolean) - }; - - const priceSearch = { - success: false, - names: [ - item.priceAsset.name.toLowerCase(), - item.priceAsset.ticker && item.priceAsset.ticker.toLowerCase() || null - ].filter(Boolean) - }; - - const searchPair = [amountSearch, priceSearch]; - - function search(query) { - const queryList = query.split('/').map(q => q.trim()); - - if (queryList.length === 1) { - const q = query.toLowerCase(); - - if (WatchList._isId(query)) { - return item.pairIdList.includes(query); - } else { - return filter(whereEq({ success: false }), searchPair).some((searchItem) => { - searchItem.success = searchItem.names.some(n => n.indexOf(q) === 0); - return searchItem.success; - }); - } - } - - if (queryList[0] && queryList[1] === '') { - const q = queryList[0].toLowerCase(); - - if (WatchList._isId(queryList[0])) { - return item.pairIdList.includes(queryList[0]); - } else { - return searchPair.some((searchItem) => { - if (!searchItem.success) { - searchItem.success = searchItem.names.some(n => n === q); - } - return searchItem.success; - }); - } - } - - if (!queryList[0] && queryList[1]) { - return search(query.replace('/', '')); - } - - return search(queryList[0].trim()) && search(queryList[1].trim()); - } - - return search(query.trim()); - } - - /** - * @private - */ - _onChangeSearch() { - if (this.searchRequest) { - this.searchRequest.drop(); - this.searchInProgress = false; - this.pending = false; - this.searchRequest = null; - } - - const query = this.search; - this._searchAssets = []; - - const queryParts = query.split('/') - .slice(0, 2) - .map(q => q.replace(/[:()^]/g, '').trim()) - .filter(Boolean); - - if (!queryParts.length) { - WatchList._renderSmartTable(); - return null; - } - - this.searchInProgress = true; - this.pending = true; - this.loadingError = false; - - this.searchRequest = new PromiseControl(Promise.all(queryParts.map(waves.node.assets.search))) - .then(([d1 = [], d2 = []]) => { - this._searchAssets = uniqBy(prop('id'), d1.concat(d2)); - return this._poll.restart().then(() => { - this.searchInProgress = false; - this.pending = false; - this.searchRequest = null; - this.showOnlyFavorite = false; - $scope.$apply(); - }); - }) - .catch(() => { - this.searchInProgress = false; - this.pending = false; - this.searchRequest = null; - $scope.$apply(); - }); - } - - /** - * @private - */ - _updateFavoriteHash() { - this._favoriteHash = this._favourite.reduce((acc, pair) => { - acc[WatchList._getKeyByPair(pair)] = pair; - return acc; - }, Object.create(null)); - } - - /** - * @private - */ - _updateSearchAssetHash() { - this._searchAssetsHash = this._searchAssets.reduce((acc, asset) => { - acc[asset.id] = asset; - return acc; - }, Object.create(null)); - } - - /** - * @private - */ - _onChangeActiveTab() { - this.pending = true; - this.loadingError = false; - this._poll.restart().then(() => { - this.pending = false; - $scope.$apply(); - }); - } - - /** - * @return {Array>} - * @private - */ - _getTradingPairList() { - const assetsIds = TRADING_ASSETS; - return WatchList._uniqPairs(WatchList._getAllCombinations(assetsIds)); - } - - /** - * @private - */ - _getPairList() { - - if (this._isActiveTrading()) { - return this._getTradingPairList(); - } - const defaultAssets = configService.get('SETTINGS.DEX.WATCH_LIST_PAIRS') || []; - const favorite = (this._favourite || []) - .filter(item => item && item.filter(Boolean).length === 2) - .map(p => p.sort()); - const chosen = [this._assetIdPair.amount, this._assetIdPair.price].sort(); - const searchIdList = Object.keys(this._searchAssetsHash); - // const userBalances = this._lastUserBalanceIdList; - const assetsIds = Object.values(WavesApp.defaultAssets); - const idList = uniq(assetsIds.concat(searchIdList, defaultAssets)); - const other = WatchList._getAllCombinations(idList); - return WatchList._uniqPairs(favorite.concat(other, [chosen])); - } - - /** - * @param {string} dataPath - * @returns {function(list: Array, isAsc: boolean): Array} - * @private - */ - _getComparatorByPath(dataPath) { - return (list, isAsc) => { - const method = isAsc ? 'asc' : 'desc'; - const favorite = []; - const other = []; - const comparator = utils.comparators.process(path(dataPath.split('.'))).smart[method]; - - list.forEach((item) => { - if (this.isFavourite(item)) { - favorite.push(item); - } else { - other.push(item); - } - }); - - favorite.sort(comparator); - other.sort(comparator); - - return favorite.concat(other); - }; - } - - static _addRateForPair(rate) { - return pair => { - if (!pair.volume) { - return pair; - } - - const currentVolume = pair.volume.getTokens() - .mul(rate) - .roundTo(3, BigNumber.ROUND_MODE.ROUND_HALF_UP); - - return { ...pair, currentVolume }; - }; - } - - static _renderSmartTable() { - stService.render('watchlist'); - } - - static _onRenderTable(name) { - if (name !== 'watchlist') { - return null; - } - - setTimeout(function loop() { - const $chosen = $element.find('.chosen'); - - if (!$chosen.length) { - return null; - } - - const $body = $element.find('.smart-table__tbody'); - const scroll = $body.scrollTop(); - const chosenOffset = $chosen.offset().top; - const bodyOffset = $body.offset().top; - - const top = chosenOffset - bodyOffset + scroll - $body.height() / 2 + $chosen.height() / 2; - - $element.find('.smart-table__tbody').animate({ - scrollTop: top - }, 300); - }, 300); - } - - /** - * @param {string} query - * @returns {boolean} - * @private - */ - static _isId(query) { - return WatchList._getBytes(query) > 16 || query === 'WAVES'; - } - - /** - * @param {string} str - * @returns {number} - * @private - */ - static _getBytes(str) { - return new Blob([str], { type: 'text/plain' }).size; - } - - static _getAssetsFromPairs(pairs) { - return pairs.reduce((acc, item) => { - ['amountAsset', 'priceAsset'].forEach((propertyName) => { - if (!acc.hash[item.pair[propertyName].id]) { - acc.assets.push(item.pair[propertyName]); - acc.hash[item.pair[propertyName].id] = true; - } - }); - return acc; - }, { assets: [], hash: {} }).assets; - } - - /** - * @param {Array} pair - * @return string - * @private - */ - static _getKeyByPair(pair) { - return pair.sort().join(); - } - - /** - * @param pairs - * @private - */ - static _loadDataByPairs(pairs) { - const ids = flatten(pairs); - return ds.api.assets.get(ids) - .then(() => { - const promiseList = pairs.filter(p => p.length === 2) - .map(([assetId1, assetId2]) => ds.api.pairs.get(assetId1, assetId2)); - return Promise.all(promiseList); - }) - .then((pairs) => { - const promiseList = splitEvery(20, pairs).map((pairs) => { - return ds.api.pairs.info(matcher.currentMatcherAddress, pairs) - .then(infoList => infoList.map((data, i) => ({ - ...data, - pairNames: - `${pairs[i].amountAsset.displayName} / ${pairs[i].priceAsset.displayName}`, - pairIdList: [pairs[i].amountAsset.id, pairs[i].priceAsset.id] - }))) - .catch(() => pairs.map(WatchList._getEmptyPairData)); - }); - - return Promise.all(promiseList); - }) - .then(flatten); - } - - static _getEmptyPairData(pair) { - return { - amountAsset: pair.amountAsset, - priceAsset: pair.priceAsset, - pairNames: `${pair.amountAsset.displayName} / ${pair.priceAsset.displayName}`, - pairIdList: [pair.amountAsset.id, pair.priceAsset.id], - id: [pair.amountAsset.id, pair.priceAsset.id].sort().join(), - lastPrice: null, - firstPrice: null, - volume: null, - change24: null - }; - } - - /** - * @param {Array} assetIdList - * @return {Array>} - * @private - */ - static _getAllCombinations(assetIdList) { - const pairs = []; - - assetIdList.forEach((assetId, index) => { - assetIdList - .slice(index + 1) - .forEach((anotherAssetId) => { - pairs.push([assetId, anotherAssetId].sort(utils.comparators.asc)); - }); - }); - - return pairs; - } - - /** - * @param {Array>} pairs - * @return {Array>} - * @private - */ - static _uniqPairs(pairs) { - return Object.values(pairs.reduce((acc, pair) => { - acc[pair.join(',')] = pair; - return acc; - }, {})); - } - - // static _getUserBalanceAssetIdList() { - // return Object.keys(balanceWatcher.getBalance()) - // .filter(id => !user.scam[id]) - // .sort(utils.comparators.asc); - // } - - } - - return new WatchList(); - }; - - controller.storage = Object.create(null); - - controller.$inject = [ - 'Base', - '$scope', - 'utils', - 'waves', - 'stService', - 'PromiseControl', - 'createPoll', - '$element', - 'modalManager', - 'configService', - 'matcher' - ]; - - angular.module('app.dex') - .component('wDexWatchlist', { - templateUrl: 'modules/dex/directives/dexWatchlist/DexWatchlist.html', - controller - }); -})(); - -/** - * @name WatchList - */ - -/** - * @typedef {object} WatchList#IPairDataItem - * @property {string} id - * @property {AssetPair} pair - * @property {boolean} isFavorite - * @property {string} pairNames - * @property {Array} pairIdList - * @property {BigNumber} change24 - * @property {BigNumber} volume - */ diff --git a/src/modules/dex/directives/layout/DexLayoutSideBarToggle.html b/src/modules/dex/directives/layout/DexLayoutSideBarToggle.html deleted file mode 100644 index 30aad8e09a..0000000000 --- a/src/modules/dex/directives/layout/DexLayoutSideBarToggle.html +++ /dev/null @@ -1,9 +0,0 @@ -
-
-
\ No newline at end of file diff --git a/src/modules/dex/directives/layout/DexLayoutSideBarToggle.js b/src/modules/dex/directives/layout/DexLayoutSideBarToggle.js deleted file mode 100644 index 9e493241eb..0000000000 --- a/src/modules/dex/directives/layout/DexLayoutSideBarToggle.js +++ /dev/null @@ -1,42 +0,0 @@ -(function () { - 'use strict'; - - function controller() { - - class Controller { - - constructor() { - /** - * @type {Function} - */ - this.handleClick = angular.noop; - - /** - * @type {boolean} - */ - this.isHovered = false; - } - - setHovered() { - this.isHovered = true; - } - - setNotHovered() { - this.isHovered = false; - } - - } - - return new Controller(); - } - - angular.module('app.dex') - .component('wDexLayoutSideBarToggle', { - bindings: { - handleClick: '&', - side: '@' - }, - templateUrl: 'modules/dex/directives/layout/DexLayoutSideBarToggle.html', - controller - }); -})(); diff --git a/src/modules/dex/directives/layout/layout.html b/src/modules/dex/directives/layout/layout.html deleted file mode 100644 index ad20e974fc..0000000000 --- a/src/modules/dex/directives/layout/layout.html +++ /dev/null @@ -1,36 +0,0 @@ -
- -
-
-
- -
- -
- -
- -
- -
-
-
- -
-
-
-
- -
-
-
-
- - -
diff --git a/src/modules/dex/directives/layout/layout.js b/src/modules/dex/directives/layout/layout.js deleted file mode 100644 index 45f5049da6..0000000000 --- a/src/modules/dex/directives/layout/layout.js +++ /dev/null @@ -1,222 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {typeof Base} Base - * @param {ng.IQService} $q - * @param {ng.IAugmentedJQuery} $element - * @param {app.utils} utils - * @param {ng.IRootScopeService} $rootScope - * @param {VisibleService} visibleService - * @param {app.utils.decorators} decorators - * @return {Layout} - */ - const controller = function (Base, $q, $element, utils, $rootScope, visibleService, decorators) { - - class Layout extends Base { - - constructor() { - super(); - /** - * @type {Deferred} - * @private - */ - this._ready = $q.defer(); - /** - * @type {IDexLayoutDomContainer} - * @private - */ - this._dom = null; - this._children = { - watchlist: null, - candlechart: null, - orderbook: null, - tradehistory: null, - createorder: null, - tradevolume: null - }; - /** - * @type {JQuery} - * @private - */ - this._node = null; - /** - * - * @type {boolean} - * @private - */ - this._watchlistCollapsed = null; - /** - * - * @type {boolean} - * @private - */ - this._orderbookCollapsed = null; - - this.isPhone = $rootScope.isPhone; - this.isTablet = $rootScope.isTablet; - this.isDesktop = $rootScope.isDesktop; - this.isNotPhone = $rootScope.isNotPhone; - this.isNotDesktop = $rootScope.isNotDesktop; - - this.syncSettings({ - _watchlistCollapsed: 'dex.layout.watchlist.collapsed', - _orderbookCollapsed: 'dex.layout.orderbook.collapsed' - }); - - this.observe(['_watchlistCollapsed', '_orderbookCollapsed'], this._onChangeCollapsed); - } - - $postLink() { - this._node = $element.find('.dex-layout'); - this._dom = { - watchlist: Layout._getColumn('watchlist'), - candlechart: Layout._getColumn('candlechart'), - orderbook: Layout._getColumn('orderbook'), - tradehistory: Layout._getColumn('tradehistory'), - createorder: Layout._getColumn('createorder'), - tradevolume: Layout._getColumn('tradevolume') - }; - - const watchlistCollapsed = this._watchlistCollapsed; - const orderbookCollapsed = this._orderbookCollapsed; - const base = 'dex-layout'; - - this._node.get(0).className = 'dex-layout'; - this._node.toggleClass(`${base}_watchlist-collapsed`, watchlistCollapsed); - this._node.toggleClass(`${base}_orderbook-collapsed`, orderbookCollapsed); - this._dom.watchlist.$slider.toggleClass(`${base}__sidebar-toggle-open`, !watchlistCollapsed); - this._dom.orderbook.$slider.toggleClass(`${base}__sidebar-toggle-open`, !orderbookCollapsed); - - this._ready.resolve(); - } - - /** - * @param {JQuery} $element - * @param {DexBlock} item - */ - registerItem($element, item) { - const { block } = item; - - if (!block) { - throw new Error('Wrong item address!'); - } - - this._ready.promise.then(() => { - if (!this._children[block]) { - this._children[block] = item; - this._dom[block].$container.append($element); - } else { - throw new Error('Duplicate child block!'); - } - }); - } - - /** - * @param $event - */ - closeCreateOrder($event) { - angular.element($event.delegateTarget).parent().removeClass('expanded'); - } - - collapseBlock(block, collapsed) { - this._node.toggleClass(`dex-layout_${block}-collapsed`, collapsed); - } - - toggleColumn(column) { - switch (column) { - case 'watchlist': - this._watchlistCollapsed = !this._watchlistCollapsed; - break; - case 'orderbook': - this._orderbookCollapsed = !this._orderbookCollapsed; - break; - default: - throw new Error('Wrong column name!'); - } - } - - @decorators.async(300) - updateVisible() { - visibleService.updateSort(); - } - - _onChangeCollapsed() { - const watchlist = this._watchlistCollapsed; - const orderbook = this._orderbookCollapsed; - const base = 'dex-layout'; - - utils.animateByClass(this._dom.candlechart.$wrapper, 'ghost', true, 'opacity') - .then(() => { - this._dom.candlechart.$wrapper.hide(); - this._dom.watchlist.$slider.toggleClass(`${base}__sidebar-toggle-open`, !watchlist); - this._dom.orderbook.$slider.toggleClass(`${base}__sidebar-toggle-open`, !orderbook); - - const endCollapseAnimations = utils.whenAll([ - utils.animateByClass(this._node, `${base}_watchlist-collapsed`, watchlist, 'transform'), - utils.animateByClass(this._node, `${base}_orderbook-collapsed`, orderbook, 'transform') - ]); - - const notWorking = new Promise((resolve, reject) => { - setTimeout(reject, 3000); - }); - - return Promise.race([endCollapseAnimations, notWorking]) - .catch(() => { - /* eslint no-console: "off" */ - console.warn('Not working css animation end event!'); - }); - }) - .then(() => { - this._dom.candlechart.$wrapper.show(); - return utils.wait(0); - }) - .then(() => { - utils.animateByClass(this._dom.candlechart.$wrapper, 'ghost', false, 'opacity'); - }); - } - - /** - * @param {string} type - * @return {IDexLayoutDomContainerItem} - * @private - */ - static _getColumn(type) { - const $container = $element.find(`[data-block="${type}"]`); - const $wrapper = $container.parent(); - const $slider = $wrapper.find('[data-slider]'); - - return { $wrapper, $container, $slider }; - } - - } - - return new Layout(); - }; - - controller.$inject = ['Base', '$q', '$element', 'utils', '$rootScope', 'visibleService', 'decorators']; - - angular.module('app.dex') - .component('wLayout', { - scope: false, - bindings: {}, - templateUrl: 'modules/dex/directives/layout/layout.html', - transclude: true, - controller - }); -})(); - -/** - * @typedef {object} IDexLayoutDomContainerItem - * @property {JQuery} $wrapper - * @property {JQuery} $container - * @property {JQuery} $slider - * @property {DexBlock} child - */ - -/** - * @typedef {object} IDexLayoutDomContainer - * @property {IDexLayoutDomContainerItem} left - * @property {IDexLayoutDomContainerItem} center - * @property {IDexLayoutDomContainerItem} right - */ diff --git a/src/modules/dex/directives/layout/less/dex-layout.less b/src/modules/dex/directives/layout/less/dex-layout.less deleted file mode 100644 index 3e07e33b99..0000000000 --- a/src/modules/dex/directives/layout/less/dex-layout.less +++ /dev/null @@ -1,319 +0,0 @@ -@import (reference) "../../../../app/less/typography"; -@import (reference) 'config'; -@import (reference) 'icons'; - -.layout { - width: 100%; - height: 100%; - display: flex; -} - -.dex-layout { - width: 100%; - height: 100%; - min-height: 500px; - position: relative; - overflow: hidden; - - &__column { - background: @color-white; - height: 100%; - position: absolute; - transition: transform 0.3s ease-in-out, opacity 0.3s ease-in-out; - } - - &__block { - height: 100%; - width: 100%; - } - - &_tradevolume-collapsed { - .dex-layout { - &__column_orderbook { - .dex-layout { - &__block[data-block="orderbook"] { - height: calc(100% ~'- 38px'); - } - - &__block[data-block="tradevolume"] { - height: 37px; - overflow: hidden; - - .block-title i { - transform: rotate(-180deg); - } - } - } - } - } - } - - .dex-layout-side-bar-toggle { - width: 19px; - position: relative; - - &[side="left"] { - .dex-layout { - &__sidebar-toggle { - left: 0; - border-right: 1px solid @color-basic-100; - } - } - } - - &[side="right"] { - .dex-layout { - &__sidebar-toggle { - right: 0; - border-left: 1px solid @color-basic-100; - } - } - } - } - - &__sidebar-toggle { - height: 100%; - width: 19px; - min-width: 19px; - z-index: 1; - bottom: 0; - left: 0; - position: absolute; - - &.active { - background: @color-basic-50; - div { - &::after { - background: url(/img/icons/dex-toggle-active.svg) center no-repeat; - } - } - } - - div { - position: relative; - top: 50%; - left: 0; - cursor: pointer; - width: 100%; - height: 40px; - margin-top: -20px; - - &::after { - content: ""; - display: block; - margin: -7px auto 0 auto; - right: 0; - left: 0; - top: 50%; - position: absolute; - height: 15px; - width: 15px; - background: @dex-toggle-icon center no-repeat; - } - } - - &-left { - transition: .3s; - div { - &::after { - transform: rotate(90deg); - } - } - } - - &-right { - transition: .3s; - div { - &::after { - transform: rotate(-90deg); - } - } - } - } - - .empty-block, - .error-block { - position: absolute; - transform: translate(-50%, -50%); - top: 50%; - left: 50%; - - .icon { - margin-top: 0; - } - } - - .tooltip-dex { - max-width: 300px; - display: none; - position: absolute; - padding: 0 10px; - top: 25px; - right: 149px; - transform-origin: center; - color: @color-white; - font-size: @font-size-caption-2; - line-height: 25px; - cursor: pointer; - text-shadow: 0 1px 6px rgba(78, 92, 110, 0.6); - z-index: 10; - width: auto; - text-align: center; - white-space: nowrap; - - span { - overflow: hidden; - text-overflow: ellipsis; - display: inline-block; - text-align: center; - } - - &::before { - position: absolute; - content: ''; - z-index: -1; - top: -5px; - right: 10px; - opacity: .8; - width: 0; - height: 0; - border: 5px solid transparent; - border-bottom-color: @color-basic-700; - border-top: 0 none; - transform: translate(0); - } - - &::after { - opacity: .8; - border-radius: @border-radius; - position: absolute; - background: @color-basic-700; - width: 100%; - height: 26px; - content: ''; - left: 0; - top: 0; - z-index: -1; - } - - &.right { - right: 10px; - } - } - - .order-permission-error, - .create-order-notification { - will-change: transform; - position: absolute; - transform: translate(0, -100%); - color: @white-only; - z-index: 10; - width: 100%; - padding: 10px 0; - text-align: center; - display: flex; - justify-content: center; - align-items: center; - background-color: @color-submit-400; - font-family: @font-roboto-medium; - - i.icon { - margin-right: 5px; - display: inline-block; - width: 13px; - height: 13px; - vertical-align: middle; - } - - &.success { - background-color: @color-submit-400; - i.icon { - background: url(/img/icons/checkbox-icon.svg) no-repeat center center; - } - } - - &.error { - background-color: @color-error-400; - i.icon { - background: url(/img/icons/white-cancel-icon.svg) no-repeat center center; - } - } - } -} - -//hi-res -@media screen and (min-width: 2400px) { - .dex-layout { - &__column { - min-width: 360px; - } - - &__block { - min-width: 360px; - } - - &__row { - font-size: 12px; - } - - .dex-block .block-title { - height: 42px; - } - - .tabs .titles-wrap { - height: 42px; - - a.title { - height: 42px; - } - } - - .caption-2 { - font-size: 12px; - } - - &_tradevolume-collapsed { - .dex-layout__column_orderbook { - .dex-layout__block[data-block="tradevolume"] { - height: 41px; - } - } - } - } -} - -// responsive -@media screen and (min-width: 660px) and (max-width: 1024px) { - .dex-layout { - overflow: visible; - } -} - -@media screen and (max-width: 659px) { - .dex-layout { - overflow: visible; - height: auto; - display: flex; - flex-direction: column; - justify-content: space-between; - - &__column { - position: relative; - } - - .dex-layout-side-bar-toggle { - display: none; - } - - &_tradevolume-collapsed { - .dex-layout { - &__column_orderbook { - w-scroll-box { - min-height: 293px; - } - } - } - } - } -} - diff --git a/src/modules/dex/directives/layout/less/dex-layout__column_candlechart.less b/src/modules/dex/directives/layout/less/dex-layout__column_candlechart.less deleted file mode 100644 index 660026ca02..0000000000 --- a/src/modules/dex/directives/layout/less/dex-layout__column_candlechart.less +++ /dev/null @@ -1,78 +0,0 @@ -@import (reference) "../../../../app/less/typography"; -@import (reference) 'config'; -@import (reference) 'icons'; - -.dex-layout { - &__column_candlechart { - width: calc(~'100%' - (@dexLayoutWatchlist + @dexLayoutOrderBook + @dexLayoutGap * 2)); - max-height: calc(100% ~'- 325px'); - position: absolute; - border-radius: @border-radius / 2; - display: flex; - transition: .3s; - transform: translateX((@dexLayoutWatchlist + @dexLayoutGap)); - - .block-title { - display: none; - } - } -} - -@media screen and (min-width: 2400px) { - .dex-layout { - &__column_candlechart { - max-height: calc(100% ~'- 445px'); - width: calc(100% ~'- 730px'); - transform: translateX(365px); - } - } -} - -@media screen and (min-width: 660px) and (max-width: 1024px) { - .dex-layout { - &__column_candlechart { - width: calc(50% ~' - 2px'); - min-width: 320px; - max-height: calc(50% ~ '- 45px'); - transform: translate(0); - right: 0px; - - .dex-layout { - &__sidebar-toggle-right { - display: none; - } - } - - .dex-layout-side-bar-toggle[side="right"] { - display: none; - } - } - } -} - -@media screen and (max-width: 659px) { - .dex-layout { - &__column_candlechart { - min-width: 100%; - max-height: 320px; - min-height: 320px; - height: 320px; - transform: translateX(0); - margin-bottom: 5px; - order: 1; - border-radius: @border-radius/2; - position: relative; - - .dex-layout { - - &__block { - border: 0 none; - } - - &__sidebar-toggle { - display: none; - } - } - } - } -} diff --git a/src/modules/dex/directives/layout/less/dex-layout__column_createorder.less b/src/modules/dex/directives/layout/less/dex-layout__column_createorder.less deleted file mode 100644 index fd28b2fcb5..0000000000 --- a/src/modules/dex/directives/layout/less/dex-layout__column_createorder.less +++ /dev/null @@ -1,240 +0,0 @@ -@import (reference) "../../../../app/less/typography"; -@import (reference) 'config'; -@import (reference) 'icons'; - -.dex-layout { - &__column_createorder { - max-height: 320px; - min-height: 320px; - bottom: 0; - right: 0; - width: @dexLayoutCreateOrder; - background-color: transparent; - border-radius: @border-radius / 2; - - .block-title { - display: none; - } - - .mask { - background: @mask-default; - position: absolute; - left: 0; - right: 0; - bottom: 0; - opacity: .5; - height: 100%; - z-index: 5; - display: none; - } - } -} - -@media screen and (min-width: 2400px) { - .dex-layout { - &__column_createorder { - max-height: 440px; - width: 360px; - - .body .making-order { - .fields { - padding: 15px 25px 15px; - } - - .expiration { - margin: 10px 0; - } - - .areas .area { - height: 42px; - line-height: 38px; - } - - .fields { - .input-like { - height: 42px; - - .asset-name-wrap div { - line-height: 28px; - } - } - - .field-label { - margin-top: 15px; - padding-bottom: 4px; - } - - .place-order { - height: 42px; - } - - .input input { - height: 42px; - } - } - } - } - } -} - -@media screen and (max-width: 1024px) { - .dex-layout { - &__column_createorder { - margin-left: -5px; - margin-right: -5px; - width: calc(100% ~'+ 10px'); - height: 80px; - max-height: none; - min-height: auto; - position: absolute; - bottom: 0; - z-index: 7; - box-shadow: @shadow-dex-open; - - .dex-layout { - &__block { - width: 100%; - position: absolute; - z-index: 8; - bottom: 0; - height: 80px; - } - } - - &.expanded { - z-index: 10; - height: calc(100% ~'+ 10px'); - top: -5px; - - .dex-layout { - &__block { - height: 386px; - } - } - - .mask { - display: block; - } - - .head { - .icon-close { - display: block; - } - } - - .body { - .making-order { - - .areas { - display: none; - } - - .choice { - display: flex; - border-bottom: 1px solid @color-disabled-100; - - .buy { - background: @color-white; - flex-basis: 50%; - text-align: left; - padding-left: 25px; - } - - .sell { - background: @color-white; - flex-basis: 50%; - text-align: right; - padding-right: 25px; - } - - .middle { - position: absolute; - left: 50%; - top: 0; - color: @color-submit-400; - height: 49px; - width: 80px; - transform: translate(-50%, 0); - } - - } - - &.buy { - .buy { - background: rgba(31, 90, 245, 0.1); - - .price { - span { - color: @color-submit-400; - } - } - - .name { - color: @color-submit-400; - } - } - - .sell { - .price { - span { - color: @color-basic-900; - } - } - - .name { - color: @color-basic-500; - } - } - } - - &.sell { - .buy { - .price { - span { - color: @color-basic-900; - } - } - - .name { - color: @color-basic-500; - } - } - - .sell { - background: rgba(239, 72, 41, 0.1); - - .price { - span { - color: @color-error-500; - } - } - - .name { - color: @color-error-500; - } - } - - .middle { - color: @color-error-500; - } - } - } - } - } - } - } -} - -@media screen and (max-width: 659px) { - .dex-layout { - &__column_createorder { - position: fixed; - box-shadow: @shadow-create-order; - - &.expanded { - bottom: 0; - top: auto; - } - } - } -} diff --git a/src/modules/dex/directives/layout/less/dex-layout__column_orderbook.less b/src/modules/dex/directives/layout/less/dex-layout__column_orderbook.less deleted file mode 100644 index 19e7ef9fcc..0000000000 --- a/src/modules/dex/directives/layout/less/dex-layout__column_orderbook.less +++ /dev/null @@ -1,244 +0,0 @@ -@import (reference) "../../../../app/less/typography"; -@import (reference) 'config'; -@import (reference) 'icons'; - -.dex-layout { - &__column_orderbook { - width: @dexLayoutOrderBook; - max-height: calc(100% ~'- 325px'); - right: 0; - transition: .3s; - margin-left: 5px; - border-radius: @border-radius / 2; - background: @color-white; - display: flex; - flex-shrink: 0; - - .dex-layout { - &__sidebar-toggle { - position: absolute; - display: none; - left: 1px; - border-right: 1px solid @color-basic-100; - } - } - - .dex-layout { - &__block[data-block="orderbook"] { - transition: .3s; - height: calc(100% ~'- 200px'); - - .block-wrapper, - .scroll-box { - background: none transparent; - } - } - - &__block[data-block="tradevolume"] { - transition: .3s; - height: 186px; - bottom: 0; - position: absolute; - z-index: 6; - - .block-title { - border-top: 1px solid @color-basic-100; - } - - .dex-block-top-btn:last-child { - display: none; - } - } - } - - .table__row { - &:hover { - .tooltip-dex.active { - display: flex; - } - } - } - } - - &_orderbook-collapsed { - .dex-layout { - &__column_orderbook { - transform: translateX(100%); - } - - &__column_candlechart { - width: calc(~'100%' - (@dexLayoutWatchlist + @dexLayoutGap)); - - .dex-layout { - &__sidebar-toggle-right div::after { - transform: rotate(90deg); - } - } - } - } - } -} - -@media screen and (min-width: 2400px) { - .dex-layout { - &__column_orderbook { - width: 360px; - max-height: calc(100% ~'- 445px') !important; - - .row { - font-size: 12px; - } - - .info { - font-size: 11px; - } - } - - &__orderbook-collapsed { - .dex-layout { - &__candlechart { - width: calc(100% ~'- 365px'); - } - } - } - } -} - -@media screen and (min-width: 660px) and (max-width: 1024px) { - .dex-layout { - &__column_orderbook { - width: calc(50% ~' - 2px'); - min-width: 320px; - min-height: calc(50% ~'- 40px'); - max-height: calc(50% ~'- 40px'); - height: calc(50% ~'- 40px'); - right: 0; - bottom: 80px; - transform: translate(0); - padding-left: 19px; - - .dex-layout { - &__sidebar-toggle-left { - display: block; - border-radius: 2px 0 0 2px; - - div::after { - transform: rotate(270deg); - } - } - - &__block-top { - height: 100%; - } - - &__block-bottom { - display: none; - } - - &__block[data-block="tradevolume"] { - width: calc(100% ~'- 21px'); - height: 211px; - } - } - - .dex-layout-side-bar-toggle[side="left"] { - .dex-layout { - &__sidebar-toggle { - left: -19px; - } - } - } - } - - &_orderbook-collapsed { - .dex-layout { - &__column_orderbook { - background: none transparent; - min-width: 20px; - width: 20px; - right: 19px; - - .dex-layout-side-bar-toggle { - position: absolute; - height: 100%; - width: 19px; - left: 0; - background: #fff; - border-radius: 0 2px 2px 0; - - .dex-layout { - &__sidebar-toggle { - border-right: 0 none; - border-left: 1px solid @color-basic-100; - left: 0; - div::after { - transform: rotate(-270deg); - } - } - } - } - - .dex-layout { - &__block { - min-width: 0; - display: none; - } - } - } - - &__column_tradehistory { - border-radius: 2px 0 0 2px; - width: calc(100% ~' - 19px'); - } - - &__block-orderbook-bottom-collapsed { - .dex-layout { - &__orderbook { - .dex-layout__block-top { - height: 100%; - } - } - } - } - - &__column_candlechart { - width: calc(50% ~'- 3px') - } - } - } - } -} - -@media screen and (min-width: 1024px) { - .dex-layout__column_orderbook { - .dex-layout-side-bar-toggle[side="left"] { - width: 0; - } - } -} - -@media screen and (max-width: 659px) { - .dex-layout { - &__column_orderbook { - width: 100%; - max-height: 420px; - margin-left: 0; - order: 2; - margin-bottom: 5px; - - .dex-layout { - &__block[data-block="tradevolume"] { - height: 176px; - } - } - } - - &_orderbook-collapsed { - .dex-layout { - &__column_orderbook { - transform: translate(0px); - } - } - } - } -} diff --git a/src/modules/dex/directives/layout/less/dex-layout__column_tradehistory.less b/src/modules/dex/directives/layout/less/dex-layout__column_tradehistory.less deleted file mode 100644 index 5e74dc5822..0000000000 --- a/src/modules/dex/directives/layout/less/dex-layout__column_tradehistory.less +++ /dev/null @@ -1,167 +0,0 @@ -@import (reference) "../../../../app/less/typography"; -@import (reference) 'config'; -@import (reference) 'icons'; - -.dex-layout { - &__column_tradehistory { - max-height: 320px; - min-height: 320px; - bottom: 0; - left: 0; - width: calc(~'100%' - (@dexLayoutOrderBook + @dexLayoutGap)); - border-radius: @border-radius / 2; - transition: .3s !important; - - .block-title { - display: none; - } - - .sign-in-message { - position: absolute; - display: inline-block; - text-align: center; - max-width: 90%; - width: 100%; - top: 50%; - transform: translate(5%, -50%); - color: @color-basic-500; - } - - .tabs { - ::-webkit-scrollbar { - height: 0; - } - - :hover::-webkit-scrollbar { - height: 0; - } - - ::-webkit-scrollbar-thumb { - height: 0; - } - - ::-webkit-scrollbar-thumb:window-inactive { - height: 0; - } - - .tab-tem { - overflow-x: auto; - } - - .tab-body-wrap { - height: calc(100% ~'- 39px'); - } - - .titles-wrap { - overflow-y: hidden; - overflow-x: auto; - height: 39px; - padding: 0; - display: flex; - position: relative; - - &::before { - display: none; - } - - &:after { - content: ''; - display: block; - position: absolute; - width: 100%; - height: 1px; - left: 0; - bottom: 0; - background: @color-basic-100; - } - - .title { - color: @color-basic-700; - height: 38px; - font-size: 13px; - margin: 0; - padding: 0 20px; - line-height: 40px; - border: 0 none; - font-family: @font-roboto-medium; - position: relative; - border-left: 1px solid transparent; - border-right: 1px solid transparent; - white-space: nowrap; - - &.active:first-child { - border-left: 1px solid @color-white; - } - - &.active { - color: @color-basic-700; - background: @color-white; - border-bottom: 1px solid @color-white; - border-right: 1px solid @color-disabled-200; - border-left: 1px solid @color-disabled-200; - - &::before { - display: block; - position: absolute; - top: 0; - left: 0; - width: 100%; - content: ''; - height: 2px; - background: @color-submit-400; - } - - &:after { - position: absolute; - bottom: -2px; - height: 2px; - width: 100%; - left: 0; - content: ''; - display: block; - z-index: 1; - background: @color-white; - } - } - } - } - } - } -} - -@media screen and (min-width: 2400px) { - .dex-layout { - &__column_tradehistory { - max-height: 440px; - width: calc(100% ~'- 365px'); - } - } -} - -@media screen and (min-width: 660px) and (max-width: 1024px) { - .dex-layout { - &__column_tradehistory { - width: calc(50% ~' - 3px'); - min-width: 320px; - min-height: calc(50% ~'- 40px'); - max-height: calc(50% ~'- 40px'); - height: calc(50% ~'- 40px'); - left: 0; - bottom: 80px; - } - } -} - -@media screen and (max-width: 659px) { - .dex-layout { - &__column_tradehistory { - width: 100%; - margin-bottom: 5px; - order: 3; - - .dex-layout__block { - height: 304px; - } - } - } -} diff --git a/src/modules/dex/directives/layout/less/dex-layout__column_watchlist.less b/src/modules/dex/directives/layout/less/dex-layout__column_watchlist.less deleted file mode 100644 index 9fccc9d8d7..0000000000 --- a/src/modules/dex/directives/layout/less/dex-layout__column_watchlist.less +++ /dev/null @@ -1,143 +0,0 @@ -@import (reference) "../../../../app/less/typography"; -@import (reference) 'config'; -@import (reference) 'icons'; - -.dex-layout { - &__column_watchlist { - transition: .3s; - width: @dexLayoutWatchlist; - max-height: calc(100% ~'- 325px'); - border-radius: @border-radius / 2; - overflow: visible; - - .block-title { - display: none; - } - - .dex-block-title { - line-height: 17px; - border-bottom: 1px dashed @color-submit-400; - cursor: pointer; - } - - .tabs { - .title { - text-transform: uppercase; - } - } - } - - &_watchlist-collapsed { - .dex-layout { - &__column_watchlist { - transform: translateX(-100%); - } - - &__column_candlechart { - transform: translateX(0); - width: calc(~'100%' - (@dexLayoutWatchlist + @dexLayoutGap)); - - .dex-layout { - &__sidebar-toggle-left div::after { - transform: rotate(-90deg); - } - } - } - } - - &.dex-layout_orderbook-collapsed { - .dex-layout { - &__column_watchlist { - overflow: hidden; - margin-right: 0; - transform: translateX(-100%); - } - - &__column_candlechart { - width: 100%; - flex-grow: 1; - transform: translate(0); - } - - &__column_orderbook { - overflow: hidden; - margin-left: 0; - transform: translateX(100%); - } - } - } - } -} - -@media screen and (min-width: 660px) and (max-width: 1024px) { - .dex-layout { - &__column_watchlist { - width: calc(50% ~' - 3px'); - min-width: 320px; - max-height: calc(50% ~ '- 45px'); - } - - &_watchlist-collapsed { - .dex-layout { - &__column_watchlist { - transform: translateX(-100%); - left: -5px; - } - - &__column_candlechart { - transform: translateX(0); - width: 100%; - - .dex-layout { - &__sidebar-toggle-left div::after { - transform: rotate(-90deg); - } - } - } - } - } - } -} - -@media screen and (min-width: 2400px) { - .dex-layout { - &__column_watchlist { - max-height: calc(100% ~ '- 445px'); - width: 360px; - } - } -} - -@media screen and (max-width: 659px) { - .dex-layout { - &__column_watchlist { - width: 100%; - max-height: 320px; - min-height: 320px; - margin-bottom: 5px; - order: 0; - } - - &_watchlist-collapsed { - .dex-layout { - &__column_watchlist { - transform: translateX(0); - left: 0; - } - } - } - - &_watchlist-collapsed.dex-layout_orderbook-collapsed { - .dex-layout { - &__column_watchlist { - transform: translateX(0); - left: 0; - } - - &__column_orderbook { - transform: translateX(0); - } - } - } - } -} diff --git a/src/modules/dex/directives/layout/less/tradehistory-fullscreen.less b/src/modules/dex/directives/layout/less/tradehistory-fullscreen.less deleted file mode 100644 index f1451dce60..0000000000 --- a/src/modules/dex/directives/layout/less/tradehistory-fullscreen.less +++ /dev/null @@ -1,60 +0,0 @@ -@import (reference) "../../../../app/less/typography"; -@import (reference) 'config'; -@import (reference) 'icons'; - -.tradehistory-fullscreen-toggler { - display: none; - position: absolute; - right: 10px; - top: 10px; - width: 20px; - height: 20px; - border-radius: 2px; - background-image: @dex-fullscreen-icon; - background-repeat: no-repeat; - background-position: center center; - background-color: @color-basic-50; - transition: all 0.3s; - z-index: 10; - cursor: pointer; - - &:hover { - background-color: @color-basic-100; - } -} - -.tradehistory-fullscreen { - .tradehistory-fullscreen-toggler { - background-image: @dex-fullscreenclose-icon; - } -} - -.tradehistory-fullscreen { - .dex-layout__column:not(.dex-layout__column_tradehistory) { - transition: .3s; - opacity: 0.1; - } - - .dex-layout__column_tradehistory { - width: 100%; - border-radius: 2px; - z-index: 9; - height: 100%; - max-height: 100%; - transition: .3s; - } -} - -@media screen and (min-width: 1024px) { - .tradehistory-fullscreen { - .dex-my-balance .smart-table w-copy-wrap .container { - max-width: 300px; - width: 300px; - } - } - - .tradehistory-fullscreen-toggler { - display: block; - } -} - diff --git a/src/modules/dex/directives/myBalance/MyBalance.js b/src/modules/dex/directives/myBalance/MyBalance.js deleted file mode 100644 index 211c18b6fd..0000000000 --- a/src/modules/dex/directives/myBalance/MyBalance.js +++ /dev/null @@ -1,215 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param {$rootScope.Scope} $scope - * @param {User} user - * @param {ModalManager} modalManager - * @param {BalanceWatcher} balanceWatcher - * @param {app.utils} utils - * @param {STService} stService - * @param {VisibleService} visibleService - * @return {MyBalance} - */ - const controller = function (Base, $scope, user, modalManager, balanceWatcher, utils, stService, visibleService) { - - class MyBalance extends Base { - - /** - * @type {Array} - */ - balanceList = []; - /** - * @type {boolean} - */ - isDemo = !user.address; - /** - * @type {boolean} - */ - pending = !!user.address; - /** - * @type {*[]} - */ - headers = [ - { - id: 'asset', - search: (key, value, list) => { - const serchValue = (key[value] || '').trim(); - const serachTxt = serchValue.toLowerCase(); - - if (!serachTxt) { - return list; - } - - return list.filter(item => { - if (item.asset.id === serchValue) { - return true; - } - - const name = ( - (item.asset.ticker || '') + - (item.asset.name || '') - ).toLowerCase(); - - return name.includes(serachTxt); - }); - }, - sort: true, - placeholder: 'directives.filter', - valuePath: 'item.asset.displayName' - }, - { - id: 'assetId', - sort: false, - title: { literal: 'directives.balance.assetId' }, - valuePath: 'item.assetId' - }, - { - id: 'available', - sort: true, - title: { literal: 'directives.balance.available' }, - valuePath: 'item.available' - }, - { - id: 'inOrders', - sort: true, - title: { literal: 'directives.balance.inOrdersFull' }, - valuePath: 'item.inOrders' - }, - { - id: 'total', - sort: true, - title: { literal: 'directives.balance.total' }, - valuePath: 'item.regular' - } - ]; - - /** - * @type {Array} - */ - userList = []; - - constructor() { - super(); - - this.syncSettings({ - _assetIdPair: 'dex.assetIdPair' - }); - - if (!this.isDemo) { - - this.balanceList = MyBalance._getBalanceList(); - this.receive(balanceWatcher.change, this._onChangeBalance, this); - this.pending = true; - - utils.when(balanceWatcher.ready).then(() => { - this.pending = false; - }); - - } - - user.getMultiAccountUsers().then(list => { - this.userList = list; - }); - - this.receive(stService.draw, this._updateVisible, this); - } - - static _getBalanceList() { - return balanceWatcher.getFullBalanceList().filter(MyBalance._isNotScam()); - } - - /** - * @private - */ - static _isNotScam() { - const spamHash = (user.getSetting('wallet.portfolio.spam') || []) - .reduce((r, id) => { - r[id] = true; - return r; - }, Object.create(null)); - return item => !user.scam[item.asset.id] && !spamHash[item.asset.id]; - } - - showAssetInfo(asset) { - return modalManager.showAssetInfo(asset); - } - - /** - * @param {Asset} asset - * @return boolean - */ - isSelected(asset) { - return this._assetIdPair.amount === asset.id || - this._assetIdPair.price === asset.id; - } - - /** - * @public - * @param assetID - */ - isLockedPair(assetID) { - return utils.isLockedInDex(assetID); - } - - /** - * @param {string} assetId - */ - setPair(assetId) { - if (this.isLockedPair(assetId)) { - return null; - } - const wavesId = WavesApp.defaultAssets.WAVES; - const btcId = WavesApp.defaultAssets.BTC; - const assetId2 = assetId === wavesId ? btcId : wavesId; - - ds.api.pairs.get(assetId, assetId2).then((pair) => { - user.setSetting('dex.assetIdPair', { - amount: pair.amountAsset.id, - price: pair.priceAsset.id - }); - }); - } - - /** - * @private - * @param {string} name - */ - _updateVisible(name) { - if (name === 'balanceList') { - visibleService.updateSort(); - } - } - - /** - * @private - */ - _onChangeBalance() { - this.balanceList = MyBalance._getBalanceList(); - $scope.$apply(); - } - - } - - return new MyBalance(); - }; - - controller.$inject = [ - 'Base', - '$scope', - 'user', - 'modalManager', - 'balanceWatcher', - 'utils', - 'stService', - 'visibleService' - ]; - - angular.module('app.dex').component('wDexMyBalance', { - bindings: {}, - templateUrl: 'modules/dex/directives/myBalance/myBalance.html', - transclude: false, - controller - }); -})(); diff --git a/src/modules/dex/directives/myBalance/header-control-cell.html b/src/modules/dex/directives/myBalance/header-control-cell.html deleted file mode 100644 index 12c3ea4454..0000000000 --- a/src/modules/dex/directives/myBalance/header-control-cell.html +++ /dev/null @@ -1,3 +0,0 @@ - -
- diff --git a/src/modules/dex/directives/myBalance/myBalance.html b/src/modules/dex/directives/myBalance/myBalance.html deleted file mode 100644 index a5957dc56f..0000000000 --- a/src/modules/dex/directives/myBalance/myBalance.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - {{::balance.asset.name}} - - - - - - - {{::balance.asset.id}} - - - - - - -
- - - - - - - - - - - - - - diff --git a/src/modules/dex/directives/myBalance/myBalance.less b/src/modules/dex/directives/myBalance/myBalance.less deleted file mode 100644 index 4bd2fa07f8..0000000000 --- a/src/modules/dex/directives/myBalance/myBalance.less +++ /dev/null @@ -1,14 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; -@import (reference) "../../../app/less/typography"; - -.dex-my-balance { - .visible-row-container { - min-height: 30px; - } - - w-asset-logo { - margin-right: 10px; - cursor: pointer; - } -} diff --git a/src/modules/dex/directives/orderBook/OrderBook.js b/src/modules/dex/directives/orderBook/OrderBook.js deleted file mode 100644 index 435dd0fcc5..0000000000 --- a/src/modules/dex/directives/orderBook/OrderBook.js +++ /dev/null @@ -1,465 +0,0 @@ -(function () { - 'use strict'; - - /** - * - * @param {Base} Base - * @param {IPollCreate} createPoll - * @param {JQuery} $element - * @param {Waves} waves - * @param {DexDataService} dexDataService - * @param {app.utils} utils - * @param {$rootScope.Scope} $scope - * @param {app.i18n} i18n - * @param {typeof OrderList} OrderList - * @param {Transactions} transactions - * @return {OrderBook} - */ - const controller = function (Base, - createPoll, - $element, - waves, - dexDataService, - utils, - $scope, - i18n, - OrderList, - transactions) { - - const SECTIONS = { - ASKS: '.table__asks', - INFO: '.table__info', - BIDS: '.table__bids', - SCROLLBOX: 'w-scroll-box', - LAST_PRICE: '.table__last-price', - SPREAD: '.spread' - }; - - const CLASSES = { - SELL: 'sell', - BUY: 'buy' - }; - - const ds = require('data-service'); - const { BigNumber } = require('@waves/bignumber'); - const { AssetPair } = require('@waves/data-entities'); - - class OrderBook extends Base { - - constructor() { - super(); - /** - * @type {object} - */ - this.orders = null; - /** - * @type {Asset} - */ - this.amountAsset = null; - /** - * @type {Asset} - */ - this.priceAsset = null; - /** - * @type {boolean} - */ - this.pending = true; - /** - * @type {boolean} - */ - this.hasOrderBook = false; - /** - * @type {boolean} - */ - this.loadingError = false; - /** - * @type {{amount: string, price: string}} - * @private - */ - this._assetIdPair = null; - /** - * @type {*} - * @private - */ - this._lastResponse = null; - /** - * @type {boolean} - * @private - */ - this._showSpread = true; - /** - * @type {boolean} - * @private - */ - this._noRender = false; - /** - * @type {number} - * @private - */ - this._orderBookCropRate = null; - /** - * @private - */ - this._dom = null; - /** - * @type {boolean} - * @public - */ - this.isScrolled = false; - - this.receive(dexDataService.showSpread, () => { - this._dom.$box.stop().animate({ scrollTop: this._getSpreadScrollPosition() }, 300); - }); - - this.syncSettings({ - _assetIdPair: 'dex.assetIdPair', - _orderBookCropRate: 'dex.chartCropRate' - }); - - this.observe(['hasOrderBook'], this._onChangeVisibleElements); - - this._onChangeVisibleElements(); - this._updateAssetData(); - } - - $postLink() { - this._dom = Object.create(null); - - Object.defineProperties(this._dom, { - $box: { get: () => $element.find(SECTIONS.SCROLLBOX) }, - $bids: { get: () => this._dom.$box.find(SECTIONS.BIDS) }, - $asks: { get: () => this._dom.$box.find(SECTIONS.ASKS) }, - $info: { get: () => this._dom.$box.find(SECTIONS.INFO) }, - $lastPrice: { get: () => this._dom.$info.find(SECTIONS.LAST_PRICE) }, - $spread: { get: () => this._dom.$info.find(SECTIONS.SPREAD) } - }); - - this._dom.$box.on('scroll', () => { - const scrollPos = this._dom.$box[0].scrollTop; - const spreadPos = this._getSpreadScrollPosition(); - this.isScrolled = Math.abs(scrollPos - spreadPos) >= 2; - }); - - - const poll = createPoll(this, this._getOrders, this._setOrders, 1000, { $scope }); - - this.observe('_assetIdPair', () => { - this._showSpread = true; - this.pending = true; - this.hasOrderBook = false; - this.loadingError = false; - this._updateAssetData(); - poll.restart(); - }); - - $element.on('mousedown touchstart', 'w-scroll-box w-row', () => { - this._noRender = true; - }); - - $element.on('mouseup touchend', 'w-scroll-box w-row', () => { - this._noRender = false; - if (this._lastResponse) { - this._render(this._lastResponse); - this._lastResponse = null; - } - }); - - this._asks = new OrderList({ - node: this._dom.$asks.get(0), - fillColor: 'rgba(229,73,77,0.1)' - }); - this._bids = new OrderList({ - node: this._dom.$bids.get(0), - fillColor: 'rgba(90,129,234,0.1)' - }); - - this.signals.destroy.once(() => { - this._asks.$onDestroy(); - this._bids.$onDestroy(); - }); - } - - nothingFound() { - return !(this.hasOrderBook || this.pending || this.loadingError); - } - - /** - * @private - */ - _updateAssetData() { - ds.api.assets.get([this._assetIdPair.price, this._assetIdPair.amount]) - .then(([priceAsset, amountAsset]) => { - this.priceAsset = priceAsset; - this.amountAsset = amountAsset; - this.pair = new AssetPair(amountAsset, priceAsset); - }); - } - - /** - * @return {Promise<{bids, spread, asks}>} - * @private - */ - _getOrders() { - const amountAsset = this._assetIdPair.amount; - const priceAsset = this._assetIdPair.price; - const limit = 1; - - return Promise.all([ - waves.matcher.getOrderBook(amountAsset, priceAsset), - waves.matcher.getOrders().catch(() => null), - ds.api.pairs.get(amountAsset, priceAsset) - .then(waves.matcher.getLastPrice) - .catch(() => null) - .then(lastPrice => { - const tokens = lastPrice.price.getTokens(); - if (tokens.isNaN()) { - return transactions - .getExchangeTxList({ amountAsset, priceAsset, limit }) - .then(([tx]) => ({ price: tx.price, lastSide: tx.exchangeType })) - .catch(() => null); - } - return lastPrice; - }) - .then(lastPrice => lastPrice) - .catch(() => null) - ]) - .then(([orderbook, orders, lastPrice]) => { - this.loadingError = false; - return this._remapOrderBook(orderbook, orders, lastPrice); - }) - .catch(() => { - this.loadingError = true; - this.hasOrderBook = false; - $scope.$digest(); - }); - } - - /** - * @private - */ - _onChangeVisibleElements() { - $element.toggleClass('has-order-book', this.hasOrderBook); - } - - /** - * @param {OrderBook.OrdersData} data - * @private - */ - _setOrders(data) { - this.pending = false; - this._render(data); - } - - /** - * - * @param {Matcher.IOrderBookResult} orderbook - * @param {Array} orders - * @param {Array<{price: Money, lastSide: string}>} lastPrice - * @return {OrderBook.OrdersData} - * @private - */ - _remapOrderBook(orderbook, orders = [], lastPrice) { - - const dataBids = orderbook.bids.slice(0, OrderList.ROWS_COUNT); - const dataAsks = orderbook.asks.slice(0, OrderList.ROWS_COUNT); - - const crop = utils.getOrderBookRangeByCropRate({ - bids: dataBids, - asks: dataAsks, - chartCropRate: this._orderBookCropRate - }); - - const priceHash = orders.reduce((result, item) => { - if (item.isActive) { - if (item.amount.asset.id === orderbook.pair.amountAsset.id && - item.price.asset.id === orderbook.pair.priceAsset.id) { - result[item.price.getTokens().toFixed(item.price.asset.precision)] = true; - } - } - return result; - }, Object.create(null)); - - const lastTrade = lastPrice; - const bids = OrderBook._sumAllOrders(dataBids, 'sell'); - const asks = OrderBook._sumAllOrders(dataAsks, 'buy').reverse(); - - const maxAmount = OrderBook._getMaxAmount(bids, asks, crop); - - return { - bids, - maxAmount, - priceHash, - crop, - lastTrade, - spread: orderbook.spread && orderbook.spread.percent, - asks - }; - } - - /** - * @param {OrderBook.OrdersData} data - * @private - */ - _render(data) { - if (!data) { - return null; - } - - if (this._noRender) { - this._lastResponse = data; - return null; - } - - this.hasOrderBook = Boolean(data.bids.length || data.asks.length); - - if (data.lastTrade) { - const isBuy = data.lastTrade.lastSide === 'buy'; - const isSell = data.lastTrade.lastSide === 'sell'; - this._dom.$lastPrice.toggleClass(CLASSES.BUY, isBuy) - .toggleClass(CLASSES.SELL, isSell) - .text(data.lastTrade.price.toFormat()); - } else { - this._dom.$lastPrice.removeClass(CLASSES.BUY) - .removeClass(CLASSES.SELL) - .text(0); - } - this._dom.$spread.text(data.spread && data.lastTrade ? data.spread.toFixed(2) : ''); - - const pair = new AssetPair(this.amountAsset, this.priceAsset); - - const toLength = (list, len) => { - const count = len - list.length; - return new Array(count).fill(null).concat(list); - }; - - const length = OrderList.ROWS_COUNT; - this._asks.render(toLength(data.asks, length), data.crop, data.priceHash, data.maxAmount, pair); - this._bids.render(data.bids, data.crop, data.priceHash, data.maxAmount, pair); - - if (this._showSpread) { - this._showSpread = false; - const box = this._dom.$box.get(0); - box.scrollTop = this._getSpreadScrollPosition(); - } - } - - /** - * @return {number} - * @private - */ - _getSpreadScrollPosition() { - const box = this._dom.$box.get(0); - const info = this._dom.$info.get(0); - return info.offsetTop - box.offsetTop - box.clientHeight / 2 + info.clientHeight / 2; - } - - /** - * @param {Array} list - * @param {'buy'|'sell'} type - * @return Array - * @private - */ - static _sumAllOrders(list, type) { - let total = new BigNumber(0); - let amountTotal = new BigNumber(0); - - return list.map((item) => { - total = total.add(item.total); - amountTotal = amountTotal.add(item.amount); - return { - type, - amount: new BigNumber(item.amount), - price: new BigNumber(item.price), - total, - totalAmount: amountTotal - }; - }); - } - - /** - * @param {OrderBook.IOrder[]} bids - * @param {OrderBook.IOrder[]} asks - * @param {OrderBook.ICrop} crop - * @return {BigNumber} - * @private - */ - static _getMaxAmount(bids, asks, crop) { - const croppedBids = OrderBook._cropFilterOrders(bids, crop); - const croppedAsks = OrderBook._cropFilterOrders(asks, crop); - - const orders = [...croppedBids, ...croppedAsks].sort((a, b) => a.amount.gt(b.amount) ? 1 : -1); - - if (!orders.length) { - return new BigNumber(0); - } else { - const percentile = 0.9; - return orders[Math.floor(orders.length * percentile)].amount; - } - } - - /** - * @param {OrderBook.IOrder[]} list - * @param {OrderBook.ICrop} crop - * @return {OrderBook.IOrder[]} - * @private - */ - static _cropFilterOrders(list, crop) { - return list.filter((o) => o.price.gte(crop.min) && o.price.lte(crop.max)); - } - - } - - return new OrderBook(); - }; - - controller.$inject = [ - 'Base', - 'createPoll', - '$element', - 'waves', - 'dexDataService', - 'utils', - '$scope', - 'i18n', - 'OrderList', - 'transactions' - ]; - - angular.module('app.dex').component('wDexOrderBook', { - templateUrl: 'modules/dex/directives/orderBook/orderBook.html', - bindings: { - isScrolled: '=' - }, - controller - }); -})(); - -/** - * @name OrderBook - */ - -/** - * @typedef {object} OrderBook#IOrder - * @property {BigNumber} price - * @property {BigNumber} amount - * @property {BigNumber} total - * @property {BigNumber} totalAmount - * @property {'sell'|'buy'} type - */ - -/** - * @typedef {object} OrderBook#ICrop - * @property {BigNumber} min - * @property {BigNumber} max - */ - -/** - * @typedef {object} OrderBook#OrdersData - * @property {Array} bids - * @property {Array} asks - * @property {BigNumber} maxAmount - * @property {OrderBook.ICrop} crop - * @property {Record} priceHash - * @property {{price: Money, lastSide: string}} lastTrade - * @property {BigNumber} spread - */ diff --git a/src/modules/dex/directives/orderBook/OrderList.js b/src/modules/dex/directives/orderBook/OrderList.js deleted file mode 100644 index d234cbb5b8..0000000000 --- a/src/modules/dex/directives/orderBook/OrderList.js +++ /dev/null @@ -1,166 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {typeof Base} Base - * @param {typeof OrderListItem} OrderListItem - */ - const service = function (Base, OrderListItem) { - - const SCALE = devicePixelRatio || 1; - - /** - * @class OrderList - */ - class OrderList extends Base { - - static ROWS_COUNT = 80; - /** - * @type {Array} - * @private - */ - _rows = []; - /** - * @type {HTMLElement} - * @private - */ - _root = null; - /** - * @type {HTMLCanvasElement} - * @private - */ - _canvas; - /** - * @type {CanvasRenderingContext2D} - * @private - */ - _ctx; - /** - * @type {string} - * @private - */ - _fillColor; - - - constructor(params) { - super(); - this._fillColor = params.fillColor; - this._createCanvas(params.node); - this._createLines(params.node); - } - - /** - * @param {Array} data - * @param {OrderBook.ICrop} crop - * @param {Record} priceHash - * @param {BigNumber} maxAmount - * @param {AssetPair} pair - */ - render(data, crop, priceHash, maxAmount, pair) { - const widthList = []; - - this._rows.forEach((row, index) => { - const item = data[index]; - row.render(item, crop, priceHash, pair); - widthList[index] = item && item.amount.div(maxAmount).mul(100).toFixed(2); - }); - - this._drawCanvas(widthList); - } - - $onDestroy() { - super.$onDestroy(); - this._rows.forEach(row => { - row.$onDestroy(); - }); - } - - /** - * @param node - * @private - */ - _createLines(node) { - for (let i = 0; i < OrderList.ROWS_COUNT; i++) { - this._rows.push(new OrderListItem(node)); - } - } - - /** - * @param node - * @private - */ - _createCanvas(node) { - this._canvas = document.createElement('canvas'); - this._canvas.style.position = 'absolute'; - this._canvas.style.left = '0'; - this._canvas.style.top = '0'; - this._ctx = this._canvas.getContext('2d'); - node.style.position = 'relative'; - node.appendChild(this._canvas); - } - - /** - * @return {number} - * @private - */ - _getLineHeight() { - const height = this._rows[0].getHeight(); - if (height) { - this._getLineHeight = () => height; - } - return height; - } - - /** - * @private - */ - _drawCanvas(widthList) { - this._initSize(); - - const height = this._getLineHeight(); - const rate = this._canvas.width / 100; - - this._clearCanvas(); - - if (!height) { - return null; - } - - this._ctx.fillStyle = this._fillColor; - - widthList.forEach((width, index) => { - this._ctx.fillRect(0, index * height * SCALE, width * rate, height * SCALE); - }); - - this._ctx.stroke(); - } - - _clearCanvas() { - this._canvas.width = this._canvas.width; - } - - /** - * @private - */ - _initSize() { - const width = this._canvas.parentElement.clientWidth; - const height = this._canvas.parentElement.clientHeight; - this._canvas.width = width * SCALE; - this._canvas.height = height * SCALE; - this._canvas.style.width = `${width}px`; - this._canvas.style.height = `${height}px`; - - if (width && height) { - this._initSize = () => undefined; - } - } - - } - - return OrderList; - }; - - service.$inject = ['Base', 'OrderListItem']; - - angular.module('app.dex').service('OrderList', service); -})(); diff --git a/src/modules/dex/directives/orderBook/OrderListItem.js b/src/modules/dex/directives/orderBook/OrderListItem.js deleted file mode 100644 index 0b627833be..0000000000 --- a/src/modules/dex/directives/orderBook/OrderListItem.js +++ /dev/null @@ -1,257 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {typeof Base} Base - * @param {app.utils} utils - * @param {app.i18n} i18n - * @param {DexDataService} dexDataService - */ - const service = function (Base, utils, i18n, dexDataService) { - - /** - * @class OrderListItem - * @extends Base - */ - class OrderListItem extends Base { - - /** - * @type {OrderBook.IOrder} - * @private - */ - _data = null; - /** - * @type {HTMLElement} - * @private - */ - _root = OrderListItem._createElement('w-row', 'table__row'); - /** - * @type {HTMLElement} - * @private - */ - _parent; - /** - * @type {HTMLElement} - * @private - */ - _amountNode; - /** - * @type {HTMLElement} - * @private - */ - _priceNode; - /** - * @type {HTMLElement} - * @private - */ - _totalNode; - /** - * @type {HTMLElement} - * @private - */ - _tooltipSell; - /** - * @type {HTMLElement} - * @private - */ - _tooltipBuy; - /** - * @type {AssetPair} - * @private - */ - _pair; - - - constructor(parent) { - super(); - this._parent = parent; - this._parent.appendChild(this._root); - this._createDom(); - this._setHandlers(); - this._draw(); - } - - /** - * @return {OrderBook.IOrder} - */ - getData() { - return this._data; - } - - /** - * @param {OrderBook.IOrder} data - * @param {OrderBook.ICrop} crop - * @param {Record} priceHash - * @param {AssetPair} pair - */ - render(data, crop, priceHash, pair) { - if (OrderListItem._isEqual(this._data, data)) { - return null; - } - - this._pair = pair; - this._data = data; - this._draw(crop, priceHash, pair); - } - - /** - * @return {number} - */ - getHeight() { - return this._root.clientHeight; - } - - /** - * @param {OrderBook.ICrop} [crop] - * @param {Record} [priceHash] - * @param {AssetPair} [pair] - * @private - */ - _draw(crop, priceHash, pair) { - if (this._data) { - this._amountNode.innerHTML = - utils.getNiceNumberTemplate(this._data.amount, pair.amountAsset.precision, true); - this._priceNode.innerHTML = - utils.getNiceNumberTemplate(this._data.price, pair.priceAsset.precision, 100000); - this._totalNode.innerHTML = - utils.getNiceNumberTemplate(this._data.total, pair.priceAsset.precision, true); - - const hasOrder = !!priceHash[this._data.price.toFixed(pair.priceAsset.precision)]; - const inRange = this._data.price.gte(crop.min) && this._data.price.lte(crop.max); - - this._tooltip.classList.toggle('active', true); - this._root.classList.toggle('active', hasOrder); - this._root.classList.toggle('no-market-price', !inRange); - } else { - this._amountNode.innerText = '—'; - this._priceNode.innerText = '—'; - this._totalNode.innerText = '—'; - this._tooltip.classList.toggle('active', false); - this._root.classList.toggle('active', false); - this._root.classList.toggle('no-market-price', false); - } - this._root.classList.toggle('isEmpty', !this._data); - } - - /** - * @private - */ - _setHandlers() { - this.listenEventEmitter(this._root, 'mouseenter', () => { - this._onHoverIn(); - }, Base.DOM_EVENTS_METHODS); - this.listenEventEmitter(this._root, 'click', () => { - OrderListItem._onClickRow(this); - }, Base.DOM_EVENTS_METHODS); - } - - /** - * @private - */ - _onHoverIn() { - if (!this._pair || !this._data) { - return null; - } - const sellTooltip = i18n.translate('orderbook.ask.tooltipText', 'app.dex', { - amountAsset: this._pair.amountAsset.displayName, - priceAsset: this._pair.priceAsset.displayName, - price: this._data.price.toFormat(this._pair.priceAsset.precision) - }); - - const buyTooltip = i18n.translate('orderbook.bid.tooltipText', 'app.dex', { - amountAsset: this._pair.amountAsset.displayName, - priceAsset: this._pair.priceAsset.displayName, - price: this._data.price.toFormat(this._pair.priceAsset.precision) - }); - - this._tooltipSell.innerText = sellTooltip; - this._tooltipBuy.innerText = buyTooltip; - } - - /** - * @private - */ - _createDom() { - this._root.appendChild( - OrderListItem._createElement('div', 'table__row-wrap', [ - this._tooltip = OrderListItem._createElement('div', 'tooltip-dex', [ - this._tooltipSell = OrderListItem._createElement('span', 'tooltip-ask'), - this._tooltipBuy = OrderListItem._createElement('span', 'tooltip-bid') - ]), - OrderListItem._createElement('w-cell', 'table__cell cell-0', [ - this._amountNode = OrderListItem._createElement('div', 'table__cell-wrap') - ]), - OrderListItem._createElement('w-cell', 'table__cell cell-1', [ - this._priceNode = OrderListItem._createElement('div', 'table__cell-wrap') - ]), - OrderListItem._createElement('w-cell', 'table__cell cell-2', [ - this._totalNode = OrderListItem._createElement('div', 'table__cell-wrap') - ]) - ]) - ); - } - - /** - * @param {OrderBook.IOrder} a - * @param {OrderBook.IOrder} b - * @return {boolean} - * @private - */ - static _isEqual(a, b) { - return (!a && !b) || - (a && b && Object.entries(a).every(([key, value]) => utils.isEqual(value, b[key]))); - } - - /** - * @param {string} tagName - * @param {string} className - * @param {Array} [children] - * @return {HTMLElement} - * @private - */ - static _createElement(tagName, className, children) { - const element = document.createElement(tagName); - className.split(' ').forEach(name => { - element.classList.add(name); - }); - - if (children && children.length) { - children.forEach(child => { - element.appendChild(child); - }); - } - - return element; - } - - /** - * @param {OrderListItem} item - * @private - */ - static _onClickRow(item) { - const order = item.getData(); - - if (!order) { - return null; - } - - dexDataService.chooseOrderBook.dispatch({ - amount: order.totalAmount.toFixed(2), - price: order.price.toFixed(), - type: order.type - }); - } - - } - - return OrderListItem; - }; - - service.$inject = ['Base', 'utils', 'i18n', 'dexDataService']; - - angular.module('app.dex').service('OrderListItem', service); -})(); - -/** - * @name OrderListItem - */ diff --git a/src/modules/dex/directives/orderBook/orderBook.html b/src/modules/dex/directives/orderBook/orderBook.html deleted file mode 100644 index b46ebd95b4..0000000000 --- a/src/modules/dex/directives/orderBook/orderBook.html +++ /dev/null @@ -1,35 +0,0 @@ -
- - - - - - - - - - - - - - - - - - - -
-
-
-
-
- - -
-
-
- - - -
diff --git a/src/modules/dex/directives/orderBook/orderBook.less b/src/modules/dex/directives/orderBook/orderBook.less deleted file mode 100644 index 63e7843988..0000000000 --- a/src/modules/dex/directives/orderBook/orderBook.less +++ /dev/null @@ -1,47 +0,0 @@ -@import (reference) 'config'; -@import (reference) '../../../app/less/typography'; -@import (reference) 'icons'; - -.dex-order-book { - display: block; - width: 100%; - height: 100%; - text-align: right; - - .table { - display: none; - } - - - &__wrapper { - width: 100%; - height: 100%; - position: relative - } - - &.has-order-book { - .empty-block, - .error-block { - display: none; - } - .table { - display: block; - } - } -} - -@media screen and (max-width: 659px) { - .dex-order-book { - min-height: 360px; - - &__wrapper { - min-height: 322px; - } - - w-scroll-box { - max-height: 155px; - overflow-y: auto; - overflow-x: hidden; - } - } -} diff --git a/src/modules/dex/directives/tradeGraph/TradeGraph.js b/src/modules/dex/directives/tradeGraph/TradeGraph.js deleted file mode 100644 index 2c19482c10..0000000000 --- a/src/modules/dex/directives/tradeGraph/TradeGraph.js +++ /dev/null @@ -1,379 +0,0 @@ -(function () { - 'use strict'; - - const ORDERS_TYPES = { - asks: 'asks', - bids: 'bids' - }; - const ORDER_LIST_STUB = [{ amount: 0, price: 0 }]; - const THRESHOLD_VALUES = { - asks: 2, - bids: 2 - }; - const COLORS = { - default: { - lineColor: { - asks: '#e5494d', - bids: '#1f5af6' - }, - fillColor: { - asks: '#ffe4e4', - bids: '#eaf0fe' - } - }, - black: { - lineColor: { - asks: '#e5494d', - bids: '#5a81ea' - }, - fillColor: { - asks: 'rgba(229, 73, 77, 0.15)', - bids: 'rgba(90, 129, 234, 0.15)' - } - } - }; - - const { Signal } = require('ts-utils'); - const { BigNumber } = require('@waves/bignumber'); - - /** - * @param Base - * @param utils - * @param {Waves} waves - * @param {IPollCreate} createPoll - * @param {$rootScope.Scope} $scope - * @param {app.utils} utils - * @param {User} user - * @return {TradeGraph} - */ - const controller = function (Base, utils, waves, createPoll, $scope, user) { - - /** - * @class TradeGraph - * @extends Base - */ - class TradeGraph extends Base { - - /** - * @type {boolean} - */ - loadingError = false; - /** - * @type {{amount: string, price: string}} - * @private - */ - _assetIdPair = null; - - /** - * @type {number} - * @private - */ - _chartCropRate = null; - /** - * @type {Signal} - * @private - */ - _setDataSignal = new Signal(); - - /** - * @type {boolean} - * @private - */ - canShowGraph = false; - /** - * @type {boolean} - */ - pending = true; - /** - * @type {TChartOptions} - */ - options = { - axisX: 'price', - axisY: 'amount', - marginBottom: 0, - hasDates: false, - checkWidth: true, - view: { - asks: { - lineColor: COLORS.default.lineColor.asks, - fillColor: COLORS.default.fillColor.asks, - lineWidth: 4 - }, - bids: { - lineColor: COLORS.default.lineColor.bids, - fillColor: COLORS.default.fillColor.bids, - lineWidth: 4 - } - } - }; - /** - * @type {object} - */ - chartPlateOptions = {}; - /** - * @type {string} - */ - theme = 'default'; - /** - * @type {object} - */ - data = { - asks: ORDER_LIST_STUB, - bids: ORDER_LIST_STUB - }; - - constructor() { - super(); - - this.syncSettings({ - _assetIdPair: 'dex.assetIdPair', - _chartCropRate: 'dex.chartCropRate', - theme: 'theme' - }); - this.observe(['_assetIdPair', '_chartCropRate'], this._onChangeAssets); - /** - * @type {Poll} - * @private - */ - this._poll = createPoll(this, this._getOrderBook, this._setOrderBook, 1000, { $scope }); - this._resetPending(); - - this.theme = user.getSetting('theme'); - this._setChartPlateOptions(); - this._setChartOptionsView(); - this.observe('theme', this._onThemeChange); - } - - onMouse(chartData) { - const id = chartData.id; - const { xValue, yValue } = chartData.point; - - this.chartEvent = { - ...chartData, - id: `${id[0].toUpperCase()}${id.substring(1)}`, - amount: new BigNumber(yValue).toFormat(), - price: new BigNumber(xValue).toFormat() - }; - } - - /** - * @param {boolean} noRestart - * @private - */ - _onChangeAssets(noRestart) { - if (!noRestart) { - this._poll.restart(); - this._resetPending(); - } - } - - /** - * @private - */ - _resetPending() { - this.pending = true; - this.receiveOnce(this._setDataSignal, () => { - this.pending = false; - }); - } - - /** - * @private - */ - _getOrderBook() { - return waves.matcher.getOrderBook(this._assetIdPair.amount, this._assetIdPair.price) - .then((orderBook) => this._cutOffOutlyingOrdersIfNecessary(orderBook)) - .then(TradeGraph._buildCumulativeOrderBook) - .then(data => { - this.loadingError = false; - return data; - }) - .catch(() => { - this.loadingError = true; - this.pending = false; - $scope.$apply(); - }); - } - - _setOrderBook(orderBook) { - this._updateGraphAccordingToOrderBook(orderBook); - this.data = { - asks: orderBook.asks, - bids: orderBook.bids - }; - - this._setDataSignal.dispatch(); - - $scope.$digest(); - } - - _cutOffOutlyingOrdersIfNecessary(orderBook) { - if (TradeGraph._isLackOfAsks(orderBook) || TradeGraph._isLackOfBids(orderBook)) { - return orderBook; - } - - const filteredOrderBook = utils.filterOrderBookByCharCropRate({ - chartCropRate: this._chartCropRate, - asks: orderBook.asks, - bids: orderBook.bids - }); - - if (TradeGraph._areEitherAsksOrBids(filteredOrderBook)) { - return filteredOrderBook; - } - - return orderBook; - } - - _updateGraphAccordingToOrderBook(orderBook) { - this.canShowGraph = !!TradeGraph._areEitherAsksOrBids(orderBook); - return orderBook; - } - - _setChartOptionsView() { - this.options = { - ...this.options, - view: this._getViewOptions() - }; - } - - _getViewOptions() { - switch (this.theme) { - case 'black': - return ({ - asks: { - lineColor: COLORS[this.theme].lineColor.asks, - fillColor: COLORS[this.theme].fillColor.asks, - lineWidth: 2 - }, - bids: { - lineColor: COLORS[this.theme].lineColor.bids, - fillColor: COLORS[this.theme].fillColor.bids, - lineWidth: 2 - } - }); - default: - return ({ - asks: { - lineColor: COLORS.default.lineColor.asks, - fillColor: COLORS.default.fillColor.asks, - lineWidth: 4 - }, - bids: { - lineColor: COLORS.default.lineColor.bids, - fillColor: COLORS.default.fillColor.bids, - lineWidth: 4 - } - }); - } - } - - _setChartPlateOptions() { - switch (this.theme) { - case 'black': - this.chartPlateOptions = { - ...this.chartPlateOptions, - markerColors: COLORS[this.theme].lineColor - }; - break; - default: - this.chartPlateOptions = { - ...this.chartPlateOptions, - markerColors: COLORS.default.lineColor - }; - } - - } - - _onThemeChange() { - utils.wait(1000).then(() => { - this._setChartOptionsView(); - this._setChartPlateOptions(); - }); - } - - static _areEitherAsksOrBids(orderBook) { - return TradeGraph._areEnoughAsks(orderBook) || TradeGraph._areEnoughBids(orderBook); - } - - static _areEnoughAsks(orderBook) { - return !TradeGraph._isLackOfAsks(orderBook); - } - - static _areEnoughBids(orderBook) { - return !TradeGraph._isLackOfBids(orderBook); - } - - static _isLackOfAsks(orderBook) { - return TradeGraph._isLackOf(orderBook, ORDERS_TYPES.asks); - } - - static _isLackOfBids(orderBook) { - return TradeGraph._isLackOf(orderBook, ORDERS_TYPES.bids); - } - - static _isLackOf(orderBook, ordersType) { - return orderBook[ordersType].length < THRESHOLD_VALUES[ordersType]; - } - - static _buildCumulativeOrderBook({ asks, bids }) { - return { - asks: TradeGraph._buildCumulativeOrderList(asks), - bids: TradeGraph._buildCumulativeOrderList(bids) - }; - } - - static _buildCumulativeOrderList(list) { - let amount = new BigNumber(0); - - return list.reduce((result, item) => { - amount = amount.add(new BigNumber(item.amount)); - result.push({ - amount: Number(amount.toFixed(this._chartCropRate)), - price: Number(item.price) - }); - - return result; - }, []); - } - - } - - return new TradeGraph(); - }; - - controller.$inject = ['Base', 'utils', 'waves', 'createPoll', '$scope', 'user']; - - angular.module('app.dex') - .component('wDexTradeGraph', { - templateUrl: 'modules/dex/directives/tradeGraph/tradeGraph.html', - controller - }); -})(); - -/** - * @typedef {object} TChartOptions - * @property {string} axisX - * @property {string} axisY - * @property {number} marginBottom - * @property {boolean} hasDates - * @property {boolean | number} checkWidth - * @property {TView} view - */ - -/** - * @typedef {Object} TView - */ - -/** - * @typedef {object} IView - * @property {string} fillColor - * @property {string} lineColor - * @property {number} lineWidth - */ - -/** - * @typedef {object} TChartData - * @property {number} amount - * @property {number} price - */ diff --git a/src/modules/dex/directives/tradeGraph/tradeGraph.html b/src/modules/dex/directives/tradeGraph/tradeGraph.html deleted file mode 100644 index e646cd4602..0000000000 --- a/src/modules/dex/directives/tradeGraph/tradeGraph.html +++ /dev/null @@ -1,20 +0,0 @@ -
- - - -
-
{{$ctrl.chartEvent.price}}
-
- {{$ctrl.chartEvent.id}} - {{$ctrl.chartEvent.amount}} -
-
- - - - - -
diff --git a/src/modules/dex/directives/tradeGraph/tradeGraph.less b/src/modules/dex/directives/tradeGraph/tradeGraph.less deleted file mode 100644 index 760561bb47..0000000000 --- a/src/modules/dex/directives/tradeGraph/tradeGraph.less +++ /dev/null @@ -1,34 +0,0 @@ -@import (reference) 'config'; -@import (reference) '../../../app/less/typography'; - -.dex-trade-graph { - display: block; - width: 100%; - position: relative; - - .graph-wrapper { - background-color: @color-white; - height: 100%; - } - - .empty-block, - .error-block { - margin: 0 auto; - position: relative; - - &__icon { - margin: 15px auto 0; - background-size: 90%; - } - - .footnote-1 { - font-size: @font-size-caption-1; - line-height: 16px; - } - } - - .chart-tooltip { - background: @white-btn-bg; - box-shadow: @shadow-type-2; - } -} diff --git a/src/modules/dex/directives/tradeHistory/TradeHistory.js b/src/modules/dex/directives/tradeHistory/TradeHistory.js deleted file mode 100644 index fdddaf2937..0000000000 --- a/src/modules/dex/directives/tradeHistory/TradeHistory.js +++ /dev/null @@ -1,261 +0,0 @@ -/* global tsApiValidator */ -(function () { - 'use strict'; - - const { propEq, uniqBy, map, pipe, prop, find } = require('ramda'); - - /** - * @param {Base} Base - * @param {$rootScope.Scope} $scope - * @param {IPollCreate} createPoll - * @param {User} user - * @param {utils} utils - * @param {Transactions} transactions - * @return {TradeHistory} - */ - const controller = function (Base, $scope, createPoll, user, utils, transactions) { - - const PAIR_COLUMN_DATA = { - id: 'pair', - valuePath: 'item.pair', - search: true, - placeholder: 'directives.filter' - }; - - const FEE_COLUMN_DATA = { - id: 'fee', - title: { literal: 'directives.tradeHistory.tableTitle.fee' }, - valuePath: 'item.userFee', - sort: true - }; - - const HEADER_COLUMNS = [ - { - id: 'type', - title: { literal: 'directives.tradeHistory.tableTitle.type' }, - valuePath: 'item.exchangeType', - sort: true - }, - { - id: 'time', - title: { literal: 'directives.tradeHistory.tableTitle.date' }, - valuePath: 'item.timestamp', - sort: true, - sortActive: true, - isAsc: false - }, - { - id: 'price', - title: { literal: 'directives.tradeHistory.tableTitle.price' }, - valuePath: 'item.price', - sort: true - }, - { - id: 'amount', - title: { literal: 'directives.tradeHistory.tableTitle.size' }, - valuePath: 'item.amount', - sort: true - }, - { - id: 'total', - title: { literal: 'directives.tradeHistory.tableTitle.total' }, - valuePath: 'item.total', - sort: true - } - ]; - - class TradeHistory extends Base { - - /** - * @private - */ - userList = []; - - constructor() { - super(); - /** - * @type {{amount: string, price: string}} - * @private - */ - this._assetIdPair = null; - /** - * @type {boolean} - */ - this.isMy = false; - /** - * @type {IExchangeTransaction[]} - */ - this.history = []; - /** - * @type {function(tx: IExchangeTransaction[], [index]: number): boolean} - */ - this.remapTransactions = TradeHistory._remapTxList(); - /** - * @type {boolean} - */ - this.pending = true; - /** - * @type {boolean} - */ - this.isDemo = false; - - this.headers = []; - - this.syncSettings({ - _assetIdPair: 'dex.assetIdPair' - }); - - user.getMultiAccountUsers().then(list => { - this.userList = list; - }); - } - - $postLink() { - this.headers = this.isMy ? [PAIR_COLUMN_DATA].concat(HEADER_COLUMNS, FEE_COLUMN_DATA) : HEADER_COLUMNS; - /** - * @type {boolean} - */ - this.isDemo = this.isMy && !user.address; - this._initializePoll(); - this.observe('_assetIdPair', this._onChangeAssets); - } - - /** - * @param {IExchange} tx - * @return boolean - */ - isSelected(tx) { - return this._assetIdPair.amount === tx.amount.asset.id && - this._assetIdPair.price === tx.price.asset.id; - } - - /** - * @param {IExchange} tx - */ - setPair(tx) { - const isLocked = this.isLockedPair(tx); - if (isLocked) { - return null; - } - user.setSetting('dex.assetIdPair', { - amount: tx.amount.asset.id, - price: tx.price.asset.id - }); - } - - /** - * @param tx - * @public - */ - isLockedPair(tx) { - return utils.isLockedInDex(tx.amount.asset.id, tx.price.asset.id); - } - - /** - * @private - */ - _initializePoll() { - if (this.isMy && this.isDemo) { - return null; - } - - /** - * @type {Poll} - */ - this.poll = createPoll(this, this._getTradeHistory, this._setTradeHistory, 1000); - this.poll.ready.then(() => { - this.pending = false; - }); - } - - /** - * @private - */ - _onChangeAssets() { - if (!this.isMy) { - this.pending = true; - this.history = []; - this.poll.restart().then(() => { - this.pending = false; - }); - } - } - - /** - * @return {Promise} - * @private - */ - _getTradeHistory() { - return transactions.getExchangeTxList(this._getTransactionsFilter()) - .then(this.remapTransactions); - } - - /** - * @param {IExchangeTransaction[]} history - * @private - */ - _setTradeHistory(history) { - const isEqual = this.history.length === history.length && - this.history.every((item, i) => propEq('id', item, this.history[i])); - - if (isEqual) { - return null; - } - - this.history = history; - $scope.$apply(); - } - - /** - * @return {*} - * @private - */ - _getTransactionsFilter() { - if (this.isMy) { - return { sender: user.address }; - } - return { - amountAsset: this._assetIdPair.amount, - priceAsset: this._assetIdPair.price - }; - } - - /** - * @return {function(tx: IExchangeTransaction[], [index]: number): boolean} - * @private - */ - static _remapTxList() { - const filter = uniqBy(prop('id')); - const mapFunc = map(TradeHistory._remapTx); - return pipe(filter, mapFunc); - } - - static _remapTx(tx) { - const amount = tx => tx.amount.asset.displayName; - const price = tx => tx.price.asset.displayName; - const fee = order => order.orderType === 'sell' ? tx.sellMatcherFee : tx.buyMatcherFee; - const pair = `${amount(tx)} / ${price(tx)}`; - const userFee = pipe( - find(order => order.orderType === tx.exchangeType), - fee - )([tx.order1, tx.order2]); - - return { ...tx, pair, userFee }; - } - - } - - return new TradeHistory(); - }; - - controller.$inject = ['Base', '$scope', 'createPoll', 'user', 'utils', 'transactions']; - - angular.module('app.dex') - .component('wDexTradeHistory', { - bindings: { - isMy: '<' - }, - templateUrl: 'modules/dex/directives/tradeHistory/tradeHistory.html', - controller - }); -})(); diff --git a/src/modules/dex/directives/tradeHistory/tradeHistory.html b/src/modules/dex/directives/tradeHistory/tradeHistory.html deleted file mode 100644 index 20ff4ca79a..0000000000 --- a/src/modules/dex/directives/tradeHistory/tradeHistory.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - {{::tx.pair}} - - - - - - - - - {{::tx.timestamp | date:'MM-dd HH:mm:ss'}} - - - - - - - - - - - - - - - - - - - diff --git a/src/modules/dex/directives/tradeHistory/tradeHistory.less b/src/modules/dex/directives/tradeHistory/tradeHistory.less deleted file mode 100644 index 2a069a38cf..0000000000 --- a/src/modules/dex/directives/tradeHistory/tradeHistory.less +++ /dev/null @@ -1,22 +0,0 @@ -@import (reference) 'config'; -@import (reference) "../../../app/less/typography"; - -.dex-trade-history { - display: block; - width: 100%; - height: 100%; - - .decimal-muted { - color: @color-disabled-500; - } - - .order-side { - &.sell { - color: @color-error-400; - } - - &.buy { - color: @color-submit-400; - } - } -} diff --git a/src/modules/dex/less/dex.less b/src/modules/dex/less/dex.less deleted file mode 100644 index e4e1216fc8..0000000000 --- a/src/modules/dex/less/dex.less +++ /dev/null @@ -1,325 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; -@import (reference) '../../app/less/typography'; - -@dex-lower-block-height: 50%; - -body.dex, -body.dex-demo { - background-color: @dex-background; - color: @color-basic-900; - - .main-content { - min-height: 466px; - - .content { - max-width: 100%; - padding: 5px; - } - } - - input::placeholder { - color: @color-basic-500; - opacity: 1; - } - - .ghost { - background: @color-white; - } - - .toggler { - display: none; - position: absolute; - right: 5px; - top: 10px; - z-index: 1; - } - - .input-container { - .input-error .error { - padding: 12px; - } - } - - .block-title { - .input-wrap input { - padding: 6px 8px 6px 21px; - background: url(/img/icons/icon-search-dex.svg) 0 center no-repeat; - background-size: 12px 12px; - font-size: @font-size-caption-2; - height: 29px; - border: 0 none; - border-radius: 0; - width: 100%; - } - - .has-search { - width: 50%; - margin-left: 20px; - position: relative; - - &::before { - width: 1px; - height: 37px; - content: ''; - background: @color-basic-100; - display: block; - position: absolute; - left: -10px; - top: -4px; - } - } - } - - .search-item { - font-size: @font-size-caption-1; - cursor: pointer; - - &.has-ticker { - font-weight: bold; - } - } - - .input-clear { - display: block; - position: absolute; - right: 1px; - top: 50%; - margin-top: -1px; - transform: translateY(-50%); - width: 30px; - height: 30px; - z-index: 2; - cursor: pointer; - background-image: url(/img/icons/order_cancel.svg); - background-size: 8px 8px; - background-repeat: no-repeat; - background-position: center; - } -} - -.dex-trade-graph { - height: 100%; - max-height: 100%; -} - -.dex-loader, -.loading { - opacity: 0; -} - -.dex-loader { - position: absolute; - z-index: 0; -} - -.dex-loader.loading { - opacity: 1; - position: absolute; - z-index: 1; - display: inline-block; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); -} - -@media screen and (min-width: 2400px) { - .dex, - .dex-demo { - .dex-watchlist { - .titles-wrap { - height: 42px; - - .select__wrap { - .select__list { - height: 42px; - font-size: 13px; - } - - .option { - font-size: 13px; - } - - .select__title { - height: 41px; - font-size: 13px; - } - } - - .title { - height: 42px; - font-size: 13px; - - &.active { - background: @color-white; - } - } - } - } - - .create-order { - .create-order { - .body .making-order .areas .area .name { - line-height: 36px; - } - } - } - - .dex-layout { - &__tradehistory .tabs { - .titles-wrap { - height: 42px; - - .title { - height: 42px; - } - } - - .tab-tem { - overflow-x: auto; - } - - .tabs-myOrderHistory { - .smart-table { - &__cell { - .decimal-muted { - color: @color-basic-900; - } - } - } - } - } - } - } - - w-dex-trade-graph { - height: 100%; - max-height: 100%; - } - - .candle-chart-wrapper.error { - display: flex; - - & > div { - text-align: center; - display: flex; - margin: auto; - - div:first-child { - .body-1(); - margin: 0 auto 5px auto; - color: @color-basic-700; - - &::before { - background-image: url(/img/icons/icon-empty.svg); - background-repeat: no-repeat; - width: 50px; - height: 52px; - margin: 0 auto 20px; - display: block; - content: ''; - } - } - } - } -} - -@media screen and (max-width: 1024px) { - .dex, - .dex-demo { - .content { - height: 100%; - width: 100%; - padding: 5px; - right: 0; - bottom: 0; - } - - .dex-candle-chart { - border-radius: 0 0 2px 0; - } - - .tabs { - .tab-body-wrap { - height: calc(100% ~'- 48px'); - } - - .titles-wrap { - height: 48px; - box-shadow: @shadow-menu-top; - position: relative; - z-index: 6; - - &::after { - display: none; - } - - .title { - height: 48px; - line-height: 48px; - - &.active { - border: 0 none; - border-bottom: 1px solid @color-submit-400; - - &::after, - &::before { - display: none; - } - } - } - } - } - - .tabs, - .dex-watchlist { - .table { - .t-head { - display: none; - } - } - } - } -} - -@media screen and (min-width: 660px) and (max-width: 1024px) { - .dex, - .dex-demo { - min-width: 645px; - width: 100%; - min-height: 100%; - - .content { - position: relative; - margin-top: 0; - overflow: auto; - } - } -} - -@media screen and (max-width: 659px) { - .dex, - .dex-demo { - min-width: 100%; - - .content { - width: 100%; - padding: 5px; - right: 0; - bottom: 0; - height: 100%; - max-height: calc(100% ~' - 80px'); - overflow: auto; - } - - - .tabs { - w-scroll-box { - height: 392px; - width: 100%; - overflow-y: auto; - overflow-x: hidden; - } - } - } -} \ No newline at end of file diff --git a/src/modules/dex/services/CandlesService.js b/src/modules/dex/services/CandlesService.js deleted file mode 100644 index d16944a283..0000000000 --- a/src/modules/dex/services/CandlesService.js +++ /dev/null @@ -1,194 +0,0 @@ -/* eslint-disable no-console */ -(function () { - 'use strict'; - - const { config } = require('data-service'); - const { flatten, pipe, prop, map } = require('ramda'); - const POLL_DELAY = 800; - - /** - * @param {app.utils} utils - * @param {TimeLine} timeLine - * @param {SymbolInfoService} symbolInfoService - * @param {Waves} waves - * @param {Matcher} matcher - * @return {CandlesService} - */ - const factory = function (utils, timeLine, symbolInfoService, waves, matcher) { - - class CandlesService { - - constructor() { - this._lastTime = 0; - this._subscriber = null; - this.onLoadError = angular.noop; - } - - static _getAndHandleCandles(symbolInfo, from, to, resolution, handleCandles, handleError = angular.noop) { - CandlesService - ._getCandles( - symbolInfo, - from, - to, - resolution - ) - .then(handleCandles) - .catch(handleError); - } - - /** - * @param {string} symbolInfo - * @param {number} from - * @param {number} to - * @param {number} interval - * @return {Promise} - * @private - */ - static _getCandles(symbolInfo, from, to, interval) { - from = from || to; - const amountId = symbolInfo._wavesData.amountAsset.id; - const priceId = symbolInfo._wavesData.priceAsset.id; - const { options, config: candleConfig } = utils.getValidCandleOptions(from, to, interval); - const promises = options.map(option => config.getDataService().getCandles(amountId, priceId, { - matcher: matcher.currentMatcherAddress, - ...option - })); - - const convertBigNumber = num => (num.isNaN() ? null : Number(num.toFixed())); - - const candles = Promise.all(promises) - .then(pipe(map(prop('data')), flatten)) - .then(list => list - .map(candle => ({ - txsCount: candle.txsCount || 0, - high: convertBigNumber(candle.high), - low: convertBigNumber(candle.low), - close: convertBigNumber(candle.close), - open: convertBigNumber(candle.open), - volume: convertBigNumber(candle.volume), - time: new Date(candle.time).getTime() - }))); - - const lastTrade = ds.api.pairs.get(amountId, priceId) - .then(pair => waves.matcher.getLastPrice(pair) - .catch(() => null)); - - return Promise.all([candles, lastTrade]) - .then(([candles, lastTrade]) => { - if (candles.length === 1 && lastTrade) { - candles[candles.length - 1].close = Number(lastTrade.price.toTokens()); - } else { - candles = candleConfig.converter(candles); - } - return candles - .filter(candle => candle.open != null); - }).catch(() => utils.wait(5000).then(() => [])); - } - - static convertToMilliseconds(seconds) { - return Number(seconds) ? seconds * 1000 : Date.now(); - } - - onReady(callback) { - setTimeout(() => callback({ - supported_resolutions: WavesApp.dex.resolutions, - supports_time: true, - supports_marks: false, - supports_timescale_marks: false - }), 0); - } - - resolveSymbol(symbolName, resolve, reject) { - if (symbolName.match(/^DEX:/)) { - return; - } - - symbolInfoService.get(symbolName) - .then(resolve) - .catch(() => { - this.onLoadError(); - reject(); - }); // TODO - } - - getBars(symbolInfo, resolution, from, to, onHistoryCallback, onErrorCallback) { - from = CandlesService.convertToMilliseconds(from); - to = CandlesService.convertToMilliseconds(to); - const handleCandles = (candles) => { - if (candles.length) { - this._updateLastTime(candles); - onHistoryCallback(candles); - } else { - onHistoryCallback([], { - noData: true - }); - } - }; - - CandlesService._getAndHandleCandles( - symbolInfo, - from, - to, - resolution, - handleCandles, - onErrorCallback - ); - } - - subscribeBars(symbolInfo, resolution, onRealtimeCallback, subscriberUID, onResetCacheNeededCallback) { - this._subscriber = subscriberUID; - - const to = Date.now(); - const from = this._lastTime; - - const handleCandles = (candles) => { - if (this._subscriber !== subscriberUID) { - return; - } - - this.subscribeBars( - symbolInfo, - resolution, - onRealtimeCallback, - subscriberUID, - onResetCacheNeededCallback - ); - - if (candles.length) { - this._updateLastTime(candles); - candles.forEach(onRealtimeCallback); - } - }; - - timeLine.timeout(() => { - CandlesService._getAndHandleCandles( - symbolInfo, - from, - to, - resolution, - handleCandles - ); - }, POLL_DELAY); - } - - unsubscribeBars() { - this._subscriber = null; - } - - _updateLastTime(candles) { - const lastTime = candles[candles.length - 1].time; - if (this._lastTime && this._lastTime >= lastTime) { - return false; - } - this._lastTime = lastTime; - } - - } - - return new CandlesService(); - }; - - factory.$inject = ['utils', 'timeLine', 'symbolInfoService', 'waves', 'matcher']; - - angular.module('app.dex').factory('candlesService', factory); -})(); diff --git a/src/modules/dex/services/DexDataService.js b/src/modules/dex/services/DexDataService.js deleted file mode 100644 index 4eef990230..0000000000 --- a/src/modules/dex/services/DexDataService.js +++ /dev/null @@ -1,38 +0,0 @@ -(function () { - 'use strict'; - - const tsUtils = require('ts-utils'); - - const factory = function (Base) { - - /** - * @class - */ - class DexDataService extends Base { - - constructor() { - super(); - /** - * @type {Signal} - */ - this.chooseOrderBook = new tsUtils.Signal(); - /** - * @type {Signal} - */ - this.showSpread = new tsUtils.Signal(); - /** - * @type {Signal} - */ - this.createOrder = new tsUtils.Signal(); - } - - } - - - return new DexDataService(); - }; - - factory.$inject = ['Base']; - - angular.module('app.dex').factory('dexDataService', factory); -})(); diff --git a/src/modules/dex/services/SymbolInfoService.js b/src/modules/dex/services/SymbolInfoService.js deleted file mode 100644 index 50526e157d..0000000000 --- a/src/modules/dex/services/SymbolInfoService.js +++ /dev/null @@ -1,86 +0,0 @@ -(function () { - 'use strict'; - - const DEFAULT_SYMBOL_INFO = { - session: '24x7', - exchange: 'DEX', - listed_exchange: 'DEX', - timezone: 'Europe/London', // TODO - - minmov: 1, - - // TODO : check all that - has_intraday: true, - // intraday_multipliers: ['5'], - supported_resolutions: WavesApp.dex.resolutions, - has_seconds: false, - // seconds_multipliers: ['5'], - has_daily: false, - has_weekly_and_monthly: false, - has_empty_bars: true, - force_session_rebuild: false, - has_no_volume: false, - data_status: 'pulsed' - }; - - /** - * @param {Waves} waves - * @param {app.utils.decorators} decorators - * @return {SymbolInfoService} - */ - const factory = function (waves, decorators) { - - class SymbolInfoService { - - get(symbolName) { - const [partOne, partTwo] = symbolName.split('/'); - - if (!partOne || !partTwo) { - return Promise.reject(); - } else { - return this._createSymbolInfo(partOne, partTwo); - } - } - - @decorators.cachable(1440) // TODO : make it persistent when cachable is limited in size - _createSymbolInfo(assetOneId, assetTwoId) { - return ds.api.pairs.get(assetOneId, assetTwoId).then((pair) => { - const amount = pair.amountAsset; - const price = pair.priceAsset; - - // TODO : remove when Waves.Asset is created via factory - return Promise.all([ - waves.node.assets.getAsset(amount.id), - waves.node.assets.getAsset(price.id) - ]).then(([amountInfo, priceInfo]) => { - const amountName = amountInfo.ticker ? amountInfo.ticker : amountInfo.name; - const priceName = priceInfo.ticker ? priceInfo.ticker : priceInfo.name; - - const ticker = `${amountInfo.id}/${priceInfo.id}`; - const symbolName = `${amountName}/${priceName}`; - - return { - ...DEFAULT_SYMBOL_INFO, - pricescale: Math.pow(10, price.precision), - volume_precision: amount.precision, - description: symbolName, - name: symbolName, - ticker, - _wavesData: { - amountAsset: amountInfo, - priceAsset: priceInfo - } - }; - }); - }); - } - - } - - return new SymbolInfoService(); - }; - - factory.$inject = ['waves', 'decorators']; - - angular.module('app.dex').factory('symbolInfoService', factory); -})(); diff --git a/src/modules/dex/templates/dex.html b/src/modules/dex/templates/dex.html deleted file mode 100644 index 1ceb79761c..0000000000 --- a/src/modules/dex/templates/dex.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/modules/fromBackup/controllers/FromBackupCtrl.js b/src/modules/fromBackup/controllers/FromBackupCtrl.js deleted file mode 100644 index 9d18ccdc63..0000000000 --- a/src/modules/fromBackup/controllers/FromBackupCtrl.js +++ /dev/null @@ -1,347 +0,0 @@ -(function () { - 'use strict'; - - const networkByte = (WavesApp.network.code || 'W').charCodeAt(0); - const { libs } = require('@waves/waves-transactions'); - - const getName = (names, name) => { - let index = 0; - - do { - name = `${name}_${index}`; - index++; - } while (names.includes(name)); - - return name; - }; - - /** - * @param {typeof Base} Base - * @param {ng.IScope} $scope - * @param {*} $state - * @param {User} user - * @param {app.utils} utils - * @param {INotification} notification - * @return {FromBackupCtrl} - */ - const controller = function (Base, $scope, $state, user, utils, notification) { - - const analytics = require('@waves/event-sender'); - - class FromBackupCtrl extends Base { - - /** - * @type {number} - */ - step = 0; - - /** - * @type {string} - */ - password = ''; - - /** - * @type {boolean} - */ - passwordError = false; - - /** - * @type {boolean} - */ - emptyError = false; - - /** - * @type {{}} - */ - checkedHash = {}; - - /** - * @type {{}} - */ - decryptedData = {}; - - /** - * @type {boolean} - */ - hasSelected = false; - - /** - * @type {boolean} - */ - selectIsVisible = true; - - /** - * @type {boolean} - */ - exportError = false; - - /** - * @type {Array} - */ - originalUsers = []; - - constructor() { - super($scope); - this.selectIsVisible = true; - analytics.send({ name: 'Import From Backup Click', target: 'ui' }); - } - - static parseUsers(data) { - const backup = JSON.parse(data); - - if (!backup || (backup.type !== 'wavesBackup' || !backup.lastOpenVersion)) { - throw new Error('wrongFile'); - } - - const dataObject = JSON.parse( - libs.crypto.bytesToString(libs.crypto.base64Decode(backup.data)) - ); - - const hashSum = dataObject.hashSum; - - delete dataObject.hashSum; - - const savedDataHash = libs.crypto.base58Encode( - libs.crypto.sha256(libs.crypto.stringToBytes(JSON.stringify(dataObject))) - ); - - if (savedDataHash !== hashSum) { - throw new Error('Fail is corrupted'); - } - - return { - ...dataObject, - type: backup.type, - lastOpenVersion: backup.lastOpenVersion - }; - } - - toggleSelect(address) { - this.checkedHash[address] = !this.checkedHash[address]; - this.onSelect(); - } - - onSelect() { - const total = (this.decryptedData.saveUsers || []).length; - const selected = Object.values(this.checkedHash).filter(Boolean).length; - this.hasSelected = !!selected; - this.selectIsVisible = total !== selected; - } - - selectAll() { - (this.decryptedData.saveUsers || []).forEach((user) => { - this.checkedHash[user.address] = true; - }); - this.onSelect(); - } - - unselectAll() { - (this.decryptedData.saveUsers || []).forEach((user) => { - this.checkedHash[user.address] = false; - }); - this.onSelect(); - } - - next() { - if (this.step === 0 && this.backup && this.backup.encrypted) { - user.getMultiAccountUsers().then(users => { - this.originalUsers = users; - this.password = ''; - this.step = 1; - utils.safeApply($scope); - }); - } else if (this.step === 0 && this.backup && !this.backup.encrypted) { - this.password = ''; - this.decryptedData = { ...this.backup }; - this.decryptedData.saveUsers = typeof this.decryptedData.saveUsers === 'string' ? - JSON.parse(this.decryptedData.saveUsers) : - this.decryptedData.saveUsers; - this.remapUsers(); - this.filterUsers(); - this.selectFirst(); - if (!this.emptyError) { - this.step = 2; - } else { - this.step = 0; - } - } else if (this.step === 1 && this.password) { - const saveUsers = this.decryptData(); - if (!this.passwordError) { - this.decryptedData = { - ...this.backup, - saveUsers - }; - this.remapUsers(); - this.filterUsers(); - this.selectFirst(); - if (!this.emptyError) { - this.step = 2; - } else { - this.step = 0; - } - } - } - } - - filterUsers() { - this.decryptedData.saveUsers = this.decryptedData.saveUsers || []; - const isDesktop = WavesApp.isDesktop(); - if (isDesktop) { - this.decryptedData.saveUsers = this.decryptedData.saveUsers - .filter((user) => user.userType !== 'wavesKeeper'); - } - - this.decryptedData.saveUsers = this.decryptedData.saveUsers - .filter((user) => user.networkByte === networkByte); - - if (!this.decryptedData.saveUsers || this.decryptedData.saveUsers.length === 0) { - this.emptyError = true; - } - } - - selectFirst() { - const user = (this.decryptedData.saveUsers || [])[0]; - if (!user) { - return; - } - this.checkedHash = { - [user.address]: true - }; - this.onSelect(); - } - - login(newUser) { - user.login(newUser); - notification.info({ - ns: 'app.ui', - title: { literal: 'importSuccess' } - }); - $state.go(user.getActiveState('wallet')); - } - - decryptData() { - try { - const data = { ...this.backup }; - const users = JSON.parse( - libs.crypto.decryptSeed(data.saveUsers, this.password, data.encryptionRounds) - ); - this.passwordError = !Array.isArray(users); - return users; - } catch (e) { - this.passwordError = true; - } - } - - $onDestroy() { - super.$onDestroy(); - } - - onFileChange(event) { - const reader = new FileReader(); - this.emptyError = false; - if (event.target.files && event.target.files.length > 0) { - const file = event.target.files[0]; - this.filename = file.name || ''; - reader.readAsDataURL(file); - - const userListPromise = user.getMultiAccountUsers().then(users => { - this.originalUsers = users; - }); - - const readerPromise = new Promise((resolve, reject) => { - reader.onload = resolve; - reader.onerror = reject; - }); - - Promise.all([userListPromise, readerPromise]).then( - () => { - const fileData = libs.crypto - .bytesToString(libs.crypto.base64Decode(reader.result.split(',')[1])); - - this.backup = FromBackupCtrl.parseUsers(fileData); - this.readError = null; - } - ).catch(() => { - this.readError = 'wrongFile'; - }).then(() => { - utils.safeApply($scope); - }); - - } - } - - remapUsers() { - const fromBackup = this.decryptedData.saveUsers || []; - const originalUsers = this.originalUsers.reduce((acc, user) => { - acc.names[user.name] = user; - acc.addresses[user.address] = user; - acc.publicKeys[user.publicKey] = user; - return acc; - }, { names: {}, addresses: {}, publicKeys: {} }); - - this.decryptedData.saveUsers = fromBackup.map( - (user) => { - const originalUser = originalUsers.addresses[user.address]; - if (originalUser) { - return null; - } - - if (originalUsers.names[user.name]) { - user.name = getName(Object.keys(originalUsers.names), user.name); - } - - return user; - } - ) - .filter(Boolean); - } - - onSubmit() { - const users = Object.entries(this.checkedHash) - .filter(item => item[1]) - .map( - ([address]) => this.decryptedData.saveUsers.find(user => user.address === address) - ); - const promises = []; - users.reduce( - (acc, newUser) => { - const userPromise = acc.then(() => user.addUser(newUser, true, true)); - promises.push(userPromise); - return userPromise; - }, - Promise.resolve() - ); - - Promise.all(promises) - .then(users => this.login(users[0])) - .catch(() => { - this.exportError = true; - }); - } - - } - - return new FromBackupCtrl(); - }; - - controller.$inject = ['Base', '$scope', '$state', 'user', 'utils', 'notification']; - - angular.module('app.fromBackup').controller('FromBackupCtrl', controller); - angular.module('app.fromBackup').directive('fileChange', ['$parse', function ($parse) { - - return { - require: 'ngModel', - restrict: 'A', - link: function ($scope, element, attrs) { - - const attrHandler = $parse(attrs.fileChange); - const handler = function (e) { - $scope.$apply(function () { - attrHandler($scope, { $event: e, files: e.target.files }); - }); - }; - element[0].addEventListener('change', handler, false); - } - }; - }]); -})(); diff --git a/src/modules/fromBackup/fromBackup.js b/src/modules/fromBackup/fromBackup.js deleted file mode 100644 index 22e110eec4..0000000000 --- a/src/modules/fromBackup/fromBackup.js +++ /dev/null @@ -1,5 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.fromBackup', []); -})(); diff --git a/src/modules/fromBackup/less/fromBackup.less b/src/modules/fromBackup/less/fromBackup.less deleted file mode 100644 index f782dca349..0000000000 --- a/src/modules/fromBackup/less/fromBackup.less +++ /dev/null @@ -1,168 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; -@import (reference) '../../app/less/app'; - -.fromBackup { - &__icon { - height: 80px; - width: 80px; - margin: 0 auto 30px; - background-size: 100% 100%; - - &_keystore { - background: @importBackupFile-icon; - } - - &_password { - background: @importBackupPassword-icon; - } - } - - input[type=file] { - opacity: 0; - position: absolute; - top: -6px; - left: 0; - bottom: 0; - width: 120px; - font-size: 0; - cursor: pointer; - } - - input[type=password], - input[type=text] { - margin-bottom: 0; - } - - &__input { - &-wrap { - display: flex; - align-items: center; - position: relative; - margin-bottom: 30px; - } - - &-btnWrap { - overflow: hidden; - margin-right: 10px; - position: relative; - } - - &-file { - background: @color-submit-100; - color: @color-submit-400; - padding: 9px 27px; - border-radius: @border-radius / 2; - display: block; - white-space: nowrap; - cursor: pointer; - } - } - - &__subtitle { - display: flex; - justify-content: space-between; - margin-bottom: 5px; - color: @color-basic-900; - } - - &__list { - overflow: hidden; - overflow-y: auto; - max-height: 230px; - - &-wrap { - background: @color-white; - border-radius: @border-radius; - overflow: hidden; - max-height: 240px; - padding: 5px; - border: 1px solid @color-basic-200; - margin-bottom: 30px; - } - - &::-webkit-scrollbar-track { - -webkit-box-shadow: none; - } - } - - &__user { - display: flex; - align-items: center; - justify-content: space-between; - padding: 9px 20px 9px 10px; - width: 100%; - cursor: pointer; - border-radius: @border-radius; - - &:hover { - background: @color-basic-50; - } - - &:first-child { - padding-top: 5px; - } - - &:last-child { - padding-bottom: 5px; - } - - &-content { - display: flex; - width: calc(100% ~"- 30px"); - overflow: hidden; - } - - &-info { - width: calc(100% ~"- 50px"); - } - - .checkbox-submit { - margin-right: 0; - } - } - - &__address { - color: @color-basic-500; - text-overflow: ellipsis; - width: 100%; - overflow: hidden; - } - - &__avatar { - margin-right: 10px; - } - - &__helper .help-icon__content { - width: 60%; - } - - &__errorPass { - position: absolute; - top: calc(100% ~"+ 5px"); - } -} - -@media screen and (max-width: 480px) { - .fromBackup { - &__icon { - margin-bottom: 15px; - } - - &__input { - &-wrap { - margin-bottom: 15px; - flex-wrap: wrap; - } - - &-file { - margin-bottom: 5px; - } - } - - &__errorPass { - top: 99%; - font-size: 11px; - } - } -} \ No newline at end of file diff --git a/src/modules/fromBackup/templates/fromBackup.html b/src/modules/fromBackup/templates/fromBackup.html deleted file mode 100644 index 3774006d5c..0000000000 --- a/src/modules/fromBackup/templates/fromBackup.html +++ /dev/null @@ -1,119 +0,0 @@ - - -
-
-
- - - -
-
-

-
-
- - -
-
-
- - -
- {{$ctrl.filename}} - - - -
- - - - - - - - -
-
-

-
-
- - -
- -
- - - - -
- - - - - - - - - - - -
-

-
-
- - -
- -
-
- - -
- -
-
-
-
- - - -
- -
-
-
- - -
- - - - - - -
-
-
- - diff --git a/src/modules/import/controllers/ImportCtrl.js b/src/modules/import/controllers/ImportCtrl.js deleted file mode 100644 index 30eaf48424..0000000000 --- a/src/modules/import/controllers/ImportCtrl.js +++ /dev/null @@ -1,30 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {typeof Base} Base - * @param {ng.IScope} $scope - * @param {User} user - * @return {ImportCtrl} - */ - const controller = function (Base, $scope, user) { - - class ImportCtrl extends Base { - - constructor() { - super($scope); - } - - backState() { - return user.getLastState(); - } - - } - - return new ImportCtrl(); - }; - - controller.$inject = ['Base', '$scope', 'user']; - - angular.module('app.import').controller('ImportCtrl', controller); -})(); diff --git a/src/modules/import/import.js b/src/modules/import/import.js deleted file mode 100644 index a8e554dfde..0000000000 --- a/src/modules/import/import.js +++ /dev/null @@ -1,5 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.import', []); -})(); diff --git a/src/modules/import/less/import-page.less b/src/modules/import/less/import-page.less deleted file mode 100644 index cea36b1055..0000000000 --- a/src/modules/import/less/import-page.less +++ /dev/null @@ -1,84 +0,0 @@ -@import (reference) 'config'; -@import (reference) '../../app/less/app'; - -.import-content-ledger { - .getStartedContentWidth(@getStartedContentPadding); - margin: auto; -} - -@media screen and (max-width: 480px) { - .import-content-ledger { - .import-modal__block, - .import-modal__block-w { - flex-direction: row; - display: flex; - } - - .import-modal__content { - text-align: left; - margin-left: 11px; - - &-title { // .import-modal__content-title - font-size: 13px; - margin-bottom: 0; - } - - &-text { - font-size: 12px; - line-height: 16px; - } - } - - .import-modal__icon { - margin: 0; - width: 42px; - height: 42px; - } - } - - .import-modal { - &__block { - flex-basis: 100%; - max-width: 100%; - width: 100%; - } - - w-help-icon { - .help-icon__content { - right: 0; - left: 0; - width: 100%; - } - } - } -} - -@media screen and (min-width: 480px) { - .import-content-ledger { - .getStartedContentWidthDesktop(); - - .import-modal { - &__block { - margin: 0 0 10px 0; - padding: 20px 10px 20px 20px; - width: 100%; - display: flex; - align-items: center; - min-height: 80px; - } - } - } - - .import-footer { - max-width: @getStartedContentWidth; - margin: auto; - text-align: center; - } -} - -.import-content-ledger { - w-web-only.import-modal__block > div { - display: flex; - align-items: center; - } -} \ No newline at end of file diff --git a/src/modules/import/templates/import.html b/src/modules/import/templates/import.html deleted file mode 100644 index c5e88543bc..0000000000 --- a/src/modules/import/templates/import.html +++ /dev/null @@ -1,58 +0,0 @@ - - -
-
-
-
-
- -
- -
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
- -
-
-
-
-
-
-
- - -
-
-
-
-
- -
- -
- -
-
-
-
- - diff --git a/src/modules/keeper/controllers/KeeperCtrl.js b/src/modules/keeper/controllers/KeeperCtrl.js deleted file mode 100644 index f917bcf702..0000000000 --- a/src/modules/keeper/controllers/KeeperCtrl.js +++ /dev/null @@ -1,245 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {typeof Base} Base - * @param {ng.IScope} $scope - * @param {*} $state - * @param {User} user - * @param {app.utils} utils - * @return {KeeperCtrl} - */ - const controller = function (Base, $scope, $state, user, utils) { - - const signatureAdapter = require('@waves/signature-adapter'); - const analytics = require('@waves/event-sender'); - - class KeeperCtrl extends Base { - - /** - * @type {boolean} - */ - isInit = false; - /** - * @type {boolean} - */ - noKeeper = false; - /** - * @type {boolean} - */ - noKeeperPermission = false; - /** - * @type {boolean} - */ - noKeeperAccounts = false; - /** - * @type {boolean} - */ - incorrectKeeperNetwork = false; - /** - * @type {boolean} - */ - lockedKeeper = false; - /** - * @type {WavesKeeperAdapter} - */ - adapter = signatureAdapter.WavesKeeperAdapter; - /** - * @type {boolean} - */ - loading = false; - /** - * @type {boolean} - */ - error = false; - /** - * @type {user} - */ - selectedUser = Object.create(null); - /** - * @type {boolean} - */ - saveUserData = true; - /** - * @type {string} - */ - name = ''; - /** - * @type {boolean} - */ - isPriorityUserTypeExists = false; - /** - * @type {object | null} - */ - userExisted = Object.create(null); - /** - * @type {Array} - * @private - */ - _usersInStorage = []; - /** - * @type {string} - * @private - */ - _type = 'wavesKeeper'; - /** - * @type {object} - * @private - */ - _priorityMap = utils.getImportPriorityMap(); - - constructor() { - super($scope); - - this.observe('selectedUser', this._onSelectUser); - this.adapter.onUpdate(this._onUpdateAdapter); - - Promise.all([ - user.getFilteredUserList(), - user.getMultiAccountUsers() - ]).then(([legacyUsers = [], users = []]) => { - this._usersInStorage = [...legacyUsers, ...users]; - }); - analytics.send({ name: 'Import Keeper Click', target: 'ui' }); - this.getUsers(); - } - - $onDestroy() { - super.$onDestroy(); - this.adapter.offUpdate(this._onUpdateAdapter); - } - - /** - * @return {Promise} - */ - isAvilableAdapter() { - return this.adapter.isAvailable(); - } - - onError(error) { - - const { code } = error; - - switch (code) { - case 0: - this.noKeeper = true; - break; - case 1: - this.noKeeperPermission = true; - break; - case 2: - this.noKeeperAccounts = true; - break; - case 3: - this.incorrectKeeperNetwork = true; - break; - case 'locked': - this.lockedKeeper = true; - break; - default: - } - - this.error = true; - } - - onUpdateState() { - if (this.loading) { - return; - } - clearTimeout(this._time); - this._time = setTimeout(() => this.getUsers(), 500); - } - - /** - * @return {void} - */ - getUsers() { - this.loading = true; - this.error = false; - this.noKeeper = false; - this.noKeeperPermission = false; - this.noKeeperAccounts = false; - this.incorrectKeeperNetwork = false; - this.lockedKeeper = false; - - this.isAvilableAdapter() - .then(() => this.adapter.getUserList()) - .then(([user]) => { - if (!user) { - return Promise.reject({ code: 'locked' }); - } - this.selectedUser = user; - this.receive(utils.observe(this.selectedUser, 'name'), this._onChangeName, this); - delete this.selectedUser.type; - }) - .catch((e) => this.onError(e)) - .finally(() => { - this.isInit = true; - this.loading = false; - $scope.$apply(); - this._onSelectUser(); - }); - } - - /** - * @return {void} - */ - login() { - const newUser = { - ...this.selectedUser, - userType: this.adapter.type, - networkByte: WavesApp.network.code.charCodeAt(0) - }; - - return user.create(newUser, true, true).then(() => { - $state.go(user.getActiveState('wallet')); - }).catch(() => { - this.error = true; - $scope.$digest(); - }); - } - - /** - * @private - */ - _onSelectUser() { - this._onChangeAddress(); - this._onChangeName(); - } - - /** - * @private - */ - _onChangeAddress() { - this.userExisted = - this._usersInStorage.find(user => user.address === this.selectedUser.address) || - null; - this.isPriorityUserTypeExists = - !!this.userExisted && - this._priorityMap[this._type] <= this._priorityMap[this.userExisted.userType]; - } - - /** - * @private - */ - _onChangeName() { - const isUnique = this._usersInStorage.some(user => { - return user.name === this.selectedUser.name && user.address !== this.selectedUser.address; - }); - - if (this.importForm) { - this.importForm.userName.$setValidity('isUnique', !isUnique); - } - } - - _onUpdateAdapter = (state) => this.onUpdateState(state); - - } - - return new KeeperCtrl(); - }; - - controller.$inject = ['Base', '$scope', '$state', 'user', 'utils']; - - angular.module('app.keeper').controller('KeeperCtrl', controller); -})(); diff --git a/src/modules/keeper/keeper.js b/src/modules/keeper/keeper.js deleted file mode 100644 index 2fb1d85f7f..0000000000 --- a/src/modules/keeper/keeper.js +++ /dev/null @@ -1,5 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.keeper', []); -})(); diff --git a/src/modules/keeper/less/keeper.less b/src/modules/keeper/less/keeper.less deleted file mode 100644 index fe601d883a..0000000000 --- a/src/modules/keeper/less/keeper.less +++ /dev/null @@ -1,30 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; -@import (reference) '../../app/less/app'; - -body.keeper { - .address { - align-items: center; - } - .avatar { - margin-right: 10px; - } - - .error-icon, - .keeper-icon { - height: 80px; - width: 80px; - margin: 0 auto 30px auto; - background-repeat: no-repeat; - background-position: center center; - background-size: contain; - } - - .keeper-icon { - background-image: @keeper-icon; - } - - .error-icon { - background-image: @error-circle-icon; - } -} \ No newline at end of file diff --git a/src/modules/keeper/templates/keeper.html b/src/modules/keeper/templates/keeper.html deleted file mode 100644 index c5803f0812..0000000000 --- a/src/modules/keeper/templates/keeper.html +++ /dev/null @@ -1,125 +0,0 @@ - -
-
-
-
-
-
- -
- -
-

- -
- -
- -
-

-
-
-
- - - -
-
-
- -
-
- -
-
-
-
-
- -
- -

-
- - -
-
- -
- -

-
- -
-
-
- - - -
-
- -
-
- -
-
-
- -
- -

-
- - -
-
-
- -
- -
-
- -
{{$ctrl.selectedUser.address}}
-
- -
-
-
- - - - - - - -
-
- -
-
- - - -
- -
- -
-
-
- - diff --git a/src/modules/ledger/controllers/LedgerCtrl.js b/src/modules/ledger/controllers/LedgerCtrl.js deleted file mode 100644 index 4c0d325bc4..0000000000 --- a/src/modules/ledger/controllers/LedgerCtrl.js +++ /dev/null @@ -1,419 +0,0 @@ -(function () { - 'use strict'; - - const signatureAdapter = require('@waves/signature-adapter'); - - const USERS_COUNT = 5; - const PRELOAD_USERS_COUNT = 5; - const MAX_USER_COUNT = 2147483647; - - /** - * @param {typeof Base} Base - * @param {ng.IScope} $scope - * @param {*} $state - * @param {User} user - * @param {ModalManager} modalManager - * @param {app.utils} utils - * @return {LedgerCtrl} - */ - const controller = function (Base, $scope, $state, user, modalManager, utils) { - - const analytics = require('@waves/event-sender'); - - class LedgerCtrl extends Base { - - constructor() { - super($scope); - /** - * @type {LedgerAdapter} - */ - this.adapter = signatureAdapter.LedgerAdapter; - /** - * @type {boolean} - */ - this.loading = false; - /** - * @type {boolean} - */ - this.error = false; - /** - * @type {Array} - */ - this.visibleUsers = []; - /** - * @type {null} - */ - this.selectedUser = null; - /** - * @type {number} - */ - this.offset = 0; - /** - * @type {boolean} - */ - this.isInit = false; - /** - * @type {boolean} - */ - this.disabledLogin = true; - /** - * @type {boolean} - */ - this.disabledRight = true; - /** - * @type {boolean} - */ - this.disabledLeft = true; - /** - * @type {boolean} - */ - this.selectDefault = false; - /** - * @type {boolean} - */ - this.saveUserData = true; - /** - * @type {string} - */ - this.id = ''; - /** - * @type {string} - */ - this.name = ''; - /** - * @type {string} - * @private - */ - this._runLedgerCommand = ''; - /** - * @type {Object} - * @private - */ - this._users = {}; - /** - * @type {Array} - * @private - */ - this._usersInStorage = []; - /** - * @type {boolean} - */ - this.isPriorityUserTypeExists = false; - /** - * @type {string} - * @private - */ - this._type = 'ledger'; - /** - * @type {object | null} - */ - this.userExisted = Object.create(null); - /** - * @type {object} - * @private - */ - this._priorityMap = utils.getImportPriorityMap(); - - Promise.all([ - user.getFilteredUserList(), - user.getMultiAccountUsers() - ]).then(([legacyUsers = [], users = []]) => { - this._usersInStorage = [...legacyUsers, ...users]; - }); - - this.observe('selectDefault', this._onChangeSelectDefault); - this.getUsers(PRELOAD_USERS_COUNT); - this.observe('selectedUser', this._onSelectUser); - this.observe('name', this._onChangeName); - analytics.send({ name: 'Import Ledger Click', target: 'ui' }); - } - - /** - * @param {number} count - * @return {Promise} - */ - getUsers(count) { - this._runLedgerCommand = 'getUsers'; - this.loading = true; - this.error = false; - - const countUsers = (count || USERS_COUNT) - 1; - const promise = utils.timeoutPromise(this.adapter.getUserList(this.offset, countUsers), 25000); - - const modalPromise = this.isInit ? - Promise.resolve() : - modalManager.showLoginByDevice(promise, this.adapter.type); - - return Promise.all([promise, modalPromise]) - .then(([users]) => { - this.isInit = true; - this.loading = false; - this.error = false; - - (users || []).forEach(curUser => { - this._users[curUser.id] = curUser; - }); - - this.showVisibleUsers(); - this.selectUser(); - $scope.$digest(); - }) - .catch((err = {}) => { - const error = { ...err, count }; - this.loading = false; - this.error = error; - - if (err instanceof RangeError) { - this.offset = 0; - this.id = ''; - } - - $scope.$digest(); - throw error; - }); - } - - /** - * {void} - */ - retryGetUsers() { - this[this._runLedgerCommand](this.error && this.error.count); - } - - /** - * @param [user] - * @param user.id - * @param user.path - * @param user.address - * @param user.publicKey - * @return {null} - */ - selectUser(user) { - if (this.selectDefault) { - return null; - } - - if (!user && !this.selectedUser && this._users[0]) { - this.selectedUser = this._users[0]; - } else if (user) { - this.selectedUser = user; - } - - this._calculateDisabled(); - - } - - /** - * @return {void} - */ - stepLeft() { - if (this.selectDefault || this.disabledLeft) { - return; - } - - this.offset = this._normalizeOffset(this.offset - USERS_COUNT); - - if (this._hasUsersInCache(this.offset, this.offset + USERS_COUNT - 1)) { - this.showVisibleUsers(); - } else { - if (this.loading) { - return; - } - - this.getUsers(); - } - - this._calculateDisabled(); - } - - /** - * @return {void} - */ - stepRight() { - if (this.selectDefault || this.disabledRight) { - return; - } - - this.offset = this._normalizeOffset(this.offset + USERS_COUNT); - - if (this._hasUsersInCache(this.offset, this.offset + USERS_COUNT - 1)) { - this.showVisibleUsers(); - } else { - if (this.loading) { - return; - } - - this.getUsers(); - } - - this._calculateDisabled(); - } - - /** - * {void} - */ - showVisibleUsers() { - const tmp = []; - - for (let i = this.offset; i < this.offset + USERS_COUNT; i++) { - tmp.push(this._users[i]); - } - - this.visibleUsers = tmp; - } - - /** - * @return {void} - */ - login() { - this._runLedgerCommand = 'login'; - - const newUser = { - ...this.selectedUser, - userType: this.adapter.type, - name: this.name, - networkByte: WavesApp.network.code.charCodeAt(0) - }; - - this._calculateDisabled(true); - - return user.create(newUser, true, true).then(() => { - $state.go(user.getActiveState('wallet')); - }).catch(() => { - this.error = true; - $scope.$digest(); - }); - } - - /** - * @param {number} index - * @return {boolean} - */ - isUserDisable(index) { - return index !== 0 && this.selectDefault; - } - - /** - * @public - */ - onChangeId() { - let id = parseInt(this.selectDefault ? this.selectedUser.id : this.id, 10); - - if (isNaN(id) || id < 0) { - id = 0; - } - - if (id > MAX_USER_COUNT) { - id = MAX_USER_COUNT; - } - - this.id = String(id); - - this.offset = this._normalizeOffset(id - Math.floor(USERS_COUNT / 2)); - - if (this._hasUsersInCache(this.offset, this.offset + USERS_COUNT - 1)) { - this.showVisibleUsers(); - this.selectUser(this._users[id]); - } else { - this.getUsers().then(() => { - this.selectUser(this._users[id]); - }); - } - } - - _calculateDisabled(disable) { - this.disabledLogin = ( - disable || - this.loading || - !this.selectedUser - ); - - this.disabledRight = ( - disable || - this.selectDefault || - this.loading || - this.offset === MAX_USER_COUNT - (USERS_COUNT - 1) - ); - - this.disabledLeft = ( - disable || - this.selectDefault || - this.loading || - this.offset === 0 - ); - } - - _onChangeSelectDefault() { - if (this.selectDefault) { - this.offset = 0; - this.selectedUser = this._users[0]; - this.id = this.selectedUser.id; - } - - this._calculateDisabled(); - this.showVisibleUsers(); - } - - /** - * @private - */ - _onSelectUser() { - this.id = this.selectedUser.id; - this.userExisted = - this._usersInStorage.find(user => user.address === this.selectedUser.address) || - null; - this.isPriorityUserTypeExists = - !!this.userExisted && - this._priorityMap[this._type] <= this._priorityMap[this.userExisted.userType]; - } - - /** - * @private - */ - _onChangeName() { - const isUnique = this._usersInStorage.some(user => { - return user.name === this.name && user.address !== this.selectedUser.address; - }); - this.importForm.userName.$setValidity('isUnique', !isUnique); - } - - /** - * @private - * @param {number} from - * @param {number} to - */ - _hasUsersInCache(from, to) { - for (let i = from; i <= to; i++) { - if (!this._users[i]) { - return false; - } - } - - return true; - } - - /** - * @private - * @param {number} offset - */ - _normalizeOffset(offset) { - if (offset > MAX_USER_COUNT - (USERS_COUNT - 1)) { - return MAX_USER_COUNT - (USERS_COUNT - 1); - } - - if (offset < 0) { - return 0; - } - - return offset; - } - - } - - return new LedgerCtrl(); - }; - - controller.$inject = ['Base', '$scope', '$state', 'user', 'modalManager', 'utils']; - - angular.module('app.ledger').controller('LedgerCtrl', controller); -})(); diff --git a/src/modules/ledger/ledger.js b/src/modules/ledger/ledger.js deleted file mode 100644 index 74864d4449..0000000000 --- a/src/modules/ledger/ledger.js +++ /dev/null @@ -1,5 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.ledger', []); -})(); diff --git a/src/modules/ledger/less/ledger.less b/src/modules/ledger/less/ledger.less deleted file mode 100644 index 0821f36618..0000000000 --- a/src/modules/ledger/less/ledger.less +++ /dev/null @@ -1,97 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; -@import (reference) '../../app/less/app'; - -body.ledger { - .import-wrapper { - .step { - &-left, - &-right { - position: relative; - } - } - - .icon { - &-left, - &-right { - height: 18px; - width: 18px; - cursor: pointer; - position: absolute; - top: 44px; - } - - &-left { - background: @arrow-left-icon; - left: -20px; - } - - &-right { - background: @arrow-right-icon; - right: -20px; - } - } - - .step-left.disabled .icon-left, - .step-right.disabled .icon-right { - cursor: default; - opacity: 0.3; - } - - .input-like { - background: @color-basic-50; - } - } - - .loader-error-wrapper { - display: flex; - flex-direction: column; - align-items: center; - } - - .loader-wrapper { - position: relative; - top: 50%; - width: 100px; - margin: 0 auto; - height: 107px; - transform: translate(0); - left: 0; - .loader { - margin-top:2px; - } - } -} - -.ledger__checkbox { - margin: 20px 0 30px; -} - -@media screen and (max-width: 480px) { - body.ledger { - .import-wrapper { - .icon { - &-left, - &-right { - top: 34px; - } - - &-left { - left: -15px; - } - - &-right { - right: -15px; - } - } - } - - .loader-wrapper { - height: 87px; - } - } - - .ledger__checkbox { - margin: 15px 0 20px; - } -} \ No newline at end of file diff --git a/src/modules/ledger/templates/ledger.html b/src/modules/ledger/templates/ledger.html deleted file mode 100644 index f8c24ab760..0000000000 --- a/src/modules/ledger/templates/ledger.html +++ /dev/null @@ -1,147 +0,0 @@ - - -
-
-
- -
-
- -

- -
-
- -
-
- - -
-
- -
-
- - - -
-
- -
-
- -
-
-
- -
-
-
-
-
-
-
-
-
- -
-
- -
-
- -
- -
-
-
-
-
- {{$ctrl.selectedUser.address}} -
-
- -
-
-
-
- - -
- -
- - - - - -
- -
- - - -
- -
-
- - - - - - - - -
-
-
- -
- - - - - -
-
-
-
- - diff --git a/src/modules/migrate/controllers/MigrateCtrl.js b/src/modules/migrate/controllers/MigrateCtrl.js deleted file mode 100644 index 4757fa0b3a..0000000000 --- a/src/modules/migrate/controllers/MigrateCtrl.js +++ /dev/null @@ -1,214 +0,0 @@ -(() => { - 'use strict'; - - const analytics = require('@waves/event-sender'); - const ds = require('data-service'); - const { libs } = require('@waves/waves-transactions'); - const { base58Decode } = libs.crypto; - - /** - * @param {typeof Base} Base - * @param {ng.IScope} $scope - * @param {*} $state - * @param {MultiAccount} multiAccount - * @param {User} user - * @return {SignUpCtrl} - */ - const controller = function (Base, $scope, $state, multiAccount, user) { - - class MigrateCtrl extends Base { - - migrateForm = null; - migratePassword = ''; - activeStep = 0; - userListLocked = []; - userListUnlocked = []; - userToMigrate = null; - showPasswordError = false; - - constructor() { - super($scope); - - Promise.all([ - user.getFilteredUserList(), - user.getMultiAccountUsers() - ]).then(([userList, multiAccountUsers]) => { - const { id } = $state.params; - this.activeStep = userList && userList.length ? 0 : 1; - this.userListLocked = userList; - this.userListUnlocked = multiAccountUsers; - - const migrateWithoutPass = userList.filter(lockedUser => ( - lockedUser.userType && - lockedUser.userType !== 'seed' && - lockedUser.userType !== 'privateKey' - )); - - this.migrateUsersWithoutPassword(migrateWithoutPass).then(() => { - if (id) { - - const autoMigrate = migrateWithoutPass.length && - migrateWithoutPass.some(user => multiAccount.hash(user.address) === id); - - if (autoMigrate) { - this.prevStep(); - return null; - } - - const lockedUserByHash = this.userListLocked.find(lockedUser => ( - multiAccount.hash(lockedUser.address) === id - )); - - if (lockedUserByHash) { - this.startMigrate(lockedUserByHash); - } - } - }); - }); - } - - nextStep() { - this.activeStep += 1; - } - - prevStep() { - const { id } = $state.params; - - if (id) { - user.getMultiAccountUsers().then((mUsers = []) => { - const userToLogin = mUsers.find(mUser => ( - multiAccount.hash(mUser.address) === id - )); - - if (userToLogin) { - user.login(userToLogin); - } - - $state.go(user.getActiveState('wallet')); - }); - } else { - this.activeStep -= 1; - } - } - - startMigrate(userToMigrate) { - this.userToMigrate = userToMigrate; - this.nextStep(); - } - - migrateUser(userData) { - return multiAccount.addUser(userData) - .then(data => Promise.all([ - user.saveMultiAccount(data), - user.migrateUser(this.userToMigrate, data.userHash) - ])) - .then(() => user.getMultiAccountUsers()) - .then(multiAccountUsers => { - this.userListLocked = this.userListLocked.filter(lockedUser => ( - lockedUser.address !== this.userToMigrate.address - )); - - this.userListUnlocked = multiAccountUsers; - this.userToMigrate = null; - }); - } - - async migrateUsersWithoutPassword(usersWithoutPassword) { - for (const legacyUser of usersWithoutPassword) { - const { userType, id, publicKey, address } = legacyUser; - const networkByte = base58Decode(address)[1]; - - this.userToMigrate = legacyUser; - - // eslint-disable-next-line no-await-in-loop - await this.migrateUser({ - userType, - networkByte, - id, - publicKey - }); - } - } - - checkSeed(seed, publicKey) { - return publicKey === libs.crypto.publicKey(seed); - } - - checkPK(privateKey, publicKey) { - return libs.crypto.publicKey({ privateKey }) === publicKey; - } - - onSubmit() { - try { - this._hidePasswordError(); - - const { id, publicKey, address, settings = {} } = this.userToMigrate; - const encryptionRounds = settings.encryptionRounds || 5000; - const userType = userType || 'seed'; - const networkByte = base58Decode(address)[1]; - const seed = userType === 'seed' ? - ds.Seed.decryptSeedPhrase( - this.userToMigrate.encryptedSeed, - this.migratePassword, - encryptionRounds - ) : - undefined; - const privateKey = userType === 'privateKey' ? - ds.Seed.decryptSeedPhrase( - this.userToMigrate.encryptedPrivateKey, - this.migratePassword - ) : - undefined; - - if (seed && !this.checkSeed(seed, publicKey)) { - throw new Error('Incorrect seed'); - } - - if (privateKey && !this.checkPK(privateKey, publicKey)) { - throw new Error('Incorrect private key'); - } - - this.migrateUser({ - userType, - networkByte, - seed, - id, - privateKey, - publicKey - }).then(() => { - this.migratePassword = ''; - this.prevStep(); - analytics.send({ name: 'Successfully Unlocked' }); - }); - } catch (e) { - this._showPasswordError(); - analytics.send({ name: 'Failed Unlock' }); - } - } - - finish() { - const [firstUser] = this.userListUnlocked; - - user.login(firstUser).then(() => { - $state.go(user.getActiveState('wallet')); - }); - } - - _showPasswordError() { - this.migratePassword = ''; - this.showPasswordError = true; - } - - _hidePasswordError() { - this.showPasswordError = false; - } - - } - - return new MigrateCtrl(); - }; - - controller.$inject = ['Base', '$scope', '$state', 'multiAccount', 'user']; - - angular.module('app.migrate').controller('MigrateCtrl', controller); -})(); diff --git a/src/modules/migrate/migrate.less b/src/modules/migrate/migrate.less deleted file mode 100644 index a6496af7c9..0000000000 --- a/src/modules/migrate/migrate.less +++ /dev/null @@ -1,79 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; -@import (reference) "../app/less/app-icons"; -@import (reference) '../app/less/typography'; - -.migrate { - &__account { - width: 400px; - height: 54px; - padding: 8px 20px; - display: flex; - align-items: center; - border-radius: @border-radius; - background: @color-white; - box-shadow: 0 1px 4px 0 rgba(58,78,136,.1); - cursor: pointer; - margin-bottom: 10px; - - @media screen and (max-width: 860px) { - width: 100%; - height: 42px; - padding: 5px 12px; - } - - &-info { - flex: 1; - } - - &-address { - color: @color-basic-500; - } - } - - &__avatar { - display: block; - - @media screen and (max-width: 860px) { - transform: scale(.85); - } - - &-container { - height: 30px; - width: 30px; - margin-right: 10px; - } - } - - &__icon { - &-lock { - background-image: @migrate-lock-icon; - } - - &-unlock { - background-image: @migrate-success-icon; - } - } - - &__subtitle { - margin-bottom: 5px; - color: @color-basic-700; - } - - &__list_unlocked { - .migrate__account { - background: transparent; - border: 1px solid @color-basic-200; - box-shadow: none; - cursor: default; - } - - .migrate__subtitle { - margin-top: -10px; - - @media screen and (max-width: 860px) { - margin-top: 0; - } - } - } -} \ No newline at end of file diff --git a/src/modules/migrate/templates/migrate.html b/src/modules/migrate/templates/migrate.html deleted file mode 100644 index d04c299eb4..0000000000 --- a/src/modules/migrate/templates/migrate.html +++ /dev/null @@ -1,127 +0,0 @@ - - -
- -
- - -
-
- -
- -
- -
-
- -
-
- -
- - -
- -
-
- -
- - -
- - -
- - - - - - -
-
- -
- -
- - -
-
- -
- -
- -
- - - - - -
- -
- - - - - - - - - - -
- -
- - -
-
- - diff --git a/src/modules/restore/controllers/RestoreCtrl.js b/src/modules/restore/controllers/RestoreCtrl.js deleted file mode 100644 index 50ec117753..0000000000 --- a/src/modules/restore/controllers/RestoreCtrl.js +++ /dev/null @@ -1,295 +0,0 @@ -(function () { - 'use strict'; - - const analytics = require('@waves/event-sender'); - const { validators, libs } = require('@waves/waves-transactions'); - const { isPublicKey } = validators; - const { address, publicKey, base58Decode } = libs.crypto; - const TABS = { - seed: 'seed', - encodedSeed: 'encodedSeed', - key: 'key' - }; - - /** - * @param Base - * @param {ng.IScope} $scope - * @param {*} $state - * @param {User} user - * @param {app.utils} utils - * @param {ModalManager} modalManager - * @return {RestoreCtrl} - */ - const controller = function (Base, $scope, $state, user, utils, modalManager) { - - class RestoreCtrl extends Base { - - constructor() { - super($scope); - $scope.TABS = TABS; - - this.seedForm = null; - this.encodedSeedForm = null; - this.keyForm = null; - /** - * @type {string} - */ - this.seed = ''; - /** - * @type {string} - */ - this.encodedSeed = ''; - /** - * @type {string} - */ - this.key = ''; - /** - * @type {string} - */ - this.address = ''; - /** - * @type {string} - */ - this.name = ''; - /** - * @type {boolean} - */ - this.saveUserData = true; - /** - * @type {number} - */ - this.activeStep = 0; - /** - * @type {string[]} - */ - this.tabs = Object.values(TABS); - /** - * @type {string} - */ - this.activeTab = TABS.seed; - /** - * @type {boolean} - */ - this.isPriorityUserTypeExists = false; - /** - * @type {object | null} - */ - this.userExisted = Object.create(null); - /** - * @type {Array} - * @private - */ - this._usersInStorage = []; - /** - * @type {object} - * @private - */ - this._priorityMap = utils.getImportPriorityMap(); - - Promise.all([ - user.getFilteredUserList(), - user.getMultiAccountUsers() - ]).then(([legacyUsers = [], users = []]) => { - this._usersInStorage = [...legacyUsers, ...users]; - }); - - this._setFormObservers(); - - this.observe('address', this._onChangeAddress); - this.observe('activeTab', this._onChangeActiveTab); - } - - showTutorialModals() { - return modalManager.showTutorialModals(); - } - - restore() { - if (this.saveUserData) { - analytics.send({ name: 'Import Backup Protect Your Account Continue Click', target: 'ui' }); - } - - const { keyOrSeed, type } = this._getEncryptedAndType(); - - const newUser = { - userType: type, - name: this.name, - networkByte: WavesApp.network.code.charCodeAt(0), - ...keyOrSeed - }; - - return user.create(newUser, true, true).then(() => { - $state.go(user.getActiveState('wallet')); - }); - } - - resetNameAndPassword() { - this.name = ''; - this.password = ''; - } - - nextStep() { - analytics.send({ - name: 'Import Backup Continue Click', - params: { guestMode: !this.saveUserData }, - target: 'ui' - }); - if (!this.saveUserData) { - return this.restore(); - } - this.activeStep++; - analytics.send({ name: 'Import Backup Protect Your Account Show', target: 'ui' }); - } - - importAccounts() { - return modalManager.showImportAccountsModal(); - } - - /** - * @param {string} tab - */ - setActiveTab(tab) { - this.activeTab = tab; - } - - /** - * @private - */ - _setFormObservers() { - this.observe('seed', this._onChangeSeed); - this.observeOnce('seedForm', () => { - this.receive(utils.observe(this.seedForm, '$valid'), () => { - if (this.activeTab === TABS.seed) { - this._onChangeSeed(); - } - }); - }); - - this.observe('encodedSeed', this._onChangeEncodedSeed); - this.observeOnce('encodedSeedForm', () => { - this.receive(utils.observe(this.encodedSeedForm, '$valid'), () => { - if (this.activeTab === TABS.encodedSeed) { - this._onChangeEncodedSeed(); - } - }); - }); - - this.observe('key', this._onChangeKey); - this.observeOnce('keyForm', () => { - this.receive(utils.observe(this.keyForm, '$valid'), () => { - if (this.activeTab === TABS.key) { - this._onChangeKey(); - } - }); - }); - } - - /** - * @private - */ - _onChangeSeed() { - if (this.seedForm.$valid) { - this.address = new ds.Seed(this.seed, window.WavesApp.network.code).address; - } else { - this.address = ''; - } - } - - /** - * @private - */ - _onChangeEncodedSeed() { - if (this.encodedSeedForm.$valid && RestoreCtrl._isEncoded(this.encodedSeed)) { - try { - this.address = new ds.Seed(base58Decode(this.encodedSeed), WavesApp.network.code).address; - } catch (e) { - this.address = ''; - } - } else { - this.address = ''; - } - } - - /** - * @private - */ - _onChangeAddress() { - this.userExisted = this._usersInStorage.find(user => user.address === this.address) || null; - this.isPriorityUserTypeExists = - !!this.userExisted && - this._priorityMap[this.activeTab] <= this._priorityMap[this.userExisted.userType]; - } - - /** - * @private - */ - _onChangeKey() { - if (this.keyForm.$valid && isPublicKey(this.key)) { - const pubKey = publicKey({ privateKey: this.key }); - this.address = address({ publicKey: pubKey }, window.WavesApp.network.code); - } else { - this.address = ''; - } - } - - /** - * @private - */ - _onChangeActiveTab() { - const tab = this.activeTab[0].toUpperCase() + this.activeTab.substring(1); - this[`_onChange${tab}`](); - } - - /** - * @return {{keyOrSeed: {seed: string}, type: string}| - * {keyOrSeed: {encodedSeed: string}, type: string}| - * {keyOrSeed: {privateKey: string}, type: string}} - * @private - */ - _getEncryptedAndType() { - switch (this.activeTab) { - case TABS.key: - return ({ - keyOrSeed: { - privateKey: this.key - }, - type: 'privateKey' - }); - case TABS.encodedSeed: - return ({ - keyOrSeed: { - seed: `base58:${this.encodedSeed}`, - publicKey: publicKey(base58Decode(this.encodedSeed)) - }, - type: 'seed' - }); - default: - return ({ - keyOrSeed: { - seed: this.seed - }, - type: 'seed' - }); - } - } - - /** - * @private - * @param seed - */ - static _isEncoded(seed) { - try { - return !!base58Decode(seed); - } catch (e) { - return false; - } - } - - } - - return new RestoreCtrl(); - }; - - controller.$inject = ['Base', '$scope', '$state', 'user', 'utils', 'modalManager']; - - angular.module('app.restore').controller('RestoreCtrl', controller); -})(); diff --git a/src/modules/restore/less/restore.less b/src/modules/restore/less/restore.less deleted file mode 100644 index ccceca5196..0000000000 --- a/src/modules/restore/less/restore.less +++ /dev/null @@ -1,171 +0,0 @@ -@import (reference) 'config'; -@import (reference) '../../app/less/app'; - -body.restore { - .restore-content { - .seed-block { - border-radius: @border-radius; - border: 1px solid @color-basic-200; - - w-input textarea { - border-radius: @border-radius; - border: none; - padding: 16px; - min-height: 86px; - max-height: 150px; - resize: vertical; - } - - .address { - &-block { - width: calc(100% ~'- 45px'); - - .address { - overflow: hidden; - text-overflow: ellipsis; - font-size: 15px; - - &.empty { - position: relative; - top: 3px; - height: 8px; - border-radius: 100px; - background-color: @color-basic-100; - } - } - - &-avatar { // .address-block-avatar - margin-right: 10px; - width: 36px; - height: 36px; - } - } - - &-block-info { - background-color: @color-basic-50; - border-top: 1px solid @color-basic-200; - height: 76px; - display: flex; - flex-direction: row; - align-items: center; - padding: 0 14px; - } - } - - .avatar-fake { - width: 36px; - height: 36px; - border-radius: 100%; - background-color: @color-basic-100; - flex-shrink: 0; - margin-right: 10px; - } - } - - .avatar__wrap { - width: 100% !important; - height: 100% !important; - } - - &__checkbox { - margin: 20px 0 30px; - } - - .restore-selects { - display: none; - } - } - - .tab { - display: flex; - margin: 0 auto 20px; - - &__item { - height: 42px; - .body-2; - color: @color-basic-700; - cursor: pointer; - padding: 0 10px; - align-items: center; - justify-content: center; - display: inline-flex; - flex: 1 0; - white-space: nowrap; - border: 1px solid @color-basic-200; - margin-right: -1px; - transition: background 0.5s; - - &:first-child { - border-top-left-radius: @border-radius; - border-bottom-left-radius: @border-radius; - } - - &:last-child { - border-top-right-radius: @border-radius; - border-bottom-right-radius: @border-radius; - margin-right: 0; - } - - &.active { - background-color: @color-white; - color: @color-submit-400; - } - } - } -} - -@media screen and (max-width: 768px) { - body.restore { - .restore-content { - .seed-block { - w-input textarea { - padding: @padding-control-big-responsive-horizontal; - } - - .avatar-fake { - width: 32px; - height: 32px; - } - - .address-block { - .address { - &.empty { - height: 6px; - } - } - - &-avatar { - width: 32px; - height: 32px; - } - } - - .address-block-info { - height: 67px; - } - } - - &__checkbox { - margin: 15px 0 30px; - } - } - } -} - -@media screen and (max-width: 480px) { - body.restore { - .restore-content { - .restore-tabs { - display: none; - } - - .restore-selects { - display: block; - - .select__title { - height: 42px; - } - } - } - } -} \ No newline at end of file diff --git a/src/modules/restore/restore.js b/src/modules/restore/restore.js deleted file mode 100644 index ded15bc706..0000000000 --- a/src/modules/restore/restore.js +++ /dev/null @@ -1,5 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.restore', []); -})(); diff --git a/src/modules/restore/templates/restore.html b/src/modules/restore/templates/restore.html deleted file mode 100644 index 7b60c252d7..0000000000 --- a/src/modules/restore/templates/restore.html +++ /dev/null @@ -1,111 +0,0 @@ - - -
-
-
- - -
-
- -
- -
-
-
- - - -
- - - -
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
- {{$ctrl.address}} -
-
-
-
- -
-
-
-
- - - - - - - -
-
- - -
- - - - - - - - - - -
-
-
- diff --git a/src/modules/saveSeed/controllers/SaveSeedCtrl.js b/src/modules/saveSeed/controllers/SaveSeedCtrl.js deleted file mode 100644 index 7b66589001..0000000000 --- a/src/modules/saveSeed/controllers/SaveSeedCtrl.js +++ /dev/null @@ -1,237 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param $scope - * @param $state - * @param user - * @param modalManager - * @return {SaveSeedCtrl} - */ - const controller = function (Base, $scope, $state, user, modalManager, utils) { - - const ds = require('data-service'); - const PATH = 'modules/saveSeed/templates'; - - class SaveSeedCtrl extends Base { - - /** - * @type {boolean} - */ - networkError = false; - /** - * @type {string} - */ - password = ''; - /** - * @type {null} - */ - loginForm = null; - /** - * @type {string} - */ - activeUserAddress = null; - /** - * @type {boolean} - */ - needPassword = true; - /** - * @type {number} - * @private - */ - _activeUserIndex = null; - /** - * @type {boolean} - * @public - */ - isVisibleSeed = false; - - get user() { - return this.userList[this._activeUserIndex]; - } - - get encryptedSeed() { - return this.user.encryptedSeed; - } - - constructor() { - super($scope); - - this.observe('activeUserAddress', this._calculateActiveIndex); - this.observe('password', this._updatePassword); - - this._initUserList(); - } - - - /** - * @private - */ - _updatePassword() { - if (this.password) { - this.showPasswordError = false; - this.networkError = false; - } - } - - showSeed() { - try { - this.networkError = false; - this.showPasswordError = false; - const userSettings = user.getSettingsByUser(this.user); - const activeUser = { ...this.user, password: this.password, settings: userSettings }; - const api = ds.signature.getDefaultSignatureApi(activeUser); - const adapterAvailablePromise = api.isAvailable(true); - - let canLoginPromise; - - if (this._isSeedAdapter(api) || this._isPrivateKey(api)) { - canLoginPromise = adapterAvailablePromise.then(() => api.getAddress()) - .then(address => address === activeUser.address ? true : Promise.reject('Wrong address!')); - } else { - canLoginPromise = modalManager.showLoginByDevice(adapterAvailablePromise, api.type); - } - - return canLoginPromise.then(() => { - this.isVisibleSeed = true; - ds.app.login(activeUser.address, api); - ds.signature.getSignatureApi().getSeed().then(seed => { - this.seed = seed; - }); - }, () => { - if (!this._isSeedAdapter(api)) { - const errorData = { - error: 'load-user-error', - userType: api.type, - address: activeUser.address - }; - return modalManager.showSignDeviceError(errorData) - .catch(() => Promise.resolve()); - } else { - this._showPasswordError(); - } - }); - } catch (e) { - this._showPasswordError(); - } - } - - /** - * @public - */ - backToUsersList() { - this.password = ''; - this.isVisibleSeed = false; - ds.app.logOut(); - } - - /** - * @public - */ - clickCopySeed() { - analytics.send({ name: 'Migration Import Continue Click', target: 'ui' }); - } - - /** - * @param {Adapter} api - * @return boolean - * @private - */ - _isSeedAdapter(api) { - return api.type && api.type === 'seed'; - } - - /** - * @param {Adapter} api - * @return boolean - * @private - */ - _isPrivateKey(api) { - return api.type && api.type === 'privateKey'; - } - - /** - * @private - */ - _showPasswordError() { - this.password = ''; - this.showPasswordError = true; - this.networkError = this.user.networkError; - } - - - /** - * @private - */ - _initUserList() { - user.getFilteredUserList().then(list => { - this.userList = list; - this.pendingRestore = false; - this._updateActiveUserAddress(); - utils.postDigest($scope).then(() => { - $scope.$apply(); - }); - }); - } - - /** - * @private - */ - _updateActiveUserAddress() { - if (this.userList.length) { - this.activeUserAddress = this.userList[0].address; - this.needPassword = !this.userList[0].userType || this.userList[0].userType === 'seed' || - this.userList[0].userType === 'privateKey'; - } else { - this.activeUserAddress = null; - this.needPassword = true; - } - this._updatePageUrl(); - } - - /** - * @private - */ - _updatePageUrl() { - if (this.userList.length) { - this.pageUrl = `${PATH}/saveSeedHasUsers.html`; - } else { - this.pageUrl = `${PATH}/saveSeedNoUsers.html`; - } - } - - /** - * @private - */ - _calculateActiveIndex() { - const activeAddress = this.activeUserAddress; - let index = null; - - if (!activeAddress) { - return null; - } - - this.userList.some(({ address }, i) => { - if (address === activeAddress) { - index = i; - return true; - } - return false; - }); - - this._activeUserIndex = index; - this.needPassword = !this.userList[index].userType || this.userList[index].userType === 'seed' || - this.userList[index].userType === 'privateKey'; - } - - } - - return new SaveSeedCtrl(); - }; - - controller.$inject = ['Base', '$scope', '$state', 'user', 'modalManager', 'utils']; - - angular.module('app.saveSeed') - .controller('SaveSeedCtrl', controller); -})(); diff --git a/src/modules/saveSeed/less/saveSeed.less b/src/modules/saveSeed/less/saveSeed.less deleted file mode 100644 index 240207862c..0000000000 --- a/src/modules/saveSeed/less/saveSeed.less +++ /dev/null @@ -1,129 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; -@import (reference) '../../app/less/typography'; -@import (reference) '../../app/less/app'; - -body.saveSeed { - .signIn-hidden, - .get-started-link, - .create-hidden, - .signIn-hidden { - display: none; - } - .user-list { - .avatar-container { - width: 30px; - height: 30px; - position: relative; - flex-shrink: 0; - - .avatar { - position: absolute; - } - } - - w-input-container { - display: block; - } - - .icon-remove-user { - position: absolute; - top: 50%; - right: 5px; - transform: translateY(-50%); - width: 30px; - height: 30px; - background-size: 10px 10px; - background-position: center; - } - - .select { - .select__list { - max-height: 300px; - overflow: auto; - } - - .select__title-content .icon-remove-user { - display: none; - } - - .select__title-content, .option { - display: flex; - flex-direction: row; - align-items: center; - } - } - - .select.one-item { - .select__title-content .icon-remove-user { - display: inline-block; - } - .select__title { - padding: 0 0 0 15px; - } - } - - .input-like { - display: flex; - flex-direction: row; - align-items: center; - position: relative; - } - - .input-like, - .select { - .has-name { - .address { - color: @color-basic-500; - line-height: 1em; - } - .name { - line-height: 1em; - margin: 0 0 4px 0; - } - } - } - - .password-placeholder { - position: relative; - - a.caption-1 { - position: absolute; - right: 0; - bottom: 0; - } - } - - a.add-account { - .body-2(); - width: 100%; - cursor: pointer; - display: flex; - align-items: center; - padding: 8px 35px 8px 15px; - margin: 0; - - &:hover { - background: @color-basic-50; - - &::before { - background: @color-white; - } - } - - &::before { - font-size: 19px; - width: 30px; - height: 30px; - background: @color-basic-50; - display: inline-block; - margin-right: 10px; - line-height: 30px; - text-align: center; - content: '+'; - border-radius: 50%; - color: @color-submit-300; - } - } - } -} \ No newline at end of file diff --git a/src/modules/saveSeed/saveSeed.js b/src/modules/saveSeed/saveSeed.js deleted file mode 100644 index 26b616c5fe..0000000000 --- a/src/modules/saveSeed/saveSeed.js +++ /dev/null @@ -1,5 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.saveSeed', []); -})(); diff --git a/src/modules/saveSeed/templates/saveSeed.html b/src/modules/saveSeed/templates/saveSeed.html deleted file mode 100644 index 93c3750482..0000000000 --- a/src/modules/saveSeed/templates/saveSeed.html +++ /dev/null @@ -1,6 +0,0 @@ - -
- - -
- \ No newline at end of file diff --git a/src/modules/saveSeed/templates/saveSeedHasUsers.html b/src/modules/saveSeed/templates/saveSeedHasUsers.html deleted file mode 100644 index e8a34638a9..0000000000 --- a/src/modules/saveSeed/templates/saveSeedHasUsers.html +++ /dev/null @@ -1,100 +0,0 @@ -
- -
-
-
- -
-
- -
- - - - -
- -
- -
-
{{::user.name}}
-
{{::user.address}}
-
- - - -
-
-
-
- - - - - - - - - - - - - - - -
- -
- -
-
-
- -
- -
- - -
- -
- -
- - - -
- - - -
-
- -
diff --git a/src/modules/saveSeed/templates/saveSeedNoUsers.html b/src/modules/saveSeed/templates/saveSeedNoUsers.html deleted file mode 100644 index 41a7e59558..0000000000 --- a/src/modules/saveSeed/templates/saveSeedNoUsers.html +++ /dev/null @@ -1,17 +0,0 @@ - \ No newline at end of file diff --git a/src/modules/sessions/controller/SessionsCtrl.js b/src/modules/sessions/controller/SessionsCtrl.js deleted file mode 100644 index 956db57fb7..0000000000 --- a/src/modules/sessions/controller/SessionsCtrl.js +++ /dev/null @@ -1,38 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param $scope - * @param {SessionBridge} sessionBridge - * @return {SessionsCtrl} - */ - const controller = function (Base, $scope, sessionBridge) { - - class SessionsCtrl extends Base { - - constructor() { - super($scope); - this.sessions = sessionBridge.getSessionsData(); - this.receive(sessionBridge.signals.changeSessions, (sessions) => { - this.sessions = sessions; - $scope.$digest(); - }); - } - - /** - * @param {ISessionUserData} session - */ - chooseSession(session) { - sessionBridge.login(session.id); - } - - } - - return new SessionsCtrl(); - }; - - controller.$inject = ['Base', '$scope', 'sessionBridge']; - - angular.module('app.sessions').controller('SessionsCtrl', controller); -})(); diff --git a/src/modules/sessions/less/sessions.less b/src/modules/sessions/less/sessions.less deleted file mode 100644 index a9b8c38c60..0000000000 --- a/src/modules/sessions/less/sessions.less +++ /dev/null @@ -1,67 +0,0 @@ -@import (reference) 'config'; -@import (reference) '../../app/less/typography'; - -.sessions { - width: 460px; - margin: auto; - text-align: center; - - .sessions-holder { - list-style-type: none; - padding: 0; - margin: 60px 0 30px 0; - - .select, - .input-like { - display: flex; - flex-direction: row; - align-items: center; - position: relative; - cursor: pointer; - - .has-name { - display: flex; - flex-direction: column; - - .session-address { - .footnote-1(); - color: @color-basic-500; - line-height: 1em; - } - .session-name { - .body-2(); - line-height: 1em; - margin: 0 0 4px 0; - } - } - - .icon-remove-user { - position: absolute; - top: 50%; - right: 5px; - transform: translateY(-50%); - width: 30px; - height: 30px; - background-size: 10px 10px; - background-position: center; - } - - .select__title-content .icon-remove-user { - display: none; - } - - .select__title-content, - .option { - display: flex; - flex-direction: row; - align-items: center; - } - } - } -} - -@media screen and (max-width: 480px) { - .sessions { - width: calc(100% ~'- 20px'); - } -} diff --git a/src/modules/sessions/sessions.js b/src/modules/sessions/sessions.js deleted file mode 100644 index ffbe3da91b..0000000000 --- a/src/modules/sessions/sessions.js +++ /dev/null @@ -1,5 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.sessions', []); -})(); diff --git a/src/modules/sessions/templates/sessions.html b/src/modules/sessions/templates/sessions.html deleted file mode 100644 index 6cb2555804..0000000000 --- a/src/modules/sessions/templates/sessions.html +++ /dev/null @@ -1,45 +0,0 @@ -
- -
- -
- -
- -
- -
    -
  • - -
    - {{::session.name}} - {{::session.address}} -
    - -
    • -
- -
- - - -
- {{::session.name}} - {{::session.address}} -
- - - -
- -
- -
- - - - - -
diff --git a/src/modules/signIn/controllers/SignInCtrl.js b/src/modules/signIn/controllers/SignInCtrl.js deleted file mode 100644 index f1d763f88c..0000000000 --- a/src/modules/signIn/controllers/SignInCtrl.js +++ /dev/null @@ -1,130 +0,0 @@ -(() => { - 'use strict'; - - const analytics = require('@waves/event-sender'); - - /** - * @param {typeof Base} Base - * @param {ng.IScope} $scope - * @param {*} $state - * @param {User} user - * @param {ModalManager} modalManager - * @param {ConfigService} configService - * @param {Storage} storage - * @returns {SignInCtrl} - */ - const controller = function (Base, $scope, $state, user, modalManager, configService, storage) { - - class SignInCtrl extends Base { - - /** - * @type {Array|null} - */ - legacyUserList = null; - /** - * @type {Array} - * @private - */ - _onLoginHandlers = []; - - constructor() { - super($scope); - - analytics.send({ name: 'Onboarding Sign In Show', target: 'ui', params: { from: 'sign-in' } }); - - Promise.all([ - user.getMultiAccountData(), - user.getFilteredUserList() - ]).then(([multiAccountData, userList]) => { - if (!multiAccountData) { - $state.go('signUp'); - } else { - this.legacyUserList = userList; - } - }); - - this._onLoginHandlers.push(this._showMigrateModal); - - user.onLogin().then(() => { - this._onLoginHandlers.forEach((handler) => handler()); - }); - } - - $onDestroy() { - super.$onDestroy(); - this._onLoginHandlers = []; - } - - onLogin() { - Promise.all([ - user.getMultiAccountUsers(), - user.getMultiAccountSettings() - ]).then(([multiAccountUsers, commonSettings]) => { - const [firstUser] = multiAccountUsers; - - user.setMultiAccountSettings(commonSettings); - - if (firstUser) { - user.login(firstUser).then(() => { - user.goToActiveState(); - }); - } else if (this.legacyUserList && this.legacyUserList.length) { - $state.go('migrate'); - } else { - $state.go('create'); - } - }).catch(() => { - return null; - }); - } - - onResetPassword() { - $state.go('signUp'); - } - - showForgotPasswordModal() { - modalManager.showForgotPasswordModal().then(() => { - $state.go('signUp'); - }); - } - - _login(userData) { - user.login(userData).then(() => { - const DEXW_LOCKED = configService.get('DEXW_LOCKED'); - - if (DEXW_LOCKED) { - $state.go('migration'); - } else { - user.goToActiveState(); - } - }); - } - - _showPasswordError() { - this.password = ''; - this.showPasswordError = true; - } - - _updatePassword() { - if (this.password) { - this.showPasswordError = false; - } - } - - _showMigrateModal = () => { - storage.load('notAutoOpenMigrationModal').then((notAutoOpenMigrationModal) => { - if (!notAutoOpenMigrationModal) { - modalManager.showMigrateModal(); - } - }); - }; - - } - - return new SignInCtrl(); - }; - - controller.$inject = ['Base', '$scope', '$state', 'user', 'modalManager', 'configService', 'storage']; - - angular.module('app.signIn').controller('SignInCtrl', controller); -})(); diff --git a/src/modules/signIn/less/signIn.less b/src/modules/signIn/less/signIn.less deleted file mode 100644 index a638373282..0000000000 --- a/src/modules/signIn/less/signIn.less +++ /dev/null @@ -1,127 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; -@import (reference) '../../app/less/typography'; -@import (reference) '../../app/less/app'; - -body.signIn { - .signIn-hidden { - display: none; - } - - .user-list { - .avatar-container { - width: 30px; - height: 30px; - position: relative; - flex-shrink: 0; - - .avatar { - position: absolute; - } - } - - w-input-container { - display: block; - } - - .icon-remove-user { - position: absolute; - top: 50%; - right: 5px; - transform: translateY(-50%); - width: 30px; - height: 30px; - background-size: 10px 10px; - background-position: center; - } - - .select { - .select__list { - max-height: 300px; - overflow: auto; - } - - .select__title-content .icon-remove-user { - display: none; - } - - .select__title-content, .option { - display: flex; - flex-direction: row; - align-items: center; - } - } - - .select.one-item { - .select__title-content .icon-remove-user { - display: inline-block; - } - .select__title { - padding: 0 0 0 15px; - } - } - - .input-like { - display: flex; - flex-direction: row; - align-items: center; - position: relative; - } - - .input-like, - .select { - .has-name { - .address { - color: @color-basic-500; - line-height: 1em; - } - .name { - line-height: 1em; - margin: 0 0 4px 0; - } - } - } - - .password-placeholder { - position: relative; - - a.caption-1 { - position: absolute; - right: 0; - bottom: 0; - } - } - - a.add-account { - .body-2(); - width: 100%; - cursor: pointer; - display: flex; - align-items: center; - padding: 8px 35px 8px 15px; - margin: 0; - - &:hover { - background: @color-basic-50; - - &::before { - background: @color-white; - } - } - - &::before { - font-size: 19px; - width: 30px; - height: 30px; - background: @color-basic-50; - display: inline-block; - margin-right: 10px; - line-height: 30px; - text-align: center; - content: '+'; - border-radius: 50%; - color: @color-submit-300; - } - } - } -} \ No newline at end of file diff --git a/src/modules/signIn/signIn.js b/src/modules/signIn/signIn.js index 32498ff5e4..32751f3815 100644 --- a/src/modules/signIn/signIn.js +++ b/src/modules/signIn/signIn.js @@ -1,4 +1,4 @@ -(function () { +(() => { 'use strict'; angular.module('app.signIn', []); diff --git a/src/modules/signIn/templates/signIn.html b/src/modules/signIn/templates/signIn.html deleted file mode 100644 index 9564755fab..0000000000 --- a/src/modules/signIn/templates/signIn.html +++ /dev/null @@ -1,24 +0,0 @@ - - -
-
-
-
-
- -
- -
- -
-
- - -
-
-
- - diff --git a/src/modules/signUp/controllers/SignUpCtrl.js b/src/modules/signUp/controllers/SignUpCtrl.js deleted file mode 100644 index d1a1c9dfbf..0000000000 --- a/src/modules/signUp/controllers/SignUpCtrl.js +++ /dev/null @@ -1,87 +0,0 @@ -(() => { - 'use strict'; - - /** - * @param {typeof Base} Base - * @param {ng.IScope} $scope - * @param {*} $state - * @param {MultiAccount} multiAccount - * @param {User} user - * @param {app.Storage} storage - * @return {SignUpCtrl} - */ - const controller = function (Base, $scope, $state, multiAccount, user, storage) { - - class SignUpCtrl extends Base { - - /** - * @type {ng.IFormController|null} - */ - form = null; - password = ''; - confirmPassword = ''; - termsAgreement = false; - - activeStep = 0; - hasLegacyUsers = false; - termsAccepted = false; - - get invalid() { - return this.form.$invalid || ( - !this.termsAccepted && - !this.termsAgreement - ); - } - - constructor() { - super($scope); - - Promise.all([ - user.getMultiAccountData(), - user.getFilteredUserList(), - storage.load('termsAccepted') - ]).then(([multiAccountData, userList, termsAccepted]) => { - this.termsAccepted = termsAccepted; - - if (multiAccountData) { - if (user.isAuthorised) { - $state.go(user.getActiveState('wallet')); - } else { - $state.go('signIn'); - } - } else { - this.hasLegacyUsers = userList && userList.length > 0; - this.activeStep = this.hasLegacyUsers ? 0 : 1; - } - }); - } - - nextStep() { - this.activeStep += 1; - } - - onSubmit() { - multiAccount.signUp( - this.password, - user.getSetting('encryptionRounds') - ).then(data => Promise.all([ - user.saveMultiAccount(data), - storage.save('termsAccepted', true) - ])).then(() => { - if (this.hasLegacyUsers) { - $state.go('migrate'); - } else { - $state.go('create'); - } - }); - } - - } - - return new SignUpCtrl(); - }; - - controller.$inject = ['Base', '$scope', '$state', 'multiAccount', 'user', 'storage']; - - angular.module('app.signUp').controller('SignUpCtrl', controller); -})(); diff --git a/src/modules/signUp/signUp.js b/src/modules/signUp/signUp.js deleted file mode 100644 index 85e011eec4..0000000000 --- a/src/modules/signUp/signUp.js +++ /dev/null @@ -1,5 +0,0 @@ -(() => { - 'use strict'; - - angular.module('app.signUp', []); -})(); diff --git a/src/modules/signUp/templates/signUp.html b/src/modules/signUp/templates/signUp.html deleted file mode 100644 index bac9692fae..0000000000 --- a/src/modules/signUp/templates/signUp.html +++ /dev/null @@ -1,108 +0,0 @@ - - -
-
- - -
-
- -
- -
- -
- - -
- -
- - - -
-
- -
- -
- -
-
- -
- -
- -
- - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - -
- - -
- - -
- -
- - -
-
- - diff --git a/src/modules/stand/controller/StandCtrl.js b/src/modules/stand/controller/StandCtrl.js deleted file mode 100644 index 615dfccb4b..0000000000 --- a/src/modules/stand/controller/StandCtrl.js +++ /dev/null @@ -1,119 +0,0 @@ -/* eslint-disable max-len */ -(function () { - 'use strict'; - - /** - * @param Base - * @param $scope - * @return {StandCtrl} - */ - const controller = function (Base, $scope, userNotification, notification) { - - class StandCtrl extends Base { - - constructor() { - - super($scope); - - const seed = 'merry evil keep lost fox tech absent trololo both field get input div cosmic'; - /** - * @type {string} - */ - this.tab = 'info'; - this.qrData = 'Keep on waving, we`ll take care of the bad guys'; - this.info = this.dataCopy = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; - /** - * @type {boolean} - */ - this.invalid = true; - this.warning = true; - this.success = true; - this.error = true; - this.active = true; - this.inactive = true; - this.seedConfirmWasFilled = false; - this.seedIsValid = false; - /** - * @type {string} - */ - this.seed = seed; - - const loop = (index) => { - userNotification.info({ - body: { - literal: index + 1 - } - }).then(() => loop(index + 1)); - }; - - loop(0); - - const loop2 = (index) => { - userNotification.error({ - body: { - literal: index + 1 - } - }).then(() => loop2(index + 1)); - }; - - loop2(0); - - const loop3 = (index) => { - userNotification.success({ - body: { - literal: index + 1 - } - }).then(() => loop3(index + 1)); - }; - - loop3(0); - - const loop4 = (index) => { - userNotification.warn({ - body: { - literal: index + 1 - } - }).then(() => loop4(index + 1)); - }; - - loop4(0); - - const loop0 = (index) => { - notification.info({ - title: { - literal: 'Title info' - }, - body: { - literal: 'Text body info' - } - }).then(() => loop0(index + 1)); - }; - - loop0(0); - - - const loop5 = (index) => { - notification.error({ - title: { - literal: 'Title error' - }, - body: { - literal: 'Text body error' - } - }).then(() => loop5(index + 1)); - }; - - loop5(0); - - - } - - } - - return new StandCtrl(); - }; - - controller.$inject = ['Base', '$scope', 'userNotification', 'notification']; - - angular.module('app.stand').controller('StandCtrl', controller); -})(); diff --git a/src/modules/stand/less/stand.less b/src/modules/stand/less/stand.less deleted file mode 100644 index 00cd196569..0000000000 --- a/src/modules/stand/less/stand.less +++ /dev/null @@ -1,105 +0,0 @@ -@import (reference) 'config'; - -html body.stand { - .hidden { - display: block !important; - } - - h1 { - color: grey; - } - - w-seed-read[type="read"] { - position: relative; - &:before { - position: absolute; - z-index: 1; - width: 100%; - height: 135px; - content: ''; - opacity: 0; - display: block; - } - } - - w-change-language .select { - position: relative; - top: 0; - right: 0; - } - - .select img { - width: 30px; - height: 30px; - display: block; - margin-right: 10px; - } - - .checkbox-submit { - margin-right: @padding-main-layout; - &__wrap { - width: 300px !important; - } - } - - .error-block { - margin-top: 130px; - } - - .components-wrapper { - display: flex; - width: 100%; - overflow-x: auto; - min-width: 1200px; - } - - .select__list { - margin-bottom: 40px; - } - - .column1, - .column2, - .column3 { - flex-basis: 33.33%; - padding: 20px 80px; - min-height: 100vh; - min-width: 400px; - } - - .column1, - .column2 { - border-right: 1px dashed @color-basic-200; - } - - .column2 { - background: @color-basic-50; - .relative-wrapper { - background: @color-white; - } - } - - .qr-wrapper, - .relative-wrapper { - background: @color-white; - position: relative; - border: 1px dashed @color-basic-200; - min-height: 100px; - padding: 20px 0; - border-radius: @border-radius; - } - - ._internal-error { - display: block !important; - } - - .tabs { - .tab-content { - display: flex; - align-items: center; - font-size: 100px; - padding: 20px; - min-height: 140px; - justify-content: center; - } - } -} diff --git a/src/modules/stand/stand.js b/src/modules/stand/stand.js deleted file mode 100644 index 7b26d76e2c..0000000000 --- a/src/modules/stand/stand.js +++ /dev/null @@ -1,5 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.stand', []); -})(); diff --git a/src/modules/stand/templates/stand.html b/src/modules/stand/templates/stand.html deleted file mode 100644 index 84c6993284..0000000000 --- a/src/modules/stand/templates/stand.html +++ /dev/null @@ -1,525 +0,0 @@ -
- -
-
- -

Buttons

- - - - - - - Send - - -
- - - Tiny - - -
- - - Micro - - -
- - - Small - - -
- - - Medium - - - - -
- - - Big button - - -
- - - Big warning - - -
- - - bordered - - -
- -
- Expand button - -
- -
- -

Selects

- - - -
- -
Select title
- - Default - Value 1 - Value 2 - Value 3 - Value 4 - Value 4 - - -
- - - Big - option 2 - option 3 - option 4 - option 5 - - -
- - - Big disabled - option 2 - option 3 - option 4 - option 5 - - -
- - - Interface - option 2 - option 3 - option 4 - option 5 - - -
- - - Interface disabled - option 2 - option 3 - option 4 - option 5 - - -
- -
Select with filter title
- - - Bitcoin - Waves - Bitcoin - Bitcoin - Waves - Waves - Waves - Waves - Waves - Waves - Waves - Waves - Waves - Waves - - -
- -

Inputs

- -
Input title
- - -
- -
Textarea title
- - -
- - - {{$ctrl.dataCopy}} - - - -
- -
- -
- - - - - Value 1 - - - Value 2 - - -
- -
- -
- -
- - - - - -
- -
- -
- - - -
ON
-
OFF
-
- -
- -

Range

- - - -
- -
-
- -

Errors

- -
- - -
This field is requied
- -
- - - - - This field is requied - - -
- - - - - First error - Second error - Another error - One more error - - - -
- - - -

Empty block

- - - -
- -

Loader

- -
- -
- -
- -

Tooltip

- -
- Important information - - Hi, I'm Tooltip. I need a relative container - -
- -
- -

Helpers

- -
- Some title - -
Helper header
-
Helper description first row
-
Helper description second row
-
Helper description third row
- -
- -
- Some title Info - -
Helper header
-
Helper description first row
-
Helper description second row
-
Helper description third row
- -
- -
- -

QR Code

-
-
Отсканируйте QR код
- -
Нажмите чтобы увеличить/уменьшить
- -
- -
- -

Expandable block

- - - 🙈 - - -
- -

Close modal button

- -
- -
- -
- -
- -

Tags & Labels

- -
- -
SUCCESS
- -
- -
WARNING
- -
- -
ERROR
- -
- - ACTIVE - -
- - INACTIVE - -
- -
- -
SUCCESS
- -
- -
WARNING
- -
- -
ERROR
- -
- - ACTIVE - -
- - INACTIVE - -
- -
-

Plates

- -
-
Plate-transparent
-
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.
-
- -
- -
-
Plate-note
-
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.
-
- -
- -
-
Plate-warningr
-
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.
-
- -
- -
-
Plate-error
-
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.
-
- -
- -

Actions

- -
- - - Action 1 - - - Action 3 - - - Action 4 - -
- - Copy - -
- -
- -
- -

Seed Backup

- -
Seed previrew
- - -
Seed confirmation
- - - - -
- -

Tabs

- - - -
🙉
- - -
🙈
- - -
🙊
- - - -
- - -

Search

- -
- - - -
- -
- -

Notifications

- -
-
- -
-
- -
- -
- -
- -
-
-
diff --git a/src/modules/tokens/controllers/TokensCtrl.js b/src/modules/tokens/controllers/TokensCtrl.js deleted file mode 100644 index c38a134d6b..0000000000 --- a/src/modules/tokens/controllers/TokensCtrl.js +++ /dev/null @@ -1,367 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {typeof Base} Base - * @param {$rootScope.Scope} $scope - * @param {ModalManager} modalManager - * @param {Waves} waves - * @param {BalanceWatcher} balanceWatcher - * @param {User} user - * @param {app.utils} utils - * @param {PromiseControl} PromiseControl - */ - const controller = function (Base, $scope, modalManager, waves, balanceWatcher, user, utils, PromiseControl) { - - const { SIGN_TYPE, WAVES_ID } = require('@waves/signature-adapter'); - const { BigNumber } = require('@waves/bignumber'); - const ds = require('data-service'); - const $ = require('jquery'); - const BASE_64_PREFIX = 'base64:'; - - class TokensCtrl extends Base { - - /** - * @type {boolean} - */ - focusName = false; - - /** - * @type {PromiseControl} - */ - _findNamePC = null; - - /** - * @type {boolean} - */ - agreeConditions = false; - - /** - * @type {boolean} - */ - nameWarning = false; - - /** - * Link to angular form object - * @type {form.FormController} - */ - createForm = null; - /** - * @type {string} - */ - assetId = ''; - /** - * Token name - * @type {string} - */ - name = ''; - /** - * Token description - * @type {string} - */ - description = ''; - /** - * Can reissue this token - * @type {boolean} - */ - issue = true; - /** - * Count of generated tokens - * @type {BigNumber} - */ - count = null; - /** - * Precision of token - * @type {number} - */ - precision = 0; - /** - * @type {BigNumber} - */ - maxCoinsCount = WavesApp.maxCoinsCount; - /** - * Has money for fee - * @type {boolean} - */ - invalid = false; - /** - * @type {string} - */ - script = ''; - /** - * @type {boolean} - */ - isValidScript = true; - /** - * @type {boolean} - */ - scriptPending = false; - /** - * @type {Money} - */ - fee = null; - /** - * @type {boolean} - */ - hasAssetScript = false; - /** - * @type {Signable} - */ - signable = null; - /** - * @type {JQueryXHR | null} - * @private - */ - _scriptValidationXHR = null; - /** - * @type {Money} - * @private - */ - _balance; - /** - * @type {boolean} - */ - isNFT = false; - /** - * @type {args} - */ - signPending = false; - /** - * @type {Array} - * @private - */ - _listeners = []; - - - constructor() { - super($scope); - - this.receive(balanceWatcher.change, this._onChangeBalance, this); - - this.observe('precision', this._onChangePrecision); - this.observe('script', this._onChangeScript); - this.observe([ - 'name', - 'count', - 'script', - 'precision', - 'description', - 'issue', - 'hasAssetScript', - 'fee' - ], this.createSignable); - - this.observe([ - 'count', - 'precision', - 'issue' - ], this._setIsNFT); - - this._getFee(); - this.observe('isNFT', this._getFee); - - this.observeOnce('createForm', () => { - this.receive(utils.observe(this.createForm, '$valid'), this.createSignable, this); - }); - - const signPendingListener = $scope.$on('signPendingChange', (event, data) => { - this.signPending = data; - }); - - this._listeners.push(signPendingListener); - } - - $onDestroy() { - super.$onDestroy(); - this._listeners.forEach(listener => listener()); - } - - /** - * @param {boolean} focus - */ - onNameFocus(focus) { - this.focusName = !!focus; - } - - generate(signable) { - return modalManager.showConfirmTx(signable) - .then(() => this._reset()); - } - - sendAnalytics() { - analytics.send({ name: 'Token Generation Info Show', target: 'ui' }); - } - - getSignable() { - return this.signable; - } - - createSignable() { - this._verifyName().then( - res => { - this.nameWarning = res; - $scope.$apply(); - } - ); - - if (!this.name || !this.createForm || !this.createForm.$valid) { - this.assetId = ''; - return null; - } - - const precision = Number(this.precision.toString()); - const quantity = (this.count || new BigNumber(0)).mul(Math.pow(10, precision)); - const script = this.hasAssetScript && this.script ? `${BASE_64_PREFIX}${this.script}` : ''; - - const tx = waves.node.transactions.createTransaction({ - type: SIGN_TYPE.ISSUE, - name: this.name, - description: this.description, - reissuable: this.issue, - quantity, - precision, - script, - fee: this.fee - }); - - this.signable = ds.signature.getSignatureApi().makeSignable({ type: tx.type, data: tx }); - - this.signable.getId().then(id => { - this.assetId = id; - utils.safeApply($scope); - }); - } - - /** - * @return {*} - * @private - */ - _verifyName() { - if (this._findNamePC != null) { - this._findNamePC.abort(); - } - this._findNamePC = new PromiseControl(utils.wait(1000)); - return this._findNamePC - .then(() => utils.assetNameWarning(this.name)); - } - - /** - * @return {null} - * @private - */ - _onChangeScript() { - if (this._scriptValidationXHR) { - this._scriptValidationXHR.abort(); - this.scriptPending = false; - } - const script = this.script.replace(BASE_64_PREFIX, ''); - - if (!script) { - this.isValidScript = true; - this.scriptPending = false; - return null; - } - - this.isValidScript = true; - this.scriptPending = true; - this._scriptValidationXHR = $.ajax({ - method: 'POST', - url: `${user.getSetting('network.node')}/utils/script/estimate`, - data: script - }); - - this._scriptValidationXHR - .then(() => { - this.isValidScript = true; - }) - .catch(() => { - this.isValidScript = false; - }) - .always(() => { - this.scriptPending = false; - $scope.$apply(); - }); - } - - /** - * @param {BigNumber} value - * @private - */ - _onChangePrecision({ value }) { - if (value && value <= 8) { - this.maxCoinsCount = WavesApp.maxCoinsCount.div(Math.pow(10, Number(value))); - } - } - - /** - * Current can i send transaction (balance gt fee) - * @private - */ - _onChangeBalance() { - this._balance = balanceWatcher.getBalance()[WAVES_ID]; - - this.invalid = (!this.fee || !this._balance) || - this._balance.getTokens().lt(this.fee.getTokens()); - - $scope.$apply(); - } - - /** - * @private - */ - _reset() { - - this.name = ''; - this.description = ''; - this.issue = true; - this.count = new BigNumber(0); - this.precision = 0; - this.maxCoinsCount = WavesApp.maxCoinsCount; - this.script = ''; - this.hasAssetScript = false; - - this.createForm.$setPristine(); - this.createForm.$setUntouched(); - - $scope.$apply(); - } - - /** - * @private - */ - _setIsNFT() { - const { count, precision, issue } = this; - const nftCount = count && count.eq(1); - const nftPrecision = precision === 0; - this.isNFT = !issue && nftCount && nftPrecision; - } - - /** - * @private - */ - _getFee() { - waves.node.getFee({ - type: SIGN_TYPE.ISSUE, - reissue: this.issue, - precision: this.precision, - quantity: this.count - }) - .then(money => { - this.fee = money; - this._onChangeBalance(); - $scope.$apply(); - }); - } - - } - - return new TokensCtrl(); - }; - - controller.$inject = ['Base', '$scope', 'modalManager', - 'waves', 'balanceWatcher', 'user', 'utils', 'PromiseControl']; - - angular.module('app.tokens') - .controller('TokensCtrl', controller); -})(); - diff --git a/src/modules/tokens/less/generate-form.less b/src/modules/tokens/less/generate-form.less deleted file mode 100644 index 29e1e18093..0000000000 --- a/src/modules/tokens/less/generate-form.less +++ /dev/null @@ -1,37 +0,0 @@ -@import (reference) 'config'; -@import (reference) '../../app/less/typography'; - -.generate-form { - &__row { - margin-top: 20px; - - &_script { - margin-top: 10px; - - textarea { - min-height: 77px; - max-height: 300px; - } - } - } - - &__label { - align-items: center; - } - - &__preview { - border-radius: @border-radius; - background-color: @color-disabled-50; - border: 1px solid @color-basic-100; - height: 72px; - } - - &__textarea { - min-height: 77px; - max-height: 300px; - } - - w-help-icon { - z-index: auto; - } -} \ No newline at end of file diff --git a/src/modules/tokens/less/preview-token.less b/src/modules/tokens/less/preview-token.less deleted file mode 100644 index fc0ee975cf..0000000000 --- a/src/modules/tokens/less/preview-token.less +++ /dev/null @@ -1,46 +0,0 @@ -@import (reference) 'config'; -@import (reference) '../../app/less/typography'; - -.preview-token { - display: flex; - flex-direction: row; - align-items: center; - width: 100%; - - &__avatar { - display: flex; - width: 30px; - height: 30px; - margin: 0 16px; - border-radius: 100%; - background-color: @color-basic-100; - position: relative; - } - - &__logo { - cursor: pointer; - - &:hover + .preview-token__tooltip .tooltip { - display: flex; - } - - .asset-logo__marker { - display: none; - } - } - - &__tooltip { - top: -8px; - left: 50%; - position: absolute; - - .information-icon { - display: none; - } - - .tooltip { - align-items: center; - transform: translateX(-50%); - } - } -} diff --git a/src/modules/tokens/less/token-info.less b/src/modules/tokens/less/token-info.less deleted file mode 100644 index 31c42b2128..0000000000 --- a/src/modules/tokens/less/token-info.less +++ /dev/null @@ -1,34 +0,0 @@ -@import (reference) 'config'; -@import (reference) '../../app/less/typography'; - -.token-info { - display: flex; - flex: 1 0; - flex-direction: column; - justify-content: center; - - &.empty { - .token-info__line { - &_name { - margin-bottom: 12px; - - &::after { - width: 50%; - } - } - - &_value::after { - width: 80%; - } - - &_name::after, - &_value::after { - content: ''; - display: block; - height: 8px; - border-radius: 100px; - background-color: @color-basic-100; - } - } - } -} \ No newline at end of file diff --git a/src/modules/tokens/less/tokens.less b/src/modules/tokens/less/tokens.less deleted file mode 100644 index 30a77d5263..0000000000 --- a/src/modules/tokens/less/tokens.less +++ /dev/null @@ -1,67 +0,0 @@ -@import (reference) 'config'; -@import (reference) '../../app/less/typography'; - -.tokens { - .main-content .content { - overflow: inherit; - max-width: 100%; - height: auto; - } - - .show-fader + .main-header__header { - padding-right: 24px; - } -} - -.tokens-page { - .nameHelper { - display: none; - - &.showNameHelper { - display: block; - } - } - - &__wrapper { - background-color: @color-white; - border-radius: @border-radius; - box-shadow: @shadow-type-1; - max-width: 540px; - margin: auto; - } - - &__content { - overflow: auto; - padding: 0 40px 40px; - } - - &__title { - display: flex; - align-items: center; - padding: 0 40px; - height: 60px; - border-bottom: 1px solid @color-basic-200; - } -} - -@media screen and (max-width: 768px) { - .tokens-page { - .byte-validator__help { - position: relative; - top: 4px; - } - - &__content, - &__title { - padding: 0 20px; - } - - &__content { - padding-bottom: 20px; - } - - &__title { - height: 50px; - } - } -} diff --git a/src/modules/tokens/less/tokens.modal.less b/src/modules/tokens/less/tokens.modal.less deleted file mode 100644 index 20c8455b7c..0000000000 --- a/src/modules/tokens/less/tokens.modal.less +++ /dev/null @@ -1,47 +0,0 @@ -@import (reference) "../../app/less/app-icons"; -@import (reference) 'config'; -@import (reference) 'icons'; - -md-dialog.tokens-generate-modal { - - .icon { - &.confirm-icon { - .icon-tx-issue(); - width: 100%; - height: 76px; - background-size: 80px 76px; - background-position: center center; - background-repeat: no-repeat; - } - - &.icon-success { - width: 80px; - height: 80px; - margin: 30px auto 20px; - background-image: url(/img/icons/check.svg); - background-repeat: no-repeat; - background-position: center; - } - } - - .description { - margin-top: 5px; - padding: 13px 16px; - background-color: @color-basic-50; - border: 1px dashed @color-basic-200; - border-radius: @border-radius; - } - - .fee { - display: flex; - border-bottom: 1px solid @color-basic-200; - padding-bottom: 13px; - justify-content: space-between; - align-items: center; - } - - w-button { - margin: auto; - width: 224px; - } -} diff --git a/src/modules/tokens/templates/tokens.html b/src/modules/tokens/templates/tokens.html deleted file mode 100644 index 7710d43950..0000000000 --- a/src/modules/tokens/templates/tokens.html +++ /dev/null @@ -1,255 +0,0 @@ -
-
-
-
-
-
- -
-
- -
-
- - - - -
-
- - - - - - - - - - - - -
- -
-
- - - - - - - -
- -
-
- - -
- -
-
-
- -
- -
- - - - - - - - - - -
- - - - - - - - - - - - - - -
- -
-
- - -
- -
- -
- -
- -
-
-
-
-
-
- -
-
- - -
-
-
- -
- -
- -
- - - -
-
-
- -
- - - - - - - - - - - -
-
-
-
-
-
-
-
-
- -
-
-
-
- - - - -
-
-
- {{$ctrl.name}} -
-
- -
-
-
-
- -
-
-
-
- -
- - -
- -
-
-
-
- -
-
- -
- - - - - -
-
-
-
diff --git a/src/modules/tokens/tokens.js b/src/modules/tokens/tokens.js deleted file mode 100644 index dc966f50c0..0000000000 --- a/src/modules/tokens/tokens.js +++ /dev/null @@ -1,5 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.tokens', []); -})(); diff --git a/src/modules/ui/directives/accordion/accordion.less b/src/modules/ui/directives/accordion/accordion.less index 1250b6eb00..c86e2a99eb 100644 --- a/src/modules/ui/directives/accordion/accordion.less +++ b/src/modules/ui/directives/accordion/accordion.less @@ -70,7 +70,7 @@ &-title { cursor: pointer; - background: #f8f9fb; + background: @color-basic-50; border-radius: @border-radius; padding: 14px 16px; display: flex; diff --git a/src/modules/ui/directives/anyTransactionForm/AnyTransactionForm.js b/src/modules/ui/directives/anyTransactionForm/AnyTransactionForm.js deleted file mode 100644 index c425a0b653..0000000000 --- a/src/modules/ui/directives/anyTransactionForm/AnyTransactionForm.js +++ /dev/null @@ -1,229 +0,0 @@ -(function () { - 'use strict'; - - - /** - * @param {typeof Base} Base - * @param {$rootScope.Scope} $scope - * @param {Waves} waves - * @return {AnyTransactionForm} - */ - const controller = function (Base, $scope, waves) { - - const { indexBy, prop, head } = require('ramda'); - const { SIGN_TYPE } = require('@waves/signature-adapter'); - const { Money } = require('@waves/data-entities'); - const ds = require('data-service'); - const analytics = require('@waves/event-sender'); - - class AnyTransactionForm extends Base { - - /** - * @type {object} - */ - state = Object.create(null); - /** - * @type {string} - */ - json = ''; - /** - * @type {Function} - */ - onSuccess = null; - /** - * @type {boolean} - */ - isValidJSON = true; - /** - * @type {Signable} - */ - signable = null; - - - constructor() { - super(); - this.observe('json', this._onChangeJSON); - this.observe('state', this._onChangeState); - } - - next() { - analytics.send({ name: 'Wallet Assets JSON Continue Click', target: 'ui' }); - this.onSuccess({ signable: this.signable }); - } - - /** - * @private - */ - _onChangeState() { - const state = this.state; - - if (!state.tx) { - state.tx = Object.create(null); - } else if (state.tx) { - try { - this.json = WavesApp.stringifyJSON(this.state.tx, null, 4); - } catch (e) { - // TODO add error - this.json = ''; - } - } - } - - /** - * @private - */ - _onChangeJSON() { - this.isValidJSON = false; - const json = this.json; - this.fee = null; - - if (!this.json) { - this.isValidJSON = true; - return null; - } - - WavesApp.parseJSON(json) - .then(data => this._updateSignable(data) - .then(() => { - this.state.tx = data; - this.isValidJSON = true; - })) - .catch(() => { - this.state.tx = null; - this.isValidJSON = false; - }) - .then(() => { - $scope.$apply(); - }); - } - - /** - * @private - */ - _updateSignable(data) { - if (!data) { - return Promise.resolve(null); - } - - const clone = Object.keys(data).reduce((acc, name) => { - const value = AnyTransactionForm._normalizeValue(data[name]); - acc[name] = value; - return acc; - }, Object.create(null)); - - const type = AnyTransactionForm._normalizeSignType(clone); - - return AnyTransactionForm._parse(type, clone).then(data => { - this.fee = data.fee; - - if (data.type === SIGN_TYPE.SET_SCRIPT && !data.script) { - data.script = ''; - } - if (data.type === SIGN_TYPE.TRANSFER || data.type === SIGN_TYPE.MASS_TRANSFER) { - data.attachment = Array.from(data.attachment); - } - - try { - this.signable = ds.signature.getSignatureApi().makeSignable({ - type, - data - }); - } catch (e) { - return Promise.reject(e); - } - }); - } - - static _normalizeValue = value => { - if (value === 'true') { - return true; - } - - if (value === 'false') { - return false; - } - - const num = Number(value); - return String(num) === value ? num : value; - }; - - static _parse(type, data) { - switch (type) { - case SIGN_TYPE.CREATE_ORDER: - return AnyTransactionForm._parseOrder(data); - case SIGN_TYPE.CANCEL_ORDER: - return Promise.resolve(data); - default: - return AnyTransactionForm._parseTransaction(data); - } - } - - static _parseOrder(data) { - const moneyFactory = ds.api.matcher.factory; - return Promise.all([ - waves.node.assets.getAsset('WAVES'), - waves.node.assets.getAsset(ds.utils.normalizeAssetId(data.assetPair.amountAsset)), - waves.node.assets.getAsset(ds.utils.normalizeAssetId(data.assetPair.priceAsset)) - ]) - .then(indexBy(prop('id'))) - .then(hash => { - return ds.api.transactions.parseExchangeOrder(moneyFactory, data, hash); - }); - } - - static _parseTransaction(data) { - switch (data.type) { - case SIGN_TYPE.CANCEL_LEASING: - return Promise.all([ - AnyTransactionForm._parseDefaultTransaction(data), - waves.node.transactions.get(data.leaseId) - ]).then(([tx, lease]) => ({ ...tx, lease })); - case SIGN_TYPE.BURN: - return Promise.all([ - AnyTransactionForm._parseDefaultTransaction(data), - waves.node.assets.getAsset(data.assetId) - ]).then(([tx, asset]) => ({ ...tx, amount: new Money(tx.quantity, asset) })); - default: - return AnyTransactionForm._parseDefaultTransaction(data); - } - } - - static _parseDefaultTransaction(data) { - return ds.api.transactions.parseTx([data]) - .then(head); - } - - /** - * @param {{[type]: number, [orderType]: string, [id]: string}} data - * @return number - * @private - */ - static _normalizeSignType(data) { - if (data.type && SIGN_TYPE[data.type]) { - return data.type; - } - if (data.orderType && ['sell', 'buy'].includes(data.orderType)) { - return SIGN_TYPE.CREATE_ORDER; - } - if (data.id && typeof data.id === 'string') { - return SIGN_TYPE.CANCEL_ORDER; - } - } - - } - - return new AnyTransactionForm(); - }; - - controller.$inject = ['Base', '$scope', 'waves']; - - angular.module('app.ui').component('wAnyTransactionForm', { - controller, - scope: false, - bindings: { - state: '=', - onSuccess: '&' - }, - templateUrl: 'modules/ui/directives/anyTransactionForm/any-tx-form.html' - }); -})(); diff --git a/src/modules/ui/directives/anyTransactionForm/any-tx-form.html b/src/modules/ui/directives/anyTransactionForm/any-tx-form.html deleted file mode 100644 index 4f12f08cf7..0000000000 --- a/src/modules/ui/directives/anyTransactionForm/any-tx-form.html +++ /dev/null @@ -1,48 +0,0 @@ -
- -
-
-
- -
-
- - - - - - - - - - - - - -
-
-
-
- -
- - -
- -
- - - -
-
diff --git a/src/modules/ui/directives/anyTransactionForm/any-tx-form.less b/src/modules/ui/directives/anyTransactionForm/any-tx-form.less deleted file mode 100644 index edbc960d32..0000000000 --- a/src/modules/ui/directives/anyTransactionForm/any-tx-form.less +++ /dev/null @@ -1,6 +0,0 @@ -@import (reference) 'icons'; -@import (reference) 'config'; - -.any-transaction-form { - display: flex; -} \ No newline at end of file diff --git a/src/modules/ui/directives/assetInfoHead/AssetInfoHead.js b/src/modules/ui/directives/assetInfoHead/AssetInfoHead.js deleted file mode 100644 index 64fc78c9c6..0000000000 --- a/src/modules/ui/directives/assetInfoHead/AssetInfoHead.js +++ /dev/null @@ -1,105 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param $scope - * @param user - * @param waves - * @param utils - * @param createPoll - * @return {AssetInfoHead} - */ - const controller = function (Base, $scope, user, waves, utils, createPoll) { - - class AssetInfoHead extends Base { - - /** - * @type {string} - */ - assetName; - /** - * @type {boolean} - */ - ratingError = false; - /** - * @type {string} - */ - tokenratingLink; - - /** - * @type {number | null} - */ - rating = null; - - $postLink() { - this._getAssetInfo(); - this._setLink(); - this.observe('assetId', this._getAssetInfo); - createPoll(this, this._getTokenRating, this._setTokenRating, 60 * 1000); - } - - /** - * @private - */ - _getAssetInfo() { - waves.node.assets.getAsset(this.assetId).then(asset => { - this.assetName = asset.name; - this.ticker = asset.ticker; - const { hasLabel, isGateway } = utils.getDataFromOracles(asset.id); - this.hasLabel = hasLabel; - this.isGatewayOrWaves = this.assetId === WavesApp.defaultAssets.WAVES || isGateway; - $scope.$apply(); - }); - - this.state = { assetId: this.assetId }; - } - - /** - * @private - */ - _getTokenRating() { - return ds.api.rating.getAssetsRating(this.assetId) - .then(assetList => assetList) - .catch(() => null); - } - - /** - * @private - */ - _setTokenRating(assetList) { - if (!assetList) { - this.ratingError = true; - return null; - } - if (assetList.length === 0) { - return null; - } - - this.rating = assetList[0].rating; - $scope.$apply(); - } - - /** - * @private - */ - _setLink() { - this.tokenratingLink = `${WavesApp.network.tokenrating}/tokens/${this.assetId}`; - } - - } - - return new AssetInfoHead(); - }; - - controller.$inject = ['Base', '$scope', 'user', 'waves', 'utils', 'createPoll']; - - angular.module('app.ui') - .component('wAssetInfoHead', { - controller: controller, - templateUrl: 'modules/ui/directives/assetInfoHead/asset-info-head.html', - bindings: { - assetId: '<' - } - }); -})(); diff --git a/src/modules/ui/directives/assetInfoHead/asset-info-head.html b/src/modules/ui/directives/assetInfoHead/asset-info-head.html deleted file mode 100644 index 1caf26a818..0000000000 --- a/src/modules/ui/directives/assetInfoHead/asset-info-head.html +++ /dev/null @@ -1,37 +0,0 @@ -
-
- - -
-
- {{$ctrl.assetName}} - -
- -
- - - - -
-
-
- -
- -
-
- -
-
- -
-
-
diff --git a/src/modules/ui/directives/assetInfoHead/asset-info-head.less b/src/modules/ui/directives/assetInfoHead/asset-info-head.less deleted file mode 100644 index 42ac1e5883..0000000000 --- a/src/modules/ui/directives/assetInfoHead/asset-info-head.less +++ /dev/null @@ -1,66 +0,0 @@ -@import (reference) 'config'; -@import (reference) '../../../app/less/typography'; - -.asset-info-head { - display: flex; - - &_p-40 { - padding: 0 40px; - - @media screen and (max-width: 768px) { - padding: 0 20px; - } - } - - &__head { - height: 130px; - position: relative; - flex: 1 0; - } - - &__content { - display: flex; - } - - &__name { - display: flex; - align-items: center; - font-size: 24px; - line-height: 28px; - } - - &__data { - display: flex; - flex-direction: column; - justify-content: center; - flex: 1; - } - - &__chart { - position: absolute; - opacity: 0.2; - height: 76px; - width: calc(100% ~'+ 80px'); - left: -40px; - bottom: 0; - } - - &__rating { - margin-top: 7px; - display: flex; - align-items: flex-start; - - .rating { - &-wrapper { - display: flex; - justify-content: flex-start; - align-items: center; - margin-top: 7px; - } - - &-number { - margin-left: 10px; - } - } - } -} diff --git a/src/modules/ui/directives/assetLogo/AssetLogo.js b/src/modules/ui/directives/assetLogo/AssetLogo.js deleted file mode 100644 index ef6d2c4513..0000000000 --- a/src/modules/ui/directives/assetLogo/AssetLogo.js +++ /dev/null @@ -1,177 +0,0 @@ -(function () { - 'use strict'; - - const ds = require('data-service'); - const { isEmpty } = require('ts-utils'); - - /** - * @param Base - * @param {ng.IAugmentedJQuery} $element - * @param {app.utils} utils - * @param {Waves} waves - * @return {AssetLogo} - */ - const controller = function (Base, $element, utils, waves) { - - class AssetLogo extends Base { - - /** - * @type {string} - */ - assetId; - /** - * @type {string} - */ - assetName; - /** - * @type {number} - */ - size; - /** - * @type {boolean} - */ - hasScript; - /** - * @type {boolean} - */ - isNew = false; - /** - * @type {boolean} - * @private - */ - _canPayFee = false; - /** - * @type {boolean} - * @private - */ - _isSmart = false; - - constructor() { - super(); - - this.observe('_canPayFee', this._onChangeCanPayFee); - this.observe(['_isSmart', 'hasScript'], this._onChangeIsSmart); - } - - $postLink() { - if (!this.size) { - throw new Error('Wrong params!'); - } - - if (!this.isNew) { - if (!(this.assetName || this.assetId)) { - throw new Error('Wrong params!'); - } - - this._canPayFee = !!ds.utils.getTransferFeeList() - .find(money => money.asset.id === this.assetId); - - if (this.assetId) { - waves.node.assets.getAsset(this.assetId).then(asset => { - this._isSmart = asset.hasScript; - }); - } - } - - $element.find('.asset-logo__logo') - .css({ - width: `${this.size}px`, - height: `${this.size}px` - }); - - this._addLogo(); - } - - /** - * @private - */ - _addLogo() { - if (!this.isNew && this.assetId) { - - const { logo } = utils.getDataFromOracles(this.assetId); - - if (logo) { - $element.find('.asset-logo__logo') - .addClass('asset-logo_custom') - .css('backgroundImage', `url(${logo})`); - return null; - } - - waves.node.assets.getAsset(this.assetId) - .then((asset) => { - const logo = utils.getAssetLogo(this.assetId); - - if (logo) { - utils.loadImage(logo) - .then(() => { - $element.find('.asset-logo__logo') - .css('backgroundImage', `url(${logo})`); - }) - .catch(() => this._addLetter(asset.name)); - } else { - this._addLetter(asset.name); - } - }); - } else { - $element.addClass('asset-logo_new'); - this.observe(['assetName', 'assetId'], () => this._addLetter(this.assetName)); - this._addLetter(this.assetName); - } - } - - /** - * @param {string} name - * @private - */ - _addLetter(name) { - const letter = name.charAt(0).toUpperCase(); - const color = utils.getAssetLogoBackground(this.assetId); - const fontSize = Math.round((Number(this.size) || 0) * 0.43); - - $element.find('.asset-logo__logo, .asset-logo__marker') - .css({ - 'background-color': color - }); - - $element.find('.asset-logo__letter') - .text(letter) - .css({ - 'font-size': `${fontSize}px` - }); - } - - /** - * @private - */ - _onChangeCanPayFee() { - $element.find('.asset-logo__marker').toggleClass('asset-logo__marker_sponsored', this._canPayFee); - } - - /** - * @private - */ - _onChangeIsSmart() { - const isSmart = isEmpty(this.hasScript) ? this._isSmart : this.hasScript; - $element.find('.asset-logo__marker').toggleClass('asset-logo__marker_smart', isSmart); - } - - } - - return new AssetLogo(); - }; - - controller.$inject = ['Base', '$element', 'utils', 'waves']; - - angular.module('app.ui') - .component('wAssetLogo', { - templateUrl: 'modules/ui/directives/assetLogo/asset-logo.html', - controller: controller, - bindings: { - assetId: '<', - hasScript: '<', - assetName: '<', - isNew: '<', - size: '@' - } - }); -})(); diff --git a/src/modules/ui/directives/assetLogo/NewAssetLogo.js b/src/modules/ui/directives/assetLogo/NewAssetLogo.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/modules/ui/directives/assetLogo/asset-logo.html b/src/modules/ui/directives/assetLogo/asset-logo.html deleted file mode 100644 index 39737e479a..0000000000 --- a/src/modules/ui/directives/assetLogo/asset-logo.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/modules/ui/directives/assetLogo/assetLogo.less b/src/modules/ui/directives/assetLogo/assetLogo.less deleted file mode 100644 index 366f773748..0000000000 --- a/src/modules/ui/directives/assetLogo/assetLogo.less +++ /dev/null @@ -1,70 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; - -.asset-logo { - position: relative; - display: flex; - - &__logo { - background-size: 100% 100%; - text-align: center; - border-radius: 50%; - color: @white-only; - display: flex; - align-items: center; - justify-content: center; - flex-shrink: 0; - position: relative; - margin-right: 10px; - } - - &__marker { - display: none; - width: 15px; - height: 15px; - position: absolute; - bottom: -2px; - right: -2px; - border: 2px solid @color-white; - border-radius: 50%; - background-position: center; - background-repeat: no-repeat; - - &_smart { - background-image: @smart-asset-marker-icon; - display: block; - } - - &_sponsored { - background-image: @sponsored-asset-marker-icon; - display: block; - } - } - - &_marker-hide { - .asset-logo__marker { - opacity: 0; - } - } - - &_big & { - &__marker { - width: 24px; - height: 24px; - background-size: 12px; - } - } - - &_modal { - margin: 0 10px 0 0; - z-index: 1; - } - - &_custom &, - &.custom & { - &__marker { - background-color: @custom-asset-marker-bg; - } - } -} - diff --git a/src/modules/ui/directives/assetRateChart/AssetRateChart.js b/src/modules/ui/directives/assetRateChart/AssetRateChart.js deleted file mode 100644 index 574a2a3003..0000000000 --- a/src/modules/ui/directives/assetRateChart/AssetRateChart.js +++ /dev/null @@ -1,179 +0,0 @@ -(function () { - 'use strict'; - - const { map } = require('ramda'); - - /** - * @param {Base} Base - * @param {IPollCreate} createPoll - * @param {Waves} waves - * @param {app.utils} utils - * @param {User} user - * @return {AssetRateChart} - */ - const controller = function (Base, createPoll, waves, utils, user) { - - class AssetRateChart extends Base { - - constructor() { - super(); - - /** - * @type {TChartOptions} - * */ - this.options = { - axisX: 'timestamp', - axisY: 'rate', - checkWidth: true, - view: { - rate: { - lineColor: '#5a81ea', - fillColor: '#FFF', - lineWidth: 4 - } - } - }; - - /** - * @type {Moment} - */ - this.startFrom = null; - /** - * @type {string} - */ - this.assetId = null; - /** - * @type {string} - */ - this.chartToId = null; - /** - * @type {boolean} - */ - this.noUpdate = null; - /** - * @type {Poll} - * @private - */ - this._poll = null; - - this._setThemSettings(); - } - - $postLink() { - this.observe('noUpdate', this._onChangeNoUpdate); - this.observe(['assetId', 'chartToId', 'startFrom'], this._onChangeMainParams); - this.observe('theme', this._setThemSettings); - this.syncSettings({ theme: 'theme' }); - - const noUpdate = this.noUpdate; - - if (noUpdate) { - this._onChangeMainParams(); - } else { - this._poll = this._createPoll(); - } - } - - /** - * @private - */ - _setThemSettings() { - const { wAssetRateChart } = user.getThemeSettings(); - this.options.view.rate.fillColor = wAssetRateChart.seriesColor; - this.options.view.rate.lineColor = wAssetRateChart.lineColor; - } - - /** - * @private - */ - _onChangeNoUpdate() { - const noUpdate = this.noUpdate; - - if (noUpdate && !this._poll) { - this._poll = this._createPoll(); - } - - if (!noUpdate && this._poll) { - this._poll.destroy(); - this._poll = null; - } - } - - /** - * @private - */ - _onChangeMainParams() { - if (this._poll) { - this._poll.restart(); - } else { - this._getGraphData().then(values => { - this.chartData = values; - }, () => null); - } - } - - /** - * @return {Promise<{values: {rate: number, timestamp: Date}[]}>} - * @private - */ - _getGraphData() { - const startDate = this.startFrom || utils.moment().add().day(-100); - const assetId = this.assetId; - const baseAssetId = this.chartToId || user.getSetting('baseAssetId'); - - if (!assetId || (baseAssetId === assetId)) { - return Promise.resolve(null); - } - - return waves.utils.getRateHistory(assetId, baseAssetId, startDate) - .then(map(item => ({ ...item, rate: Number(item.rate.toFixed()) }))) - .then(rate => ({ rate })); - } - - /** - * @return {Poll} - * @private - */ - _createPoll() { - return createPoll(this, this._getGraphData, 'chartData', 15000); - } - - } - - return new AssetRateChart(); - }; - - controller.$inject = [ - 'Base', - 'createPoll', - 'waves', - 'utils', - 'user' - ]; - - angular.module('app.ui').component('wAssetRateChart', { - bindings: { - startFrom: '<', - assetId: '<', - noUpdate: '<', - chartToId: '<' - }, - template: '', - transclude: false, - controller - }); -})(); - -/** - * @typedef {object} TChartOptions - * @property {string} axisX - * @property {string} axisY - * @property {number} marginBottom - * @property {boolean} hasDates - * @property {boolean | number} checkWidth - * @property {TView} view - */ - -/** - * @typedef {Object} TView - */ diff --git a/src/modules/ui/directives/assetRateChart/assetRateChart.less b/src/modules/ui/directives/assetRateChart/assetRateChart.less deleted file mode 100644 index e859df1bd1..0000000000 --- a/src/modules/ui/directives/assetRateChart/assetRateChart.less +++ /dev/null @@ -1,19 +0,0 @@ -.asset-rate-chart { - display: block; - width: 100%; - height: 100%; - position: absolute; - - &__interactive-stop { - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - } - - .chart-tooltip, - .chart-legend { // Lib ng3-charts - display: none !important; - } -} \ No newline at end of file diff --git a/src/modules/ui/directives/assetStatus/AssetStatus.js b/src/modules/ui/directives/assetStatus/AssetStatus.js deleted file mode 100644 index 4650c223f0..0000000000 --- a/src/modules/ui/directives/assetStatus/AssetStatus.js +++ /dev/null @@ -1,56 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param $scope - * @param user - * @param waves - * @param utils - * @return {AssetInfoHead} - */ - const controller = function (Base, $scope, user, waves, utils) { - - class AssetInfoHead extends Base { - - $postLink() { - this._getAssetInfo(); - this.observe('assetId', this._getAssetInfo); - } - - /** - * @private - */ - _getAssetInfo() { - const { - isVerified, - isGateway, - isTokenomica, - isSuspicious, - isGatewaySoon, - hasLabel - } = utils.getDataFromOracles(this.assetId); - this.isGateway = isGateway; - this.isTokenomica = isGateway ? false : isTokenomica; - this.isVerified = isTokenomica ? false : isVerified; - this.isSuspicious = isVerified ? false : isSuspicious; - this.isGatewaySoon = isGateway ? false : isGatewaySoon; - this.hasLabel = hasLabel; - } - - } - - return new AssetInfoHead(); - }; - - controller.$inject = ['Base', '$scope', 'user', 'waves', 'utils']; - - angular.module('app.ui') - .component('wAssetStatus', { - controller: controller, - templateUrl: 'modules/ui/directives/assetStatus/asset-status.html', - bindings: { - assetId: '<' - } - }); -})(); diff --git a/src/modules/ui/directives/assetStatus/asset-status.html b/src/modules/ui/directives/assetStatus/asset-status.html deleted file mode 100644 index e9c297ef75..0000000000 --- a/src/modules/ui/directives/assetStatus/asset-status.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - diff --git a/src/modules/ui/directives/assetStatus/assetStatus.less b/src/modules/ui/directives/assetStatus/assetStatus.less deleted file mode 100644 index afc20720e9..0000000000 --- a/src/modules/ui/directives/assetStatus/assetStatus.less +++ /dev/null @@ -1,3 +0,0 @@ -w-asset-status { - display: inline-flex; -} diff --git a/src/modules/ui/directives/balanceInput/BalanceInput.js b/src/modules/ui/directives/balanceInput/BalanceInput.js deleted file mode 100644 index 3eeaca47bd..0000000000 --- a/src/modules/ui/directives/balanceInput/BalanceInput.js +++ /dev/null @@ -1,159 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param {Waves} waves - * @param {object} $attrs - * @param {app.utils} utils - * @return {BalanceInput} - */ - const controller = function (Base, waves, $attrs, utils) { - - class BalanceInput extends Base { - - - constructor() { - super(); - /** - * @type {string} - */ - this.name = null; - /** - * @type {boolean} - */ - this.focus = false; - /** - * @type {Money} - */ - this.amount = null; - /** - * @type {string} - */ - this.assetId = null; - /** - * @type {Money} - */ - this.maxBalance = null; - /** - * @type {Money|Array} - */ - this.fee = null; - /** - * @type {Money} - */ - this.realMaxBalance = null; - /** - * @type {function} - */ - this.fillMax = null; - - this.observe('assetId', this._onChangeAssetId); - this.observe(['fee', 'maxBalance'], this._setMaxBalance); - this.observe('focus', () => { - if (this.focus) { - this.onFocus(); - } else { - this.onBlur(); - } - }); - } - - $postLink() { - if (!this.name) { - throw new Error('Has no name for input!'); - } - } - - fillMaxClick() { - if ($attrs.fillMax) { - this.fillMax(); - return null; - } - if (this.maxBalance) { - - const feeHash = utils.groupMoney(utils.toArray(this.fee)); - let amount = null; - - if (feeHash[this.assetId]) { - amount = this.maxBalance.sub(feeHash[this.assetId]); - } else { - amount = this.maxBalance; - } - - if (amount.getTokens().lt(0)) { - this.amount = this.maxBalance.cloneWithTokens('0'); - } else { - this.amount = amount; - } - } - } - - /** - * @private - */ - _setMaxBalance() { - if (this.fee && this.maxBalance) { - /** - * @type {Money[]} - */ - const feeList = utils.toArray(this.fee); - const feeHash = utils.groupMoney(feeList); - - if (feeHash[this.maxBalance.asset.id]) { - const max = this.maxBalance.sub(feeHash[this.maxBalance.asset.id]); - if (max.getTokens().lt(0)) { - this.realMaxBalance = this.maxBalance.cloneWithTokens('0'); - } else { - this.realMaxBalance = max; - } - } else { - this.realMaxBalance = this.maxBalance; - } - } else { - this.realMaxBalance = this.maxBalance; - } - } - - /** - * @private - */ - _onChangeAssetId() { - if (!this.assetId) { - return null; - } - ds.moneyFromTokens('0', this.assetId).then((money) => { - this.asset = money.asset; - if (!this.amount) { - this.amount = money; - } - }); - } - - } - - return new BalanceInput(); - }; - - controller.$inject = ['Base', 'waves', '$attrs', 'utils']; - - angular.module('app.ui').component('wBalanceInput', { - bindings: { - name: '@', - inputClasses: '@', - fillMax: '&', - onFocus: '&', - onBlur: '&', - amount: '=', - assetId: '<', - maxBalance: '<', - fee: '<', - min: '<', - minGte: '<', - disabled: '<' - }, - scope: false, - templateUrl: 'modules/ui/directives/balanceInput/balanceInput.html', - controller - }); -})(); diff --git a/src/modules/ui/directives/balanceInput/balanceInput.html b/src/modules/ui/directives/balanceInput/balanceInput.html deleted file mode 100644 index e7da84c1c8..0000000000 --- a/src/modules/ui/directives/balanceInput/balanceInput.html +++ /dev/null @@ -1,24 +0,0 @@ -
- -
{{$ctrl.asset.displayName}} -
-
- -
-
diff --git a/src/modules/ui/directives/balanceInput/balanceInput.less b/src/modules/ui/directives/balanceInput/balanceInput.less deleted file mode 100644 index 46eb547b88..0000000000 --- a/src/modules/ui/directives/balanceInput/balanceInput.less +++ /dev/null @@ -1,41 +0,0 @@ -@import (reference) 'config'; - -w-balance-input { - display: block; - width: 100%; - - .input-wrap { - position: relative; - - .w-input-wrap input { - font-size: 17px; - height: 54px; - } - - .currency { - max-width: 40px; - text-overflow: ellipsis; - text-transform: uppercase; - position: absolute; - top: 50%; - transform: translateY(-50%); - right: 15px; - overflow: hidden; - white-space: nowrap; - } - - .send-all { - cursor: pointer; - background-color: @color-white; - font-size: 11px; - border-radius: @border-radius; - border: 1px solid #5a81ea; - position: absolute; - top: 50%; - transform: translateY(-50%); - right: 16px; - padding: 3px 8px; - color: @color-submit-300; - } - } -} diff --git a/src/modules/ui/directives/carousel/Carousel.js b/src/modules/ui/directives/carousel/Carousel.js deleted file mode 100644 index 82edd67814..0000000000 --- a/src/modules/ui/directives/carousel/Carousel.js +++ /dev/null @@ -1,301 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param {$rootScope.Scope} $scope - * @param {jQuery} $element - * @param $timeout - * @param carouselManager - * @param ChartFactory - * @param {app.utils} utils - * @return {Carousel} - */ - const controller = function ($element, $timeout, carouselManager, utils, Base, $scope, ChartFactory) { - - const { last } = require('ramda'); - - const chartOptions = { - red: { - axisX: 'timestamp', - axisY: 'rate', - view: { - rate: { - lineColor: '#ef4829', - fillColor: '#FFF', - gradientColor: ['#FEEFEC', '#FFF'], - lineWidth: 4 - } - } - }, - blue: { - axisX: 'timestamp', - axisY: 'rate', - view: { - rate: { - lineColor: '#1f5af6', - fillColor: '#FFF', - gradientColor: ['#EAF0FE', '#FFF'], - lineWidth: 4 - } - } - } - }; - - class Carousel extends Base { - - /** - * @type {number} - */ - length = null; - /** - * @type {string} - * @private - */ - id = null; - /** - * @type {number} - * @private - */ - interval = null; - /** - * @private - */ - timer = null; - /** - * @private - * @type {number} - */ - _diff = null; - /** - * @private - * @type {jQuery} - */ - $slides = null; - /** - * @private - * @type {Array} - */ - _coords = null; - - $postLink() { - this.observeOnce('pairsInfoList', () => { - utils.postDigest($scope).then(() => { - carouselManager.registerSlider(this.id, this); - this.interval = Number(this.interval) || 0; - this.$slidesContainer = $element.find('.slider-content:first'); - this.$slides = $element.find('.slider-content:first').children(); - this._mapSlides = this.$slides.toArray().map(slide => ({ $slide: $(slide), translateX: null })); - - this._fillGraphs(); - this._remapSlides(); - - const onResize = utils.debounceRequestAnimationFrame(() => { - this._remapSlides(); - this.initializeInterval(); - }); - this.listenEventEmitter($(window), 'resize', onResize); - - $element.hover(() => { - this.stopInterval(); - }, () => { - this.initializeInterval(); - }); - - this.initializeInterval(); - }); - }); - - } - - $onDestroy() { - carouselManager.removeSlider(this.id); - } - - initializeInterval() { - if (this.interval) { - if (this.timer) { - this.stopInterval(); - } - this.timer = $timeout(() => this._step(), this.interval); - } - } - - stopInterval() { - if (this.interval && this.timer) { - $timeout.cancel(this.timer); - this.timer = null; - } - } - - /** - * @public - */ - goToDexDemo(pairAssets) { - utils.openDex(pairAssets.assetId1, pairAssets.assetId2, 'dex-demo'); - } - - /** - * @private - */ - _fillGraphs() { - this._mapSlides.forEach(({ $slide }, i) => { - const info = this.pairsInfoList[i]; - const options = info.change24.gt(0) ? chartOptions.blue : chartOptions.red; - const chartData = { - rate: info.rateHistory - }; - new ChartFactory( - $slide.find('.graph'), - options, - chartData - ); - }); - } - - /** - * @private - */ - _remapSlides() { - this._stopSlides(); - this.slidesAmount = Carousel._getSlidesInWindowAmount(window.innerWidth); - - const { width, startCoords } = this._getWidthAndStart(); - this._diff = startCoords.length > 1 ? startCoords[1] - startCoords[0] : width + 10; - this._coords = this.$slides.toArray().map((element, i) => (i - 1) * this._diff); - - this._mapSlides.forEach((slide, i) => { - slide.translateX = this._coords[i]; - slide.$slide.css({ transform: `translateX(${this._coords[i]}px)` }); - }); - - this.$slides.addClass('absolute'); - } - - /** - * @private - */ - _getWidthAndStart() { - const tempSlidesContainer = this.$slidesContainer.clone(); - tempSlidesContainer.find('.slide').slice(this.slidesAmount).remove(); - const slides = tempSlidesContainer.find('.slide'); - slides - .removeAttr('style') - .removeClass('absolute'); - tempSlidesContainer.appendTo($element.find('.slider')); - - const width = slides.outerWidth(); - const startCoords = slides - .toArray() - .map(slide => Math.round($(slide).offset().left)); - - tempSlidesContainer.remove(); - return { width, startCoords }; - } - - /** - * @private - */ - static _getSlidesInWindowAmount(width) { - switch (true) { - case (width < 620): - return 1; - case (width < 1000): - return 2; - case (width < 1440): - return 3; - default: - return 4; - } - } - - /** - * @return Promise - * @private - */ - _move() { - const lastPos = last(this._coords); - return Promise.all(this._mapSlides.map(slide => { - const $slide = slide.$slide; - const start = slide.translateX; - const duration = 1000; - const end = start - this._diff; - slide.translateX = end; - const opacity = this._switchOpacity(end); - - return utils.animate($slide, { - opacity, - progress: 1 - }, { - duration: duration, - progress: this._animateProgress(start, end, $slide), - complete: () => { - if (end < -this._diff) { - $slide.css('transform', `translateX(${lastPos}px)`); - slide.translateX = lastPos; - } - } - }); - })); - } - - /** - * @private - */ - _animateProgress(start, end, slide) { - return (animation, progress) => { - slide.css('transform', `translateX(${start + ((end - start) * progress)}px)`); - }; - } - - /** - * @private - */ - _step() { - this.stopInterval(); - this._move().then(() => { - this.initializeInterval(); - }); - } - - /** - * @private - */ - _switchOpacity(newPos) { - switch (true) { - case (newPos < -this._diff || newPos > this._coords[this.slidesAmount + 1]): - return 0; - case (newPos < 0 || newPos > this._coords[this.slidesAmount]): - return 0.2; - default: - return 1; - } - } - - /** - * @private - */ - _stopSlides() { - this._mapSlides.forEach(slide => { - slide.$slide.stop(); - }); - } - - } - - return new Carousel(); - }; - - controller.$inject = ['$element', '$timeout', 'carouselManager', 'utils', 'Base', '$scope', 'ChartFactory']; - - angular.module('app.ui').component('wCarousel', { - transclude: true, - bindings: { - id: '@', - interval: '@', - pairsInfoList: '<' - }, - controller: controller, - templateUrl: 'modules/ui/directives/carousel/carousel.html' - }); -})(); diff --git a/src/modules/ui/directives/carousel/carousel.html b/src/modules/ui/directives/carousel/carousel.html deleted file mode 100644 index d48a3e1ec7..0000000000 --- a/src/modules/ui/directives/carousel/carousel.html +++ /dev/null @@ -1,29 +0,0 @@ -
-
-
-
-
-
- {{pair.amountAsset.ticker || pair.amountAsset.displayName }} / {{pair.priceAsset.ticker || pair.priceAsset.displayName}} -
-
{{pair.change24}}%
-
-
-
-

- -

-
Volume: - -
-
-
-
-
-
-
-
diff --git a/src/modules/ui/directives/carousel/carousel.less b/src/modules/ui/directives/carousel/carousel.less deleted file mode 100644 index 356a6e2098..0000000000 --- a/src/modules/ui/directives/carousel/carousel.less +++ /dev/null @@ -1,86 +0,0 @@ -@import (reference) 'config'; - -w-carousel { - display: block; - height: 140px; - margin: 60px 0; -} - -.graph { - margin-left: 10px; -} - -.slider { - display: block; - overflow: visible; - width: 100%; - height: 100%; - position: relative; -} - -.slider-content { - display: flex; - justify-content: space-between; - width: 100%; - height: 100%; - position: absolute; - left: 0; - top: 0; -} - - -.slide { - width: 22%; - min-width: 290px; - overflow: visible; - cursor: pointer; - - &_css-anim { - border-radius: @border-radius; - background: @color-white; - padding: 30px; - transition: all 0.3s; - - &:hover { - box-shadow: 0 1rem 2.5rem rgba(58, 78, 136, 0.1), 0 0.5rem 1rem -0.75rem rgba(58, 78, 136, 0.1) !important; - transform: translate3d(0, -3px, 0); - } - } - - .graph { - width: 80px; - height: 46px; - position: relative; - } - - .red { - color: @color-error-500; - } - - .blue { - color: @color-submit-400; - } - - h2 { - font-weight: normal; - margin: 0 0 7px; - } -} - -@media screen and (max-width: 1439px) { - .slide { - width: 31%; - } -} - -@media screen and (max-width: 999px) { - .slide { - width: 48%; - } -} - -@media screen and (max-width: 619px) { - .slide { - width: 100%; - } -} \ No newline at end of file diff --git a/src/modules/ui/directives/carouselDots/CarouselDots.js b/src/modules/ui/directives/carouselDots/CarouselDots.js deleted file mode 100644 index 2fb9e0afb2..0000000000 --- a/src/modules/ui/directives/carouselDots/CarouselDots.js +++ /dev/null @@ -1,76 +0,0 @@ -(function () { - 'use strict'; - - function controller(carouselManager) { - - - class CarouselDots { - - /** - * @constructor - * @param {CarouselManager} carouselManager - */ - constructor() { - /** - * @type {string} - */ - this.sliderId = null; - /** - * @type {Array} - */ - this.dots = []; - /** - * @type {Carousel} - */ - this.slider = null; - this.$postLink = () => { - this.slider = carouselManager.getSlider(this.sliderId) - .then((slider) => { - this.slider = slider; - this.initialize(); - }); - }; - } - - initialize() { - const loop = (i) => { - const dot = Object.create(null); - dot.index = i; - Object.defineProperty(dot, 'active', { - get: () => { - return this.slider.getActive() === i; - } - }); - this.dots.push(dot); - }; - for (let i = 0; i < this.slider.length; i++) { - loop(i); - } - } - - getClass(dot) { - return dot.active ? 'active' : ''; - } - - onClick(dot) { - if (!dot.active) { - this.slider.goTo(dot.index); - } - } - - } - - return new CarouselDots(); - } - - controller.$inject = ['carouselManager']; - - angular.module('app.ui').component('wCarouselDots', { - transclude: true, - bindings: { - sliderId: '@' - }, - controller: controller, - templateUrl: 'modules/ui/directives/carouselDots/dots.html' - }); -})(); diff --git a/src/modules/ui/directives/carouselDots/dots.html b/src/modules/ui/directives/carouselDots/dots.html deleted file mode 100644 index 1749659d4d..0000000000 --- a/src/modules/ui/directives/carouselDots/dots.html +++ /dev/null @@ -1,2 +0,0 @@ -
diff --git a/src/modules/ui/directives/carouselDots/dots.less b/src/modules/ui/directives/carouselDots/dots.less deleted file mode 100644 index 2aef40890b..0000000000 --- a/src/modules/ui/directives/carouselDots/dots.less +++ /dev/null @@ -1,51 +0,0 @@ -@import (reference) 'config'; - -w-carousel-dots { - display: flex; - flex-direction: row; - justify-content: center; - - .dot { - display: inline-block; - cursor: pointer; - position: relative; - width: 22px; - height: 22px; - margin: 0 8px; - - &::before { - border-radius: 50%; - width: 8px; - height: 8px; - position: absolute; - top: 50%; - left: 50%; - content: ''; - display: block; - transform: translate(-50%, -50%); - border: solid 1px @color-basic-500; - transition: .3s; - } - - &:hover { - &::before { - background: @color-basic-200; - } - } - - &.active { - &::before { - background-color: @color-submit-400; - border: solid 1px @color-submit-400; - cursor: default; - } - } - } - - &.square .dot { - &::before { - border-radius: 0; - transform: translate(-50%, -50%) rotate(45deg); - } - } -} diff --git a/src/modules/ui/directives/change24/Change24.js b/src/modules/ui/directives/change24/Change24.js deleted file mode 100644 index b5d8bce24e..0000000000 --- a/src/modules/ui/directives/change24/Change24.js +++ /dev/null @@ -1,115 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param {object} $attrs - * @param {IPollCreate} createPoll - * @param {JQuery} $element - * @param {Waves} waves - * @return {Change24} - */ - const controller = function (Base, $attrs, createPoll, $element, waves) { - - class Change24 extends Base { - - constructor() { - super(); - /** - * @type {string} - */ - this.assetFrom = null; - /** - * @type {string} - */ - this.assetTo = null; - /** - * @type {Number} - */ - this.precision = null; - /** - * @type {number} - */ - this.interval = null; - /** - * @type {boolean} - */ - this.directionByPair = null; - } - - $postLink() { - this.precision = Number(this.precision) || 2; - this.interval = Number(this.interval) || 5000; - - let handler = null; - if ($attrs.noUpdate) { - - const apply = () => { - const onFulfilled = this._setChange.bind(this); - this._getChange().then(onFulfilled, onFulfilled); - }; - - apply(); - handler = apply; - } else { - const poll = createPoll(this, this._getChange, this._setChange, this.interval); - handler = () => { - poll.restart(); - }; - } - - this.observe(['assetFrom', 'assetTo'], handler); - } - - /** - * @return {Promise} - * @private - */ - _getChange() { - if (this.assetFrom && this.assetTo) { - if (this.directionByPair) { - return ds.api.pairs.get(this.assetFrom, this.assetTo).then((pair) => { - return waves.utils.getChange(pair.amountAsset.id, pair.priceAsset.id); - }); - } - return waves.utils.getChange(this.assetFrom, this.assetTo); - } else { - return Promise.resolve(null); - } - } - - /** - * @param data - * @private - */ - _setChange(data) { - if (typeof data === 'number') { - $element.toggleClass('green', data > 0); - $element.toggleClass('red', data < 0); - $element.html(data.toFixed(this.precision)); - } else { - $element.html('—'); - } - } - - } - - return new Change24(); - }; - - controller.$inject = ['Base', '$attrs', 'createPoll', '$element', 'waves', 'i18n']; - - angular.module('app.ui').component('wChange24', { - bindings: { - assetFrom: '<', - assetTo: '<', - directionByPair: '<', - precision: '@', - noUpdate: '@', - interval: '@', - ns: '@' - }, - transclude: false, - controller - }); -})(); diff --git a/src/modules/ui/directives/changeLanguage/ChangeLanguage.js b/src/modules/ui/directives/changeLanguage/ChangeLanguage.js index 6715c64201..c78842c5fc 100644 --- a/src/modules/ui/directives/changeLanguage/ChangeLanguage.js +++ b/src/modules/ui/directives/changeLanguage/ChangeLanguage.js @@ -55,6 +55,7 @@ const active = this.active; if (active) { i18next.changeLanguage(active); + localStorage.setItem('lng', active); this.onChange({ language: active }); } } diff --git a/src/modules/ui/directives/changeLanguage/changeLanguage.html b/src/modules/ui/directives/changeLanguage/changeLanguage.html index 50d60f1ba7..9d62cced62 100644 --- a/src/modules/ui/directives/changeLanguage/changeLanguage.html +++ b/src/modules/ui/directives/changeLanguage/changeLanguage.html @@ -1,4 +1,4 @@ - +
{{ ::lng.name }}
 diff --git a/src/modules/ui/directives/changeLanguage/changeLanguage.less b/src/modules/ui/directives/changeLanguage/changeLanguage.less index b401c94774..8c318c8853 100644 --- a/src/modules/ui/directives/changeLanguage/changeLanguage.less +++ b/src/modules/ui/directives/changeLanguage/changeLanguage.less @@ -1,77 +1,43 @@ @import (reference) 'config'; - -.web-footer-language { - .select { - width: 200px; - position: relative; - -moz-appearance: none; - -webkit-appearance: none; - font-size: 15px; - padding: 0; - right: 0; - top: 0; - - .select__wrap { - background: @footer-background; - line-height: 40px; - height: 40px; - color: @color-white; - - &.expanded .select__title { - border: 1px solid @changeLang-border-footer; - border-top: 0 none; - border-radius: 0; - - &::after { - transition: .5s; - transform: translateY(-50%) rotate(180deg); - } - } - - } - - .select__title { - border: 1px solid @changeLang-border-footer; - border-radius: 2px; - background: none transparent; - padding: 0 15px; - color: @white-only; - } - - &__list { - background: @footer-background; - border-radius: 4px 4px 0 0; - flex-direction: column-reverse; - border: 1px solid @changeLang-border-footer; - border-bottom: 0 none; - box-shadow: none; - border-top: 1px solid @color-basic-200; - transform: translateY(-100%); - margin-top: -39px; - - w-option.active { - display: none; - } - - .option { - transition: .3s; - padding: 0 15px; - color: @white-only; - - &:hover { - background: @footer-select-bg-hover; - } - } - } - - .lng-item { - display: flex; - align-items: center; - font-size: @font-size-control; - - &::before { - margin-right: 10px; - } - } - } +@import (reference) 'icons'; + +.footer-language { + .select { + .select__wrap { + &.expanded .select__title { + border-radius: 0 0 4px 4px; + } + } + + &_change-lang { + .select__wrap.expanded { + .select__title { + border: 1px solid @color-basic-200; + border-top: 1px solid transparent; + } + } + } + + &__list { + border-radius: 4px 4px 0 0; + } + } } + +@media screen and (max-width: 480px) { + .footer-language { + .select { + &_change-lang { + width: 100px; + } + + &__title { + padding: 0 15px; + + &::after { + right: 4px; + } + } + } + } +} \ No newline at end of file diff --git a/src/modules/ui/directives/changeRate/ChangeRate.js b/src/modules/ui/directives/changeRate/ChangeRate.js deleted file mode 100644 index 77a53be994..0000000000 --- a/src/modules/ui/directives/changeRate/ChangeRate.js +++ /dev/null @@ -1,98 +0,0 @@ -(function () { - 'use strict'; - - const { BigNumber } = require('@waves/bignumber'); - - /** - * @param Base - * @param {Waves} waves - * @param {User} user - * @param {IPollCreate} createPoll - * @param {$rootScope.Scope} $scope - * @return {ChangeRate} - */ - const controller = function (Base, waves, user, createPoll, $scope) { - - class ChangeRate extends Base { - - constructor() { - super(); - /** - * @type {BigNumber} - */ - this.rate = null; - /** - * @type {string} - */ - this.assetId = null; - /** - * @type {Asset} - */ - this.mirror = null; - /** - * @type {number} // TODO Add rate for date support. Author Tsigel at 14/11/2017 11:26 - */ - this.date = null; - /** - * @type {Poll} - */ - this.poll = null; - - this.observe('assetId', this._onChangeAssetId); - } - - $postLink() { - this.interval = Number(this.interval) || 5000; - - waves.node.assets.getAsset(user.getSetting('baseAssetId')) - .then((mirror) => { - this.mirror = mirror; - - if (!this.noUpdate) { - this.poll = createPoll(this, this._getRate, 'rate', this.interval, { $scope }); - } else { - this._onChangeAssetId(); - } - }); - } - - /** - * @private - */ - _onChangeAssetId() { - if (this.assetId) { - if (this.poll) { - this.poll.restart(); - } else { - this._getRate().then((rate) => { - this.rate = rate; - $scope.$digest(); - }); - } - } - } - - _getRate() { - return this.assetId && this.mirror && waves.utils.getRate(this.assetId, this.mirror.id) - .then((rate) => rate) || Promise.resolve(new BigNumber(0)); - } - - } - - return new ChangeRate(); - }; - - controller.$inject = ['Base', 'waves', 'user', 'createPoll', '$scope']; - - angular.module('app.ui').component('wChangeRate', { - bindings: { - assetId: '<', - noUpdate: '@', - interval: '@', - date: '@' - }, - template: '', - transclude: false, - controller - }); -})(); diff --git a/src/modules/ui/directives/coinomatTerms/CoinomatTerms.js b/src/modules/ui/directives/coinomatTerms/CoinomatTerms.js deleted file mode 100644 index 13cada21be..0000000000 --- a/src/modules/ui/directives/coinomatTerms/CoinomatTerms.js +++ /dev/null @@ -1,211 +0,0 @@ -(function () { - 'use strict'; - - const ds = require('data-service'); - const { SIGN_TYPE } = require('@waves/signature-adapter'); - - /** - * @param {typeof Base} Base - * @param {$rootScope.Scope} $scope - * @param {User} user - * @param {CoinomatService} coinomatService - */ - const controller = function (Base, $scope, user, coinomatService) { - - class CoinomatTerms extends Base { - - /** - * @type {boolean} - */ - termsAccepted = false; - /** - * @type {boolean} - */ - termsAcceptedFreeze = false; - /** - * @type {boolean} - */ - canShowTerms = false; - /** - * @type {boolean} - */ - canShowCheckBox = false; - /** - * @type {boolean} - */ - isVerified = false; - /** - * @type {boolean} - */ - userModelTerms = false; - /** - * @type {boolean} - */ - signPending = false; - /** - * @type {Signable} - */ - signable = null; - /** - * @type {boolean} - */ - forceShowTerms = false; - /** - * @type {boolean} - */ - showAcceptedCheckbox = false; - /** - * @type {Function} - */ - onSignStart = null; - /** - * @type {Function} - */ - onSignEnd = null; - /** - * @type {boolean} - */ - termsPending = false; - /** - * @type {null} - */ - loadError = null; - /** - * @type {number} - * @private - */ - _ts = 0; - - - constructor() { - super(); - - this.observe(['forceShowTerms', 'termsAcceptedFreeze'], this._currentCanShowTerms); - this.observe(['showAcceptedCheckbox', 'termsAcceptedFreeze'], this._currentCanShowCheckbox); - } - - $postLink() { - this.termsPending = true; - - Promise.all([ - coinomatService.hasConfirmation(user.address), - coinomatService.isVerified(user.address) - ]).then(([terms, verified]) => { - - this.termsAccepted = terms; - this.userModelTerms = terms; - this.termsAcceptedFreeze = terms; - this.isVerified = verified; - this.termsPending = false; - - this.observe('userModelTerms', this._onChangeTerms); - this._currentCanShowTerms(); - this._currentCanShowCheckbox(); - - $scope.$apply(); - }).catch(e => { - this.loadError = e; - this.termsPending = false; - this._currentCanShowTerms(); - this._currentCanShowCheckbox(); - $scope.$apply(); - }); - } - - onSignCancel() { - this.signPending = false; - this.userModelTerms = this.termsAccepted; - this.signable = null; - - this.onSignEnd(); - } - - onSignSuccess(signature) { - return coinomatService.setCoinomatTermsAccepted(signature, this._ts, this.userModelTerms) - .catch(() => { - this.userModelTerms = this.termsAccepted; - }) - .then(() => { - this.signPending = false; - this.signable = null; - this._ts = 0; - this.termsAccepted = this.userModelTerms; - - this.onSignEnd(); - $scope.$apply(); - }); - } - - /** - * @private - */ - _currentCanShowTerms() { - this.canShowTerms = this.forceShowTerms || !this.termsAcceptedFreeze; - } - - /** - * @private - */ - _currentCanShowCheckbox() { - this.canShowCheckBox = this.showAcceptedCheckbox || this.isVerified && !this.termsAcceptedFreeze; - } - - /** - * @private - */ - _onChangeTerms() { - - if (this.termsAccepted === this.userModelTerms) { - return null; - } - - this.signPending = true; - this.onSignStart(); - - return coinomatService.getCoinomatTimestamp() - .then(ts => { - this._ts = ts; - return ts; - }) - .then(CoinomatTerms._createSignable) - .then(signable => { - this.signable = signable; - $scope.$apply(); - }); - } - - /** - * @param {number} timestamp - * @return {Signable} - * @private - */ - static _createSignable(timestamp) { - return ds.signature.getSignatureApi().makeSignable({ - type: SIGN_TYPE.COINOMAT_CONFIRMATION, - data: { timestamp } - }); - } - - } - - return new CoinomatTerms(); - }; - - controller.$inject = ['Base', '$scope', 'user', 'coinomatService']; - - angular.module('app.ui').component('wCoinomatTerms', { - controller, - scope: false, - templateUrl: 'modules/ui/directives/coinomatTerms/coinomat-terms.html', - bindings: { - onSignStart: '&', - onSignEnd: '&', - isVerified: '=', - termsAccepted: '=', - termsPending: '=', - loadError: '=', - forceShowTerms: '<', - showAcceptedCheckbox: '<' - } - }); -})(); diff --git a/src/modules/ui/directives/coinomatTerms/coinomat-terms.html b/src/modules/ui/directives/coinomatTerms/coinomat-terms.html deleted file mode 100644 index 6c11be82d4..0000000000 --- a/src/modules/ui/directives/coinomatTerms/coinomat-terms.html +++ /dev/null @@ -1,30 +0,0 @@ -
-
-
-
-
- -
- - - - - -
- -
- -
-
- - -
diff --git a/src/modules/ui/directives/confirmGatewayTransaction/ConfirmGatewayTransaction.js b/src/modules/ui/directives/confirmGatewayTransaction/ConfirmGatewayTransaction.js deleted file mode 100644 index 12f9fdaf35..0000000000 --- a/src/modules/ui/directives/confirmGatewayTransaction/ConfirmGatewayTransaction.js +++ /dev/null @@ -1,92 +0,0 @@ -/* eslint-disable no-console */ -(function () { - 'use strict'; - - const analytics = require('@waves/event-sender'); - const ds = require('data-service'); - const WAVES_GATEWAY_ASSETS_ID = [ - WavesApp.defaultAssets.WEST, - WavesApp.defaultAssets.ERGO, - WavesApp.defaultAssets.BNT, - WavesApp.defaultAssets.ETH - // WavesApp.defaultAssets.BTC - ]; - - /** - * @param {typeof ConfirmTxService} ConfirmTxService - * @param {$rootScope.Scope} $scope - */ - const controller = function (ConfirmTxService, $scope) { - - class ConfirmGatewayTransaction extends ConfirmTxService { - - /** - * @type {string} - */ - targetRecipient = ''; - /** - * @type {IGatewayDetails} - */ - gatewayDetails = null; - - constructor(props) { - super(props); - this.observe(['gatewayDetails', 'tx'], () => { - if (!this.gatewayDetails || !this.tx) { - return null; - } - - const fee = this.tx.amount.cloneWithTokens(this.gatewayDetails.gatewayFee); - this.tx.amount = this.tx.amount.sub(fee); - }); - } - - getEventName() { - return 'Gateway'; - } - - sendTransaction() { - const signableAmountAsset = this.signable.getTxData().amount.asset; - if (!WAVES_GATEWAY_ASSETS_ID.includes(signableAmountAsset.id)) { - return super.sendTransaction(); - } - - return this.signable.getDataForApi() - .then(data => { - return ds.fetch(`${WavesApp.network.wavesGateway}/api/v1/external/send`, { - method: 'POST', - body: WavesApp.stringifyJSON({ - ...data, - sender: ds.app.address - }) - }); - }) - .then(data => { - analytics.send({ name: `${signableAmountAsset.name.toUpperCase()} Transaction Success` }); - return data; - }, (error) => { - analytics.send({ name: `${signableAmountAsset.name.toUpperCase()} Transaction Error` }); - return Promise.reject(error); - }); - } - - } - - return new ConfirmGatewayTransaction($scope); - }; - - controller.$inject = ['ConfirmTxService', '$scope']; - - angular.module('app.ui').component('wConfirmGatewayTransaction', { - bindings: { - signable: '<', - gatewayDetails: '<', - targetRecipient: '<', - onClickBack: '&' - }, - templateUrl: 'modules/ui/directives/confirmGatewayTransaction/confirmGatewayTransaction.html', - scope: false, - transclude: false, - controller - }); -})(); diff --git a/src/modules/ui/directives/confirmGatewayTransaction/confirmGatewayTransaction.html b/src/modules/ui/directives/confirmGatewayTransaction/confirmGatewayTransaction.html deleted file mode 100644 index 025149d7cf..0000000000 --- a/src/modules/ui/directives/confirmGatewayTransaction/confirmGatewayTransaction.html +++ /dev/null @@ -1,128 +0,0 @@ -
- - - -
-
-
-
-
-
- - - -
-
-
-
-
{{::$ctrl.targetRecipient}}
-
- -
-
-
{{::$ctrl.tx.amount.toFormat()}} - {{::$ctrl.tx.amount.asset.displayName}} -
-
- -
-
-
{{::$ctrl.tx.fee.toFormat()}} {{::$ctrl.tx.fee.asset.displayName}} -
-
- -
-
-
{{::$ctrl.gatewayDetails.address}}
-
- -
-
-
{{::$ctrl.gatewayDetails.gatewayFee}} - {{::$ctrl.tx.amount.asset.displayName}} -
-
-
- -
- - - - - - - - - -
- -
-
-
{{::$ctrl.targetRecipient}}
-
- -
-
-
{{::$ctrl.tx.amount.toFormat()}} {{::$ctrl.tx.amount.asset.displayName}}
-
- -
-
-
{{::$ctrl.tx.fee.toFormat()}} {{::$ctrl.tx.fee.asset.displayName}}
-
- -
-
-
{{::$ctrl.gatewayDetails.address}}
-
- -
-
-
{{::$ctrl.gatewayDetails.gatewayFee}} {{::$ctrl.tx.amount.asset.displayName}} -
-
- -
- -
- {{$ctrl.errorMessage}} -
- -
-
- - - - - - -
-
- - -
-

-
- - - -
- - -
diff --git a/src/modules/ui/directives/confirmGatewayTransaction/confirmGatewayTransaction.less b/src/modules/ui/directives/confirmGatewayTransaction/confirmGatewayTransaction.less deleted file mode 100644 index d2fee37a16..0000000000 --- a/src/modules/ui/directives/confirmGatewayTransaction/confirmGatewayTransaction.less +++ /dev/null @@ -1,67 +0,0 @@ -@import (reference) 'config'; -@import (reference) '../../../app/less/typography'; - -w-confirm-gateway-transaction { - display: block; - width: 100%; - - .plate-wrapper { - padding-top: 50px; - } - - .section { - display: flex; - align-items: center; - width: 100%; - - justify-content: space-between; - padding: 13px 0; - border-bottom: 1px dotted @color-basic-200; - - .key { - .footnote-1(); - color: @color-disabled-600; - } - - .value { - max-width: 70%; - word-break: break-all; - .footnote-1(); - color: @color-basic-900; - } - } - - .bottom-wrapper { - width: 100%; - margin-top: 30px; - } - - .plate-error { - margin-top: -10px; - } - - h3.info { - text-align: center; - word-break: break-word; - text-transform: lowercase; - } - - .device-loader-wrapper { - text-align: center; - width: 100%; - padding-bottom: 20px; - } - - .loader { - top: 25px; - position: relative; - } -} - -@media screen and (max-width: 540px) { - w-confirm-gateway-transaction { - .buttons-wrapper { - margin-top: 20px; - } - } -} diff --git a/src/modules/ui/directives/confirmTransaction/ConfirmTransaction.js b/src/modules/ui/directives/confirmTransaction/ConfirmTransaction.js deleted file mode 100644 index 70958ba5fe..0000000000 --- a/src/modules/ui/directives/confirmTransaction/ConfirmTransaction.js +++ /dev/null @@ -1,295 +0,0 @@ -/* eslint-disable no-console */ -(function () { - 'use strict'; - - /** - * @param {typeof ConfirmTxService} ConfirmTxService - * @param {$rootScope.Scope} $scope - * @param {validateService} validateService - * @param {app.utils} utils - * @param {Waves} waves - * @param {*} $attrs - * @param {BalanceWatcher} balanceWatcher - * @param {User} user - * @returns {ConfirmTransaction} - */ - const controller = function (ConfirmTxService, $scope, validateService, utils, waves, $attrs, - balanceWatcher, user) { - - const { flatten, propEq } = require('ramda'); - const { SIGN_TYPE } = require('@waves/signature-adapter'); - const analytics = require('@waves/event-sender'); - - const ANALYTICS_TABS_NAMES = { - details: 'View Details', - JSON: 'JSON', - export: 'Export' - }; - - class ConfirmTransaction extends ConfirmTxService { - - locale = $attrs.ns || 'app.ui'; - step = 0; - type = 0; - isSetScript = false; - /** - * @type {Function} - */ - onTransactionSend; - - constructor() { - super($scope); - - this.observe(['signable'], this._showErrors); - this.receive(balanceWatcher.change, this._showErrors, this); - } - - $postLink() { - const tx = this.signable.getTxData(); - this.type = this.signable.type; - - this.isSetScript = this.type === SIGN_TYPE.SET_SCRIPT && tx.script; - this.isTockenIssue = this.type === SIGN_TYPE.ISSUE; - - if (this.isAnyTx) { - this.observe('activeTab', () => { - const name = `Wallet Assets JSON ${ANALYTICS_TABS_NAMES[this.activeTab]} Show`; - analytics.send({ name, target: 'ui' }); - }); - } - - const NAME = this.getEventName(tx); - analytics.send({ name: `${NAME} Info Show`, target: 'ui' }); - - this.signable.hasMySignature().then(state => { - this.step = state ? 1 : 0; - $scope.$apply(); - }); - - if (this.tx.typeName === 'data-vote') { - const findKey = key => tx.data.find(propEq('key', key)); - const assetId = findKey('assetId').value; - waves.node.assets.getAsset(assetId).then(asset => { - this.votedAssetID = asset.displayName; - }); - } - } - - sendTransaction() { - if (this.isAnyTx) { - const name = `Wallet Assets JSON ${ANALYTICS_TABS_NAMES[this.activeTab]} Send Click`; - analytics.send({ name, target: 'ui' }); - } - analytics.send(this._getConfirmAnalytics(this.signable.getTxData(), true)); - return super.sendTransaction().then(data => { - this.onTransactionSend(); - return data; - }); - } - - onChangeSignable() { - super.onChangeSignable(); - if (this.tx) { - this.permissionName = ConfirmTransaction._getPermissionNameByTx(this.signable.type); - } - } - - getSignable() { - return this.signable; - } - - getSignableAndSendEvent() { - switch (this.signable.type) { - case 14: - analytics.send({ name: 'Disable Sponsorship Continue Click', target: 'ui' }); - break; - case 9: - analytics.send({ name: 'Leasing Cancel Sign Click', target: 'ui' }); - break; - default: - break; - } - return this.signable; - } - - nextStep() { - this.step++; - this.initExportLink(); - } - - /** - * @param data - * @param success - * @private - * @return {{name: string, params: {type: *}, target: string}} - */ - _getConfirmAnalytics(data, isOnSendClick) { - const NAME = this.getEventName(data); - const name = isOnSendClick ? - `${NAME} Info Send Click` : - `${NAME} Info Go Back Click`; - - return { name, params: { type: data.type }, target: 'ui' }; - } - - /** - * @private - */ - _showErrors() { - if (!this.signable) { - return null; - } - - let promise; - - const { amount, fee, senderPublicKey } = this.signable.getTxData(); - const { type } = this.signable; - - if (senderPublicKey && senderPublicKey !== user.publicKey) { - return null; - } - - switch (type) { - case SIGN_TYPE.TRANSFER: - promise = Promise.all([ - this._validateAmount(amount, false), - this._validateAmount(fee, true), - this._validateAddress() - ]); - break; - case SIGN_TYPE.CREATE_ORDER: - case SIGN_TYPE.CANCEL_LEASING: - promise = Promise.all([]); - break; - default: - promise = Promise.all([this._validateAmount(fee, true)]); - } - - return promise.then(flatten).then((errors) => { - this.errors = errors; - $scope.$apply(); - }); - } - - /** - * @return {Promise} - * @private - */ - _validateAddress() { - const { recipient } = this.signable.getTxData(); - const errors = []; - return utils.resolve(utils.when(validateService.wavesAddress(recipient))) - .then(({ state }) => { - if (!state) { - errors.push({ - literal: 'confirmTransaction.send.errors.recipient.invalid' - }); - } - return errors; - }); - } - - /** - * @param {Money} amount - * @param {boolean} isFee - * @return {*} - * @private - */ - _validateAmount(amount, isFee) { - const errors = []; - const hash = balanceWatcher.getBalance(); - - if (!hash[amount.asset.id] || - hash[amount.asset.id].lt(amount) || - amount.getTokens().lte(0)) { - - const feeLiteral = 'confirmTransaction.send.errors.fee'; - const balanceLiteral = 'confirmTransaction.send.errors.balance.invalid'; - const literal = isFee ? feeLiteral : balanceLiteral; - - errors.push({ - literal: literal, - data: { fee: amount } - }); - } - - return errors; - } - - /** - * @public - */ - back() { - analytics.send(this._getConfirmAnalytics(this.signable.getTxData(), false)); - this.onClickBack(); - } - - - static _getPermissionNameByTx(type) { - switch (type) { - case SIGN_TYPE.ISSUE: - return 'CAN_ISSUE_TRANSACTION'; - case SIGN_TYPE.TRANSFER: - return 'CAN_TRANSFER_TRANSACTION'; - case SIGN_TYPE.REISSUE: - return 'CAN_REISSUE_TRANSACTION'; - case SIGN_TYPE.BURN: - return 'CAN_BURN_TRANSACTION'; - case 7: - throw new Error('Can\' confirm exchange transaction!'); - case SIGN_TYPE.LEASE: - return 'CAN_LEASE_TRANSACTION'; - case SIGN_TYPE.CANCEL_LEASING: - return 'CAN_CANCEL_LEASE_TRANSACTION'; - case SIGN_TYPE.CREATE_ALIAS: - return 'CAN_CREATE_ALIAS_TRANSACTION'; - case SIGN_TYPE.MASS_TRANSFER: - return 'CAN_MASS_TRANSFER_TRANSACTION'; - case SIGN_TYPE.DATA: - return 'CAN_DATA_TRANSACTION'; - case SIGN_TYPE.SET_SCRIPT: - return 'CAN_SET_SCRIPT_TRANSACTION'; - case SIGN_TYPE.SPONSORSHIP: - return 'CAN_SPONSORSHIP_TRANSACTION'; - case SIGN_TYPE.CREATE_ORDER: - return 'CAN_CREATE_ORDER'; - case SIGN_TYPE.CANCEL_ORDER: - return 'CAN_CANCEL_ORDER'; - default: - return ''; - } - } - - } - - return new ConfirmTransaction(); - }; - - controller.$inject = [ - 'ConfirmTxService', - '$scope', - 'validateService', - 'utils', - 'waves', - '$attrs', - 'balanceWatcher', - 'user' - ]; - - angular.module('app.ui').component('wConfirmTransaction', { - bindings: { - signable: '<', - onClickBack: '&', - onTxSent: '&', - noBackButton: '<', - warning: '<', - onTransactionSend: '&', - referrer: '<', - activeTab: '<', - isAnyTx: '<' - }, - templateUrl: 'modules/ui/directives/confirmTransaction/confirmTransaction.html', - transclude: false, - controller - }); -})(); diff --git a/src/modules/ui/directives/confirmTransaction/confirmTransaction.html b/src/modules/ui/directives/confirmTransaction/confirmTransaction.html deleted file mode 100644 index fd6bb7ca58..0000000000 --- a/src/modules/ui/directives/confirmTransaction/confirmTransaction.html +++ /dev/null @@ -1,165 +0,0 @@ -
- - - -
- -
-
- - - -
-
- - -
- - Icon/80/error-80-error500 - - - - - - -
-

-
- -
- - - - -
- - - - - - - - - - - - - - - - -
-
-
-
-
-
- - - -

- -

- -
-
-
- -
- {{$ctrl.errorMessage}} -
- -
-
-
- -
- - - - - - -
-
-
- - -
- - Icon/80/error-80-error500 - - - - - - -
-

-
- -
- - - -
-
-
-

-
-
-

-
-
-
-
-
- - - -
-
-
- - -
diff --git a/src/modules/ui/directives/confirmTransaction/confirmTransaction.less b/src/modules/ui/directives/confirmTransaction/confirmTransaction.less deleted file mode 100644 index 585273f76a..0000000000 --- a/src/modules/ui/directives/confirmTransaction/confirmTransaction.less +++ /dev/null @@ -1,54 +0,0 @@ -@import (reference) 'config'; - -.txinfo { - display: block; - width: 100%; - - &__wrapper { - w-transaction-info-header + .tabs { - .tabs__wrap .tabs__body { - overflow: inherit; - max-height: none; - } - } - } -} - -w-confirm-transaction { - display: block; - width: 100%; - - .bottom-wrapper { - width: 100%; - border-top: 1px solid @color-basic-100; - } - - .plate-error { - margin-top: -10px; - } - - h3.info { - text-align: center; - word-break: break-word; - text-transform: lowercase; - } - - .device-loader-wrapper { - text-align: center; - width: 100%; - padding-bottom: 20px; - } - - .loader { - top: 25px; - position: relative; - } -} - -@media screen and (max-width: 540px) { - w-confirm-transaction { - .buttons-wrapper { - padding-top: 20px; - } - } -} diff --git a/src/modules/ui/directives/exchange/Exchange.js b/src/modules/ui/directives/exchange/Exchange.js deleted file mode 100644 index 68dec134ab..0000000000 --- a/src/modules/ui/directives/exchange/Exchange.js +++ /dev/null @@ -1,127 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param {IPollCreate} createPoll - * @param {User} user - * @param {Waves} waves - * @param {app.utils} utils - * @param {JQuery} $element - * @param {$rootScope.Scope} $scope - * @return {Exchange} - */ - const controller = function (Base, createPoll, user, waves, utils, $element, $scope) { - - class Exchange extends Base { - - constructor() { - super(); - /** - * @type {Money} - */ - this.balance = null; - /** - * @type {BigNumber} - */ - this.mirrorBalance = null; - /** - * @type {number} - */ - this.interval = null; - /** - * @type {Asset} - */ - this.mirror = null; - /** - * @type {string} - */ - this.targetAssetId = null; - this.noUpdate = null; - this.rateDate = null; // TODO Add support for rate date. Author Tsigel at 14/11/2017 08:19 - /** - * @type {Poll} - */ - this.poll = null; - } - - $postLink() { - this.interval = Number(this.interval) || 5000; - this.noUpdate = this.noUpdate == null; - - waves.node.assets.getAsset(this.targetAssetId || user.getSetting('baseAssetId')) - .then((mirror) => { - this.mirror = mirror; - - if (this.noUpdate) { - this._getMirrorBalance() - .then((balance) => { - this.mirrorBalance = balance; - $scope.$digest(); - }); - } else { - this.poll = - createPoll(this, this._getMirrorBalance, 'mirrorBalance', this.interval, { $scope }); - } - - this.observe('balance', this._onChangeBalance); - this.observe('mirrorBalance', this._onChangeMirrorBalance); - - this._onChangeBalance(); - }); - } - - /** - * @private - */ - _onChangeBalance() { - if (this.balance) { - if (this.noUpdate) { - this._getMirrorBalance() - .then((balance) => { - this.mirrorBalance = balance; - }); - } else { - this.poll.restart(); - } - } - } - - /** - * @return {Promise} - * @private - */ - _getMirrorBalance() { - if (!this.balance) { - return Promise.resolve(null); - } - return waves.utils.getRateApi(this.balance.asset.id, this.mirror.id) - .then((api) => { - return this.balance && api.exchange(this.balance.getTokens()) || 0; - }); - } - - _onChangeMirrorBalance() { - $element.html(this.mirrorBalance ? this.mirrorBalance.toFormat() : ''); - // TODO Investigate. Author Tsigel at 29/11/2017 17:24 - } - - } - - return new Exchange(); - }; - - controller.$inject = ['Base', 'createPoll', 'user', 'waves', 'utils', '$element', '$scope']; - - angular.module('app.ui').component('wExchange', { - bindings: { - balance: '<', - interval: '@', - rateDate: '@', - noUpdate: '@', - targetAssetId: '@' - }, - transclude: false, - controller - }); -})(); diff --git a/src/modules/ui/directives/feeList/FeeList.js b/src/modules/ui/directives/feeList/FeeList.js deleted file mode 100644 index 2eb4f584ec..0000000000 --- a/src/modules/ui/directives/feeList/FeeList.js +++ /dev/null @@ -1,147 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {typeof Base} Base - * @param {Waves} waves - * @param {User} user - * @param {$rootScope.Scope} $scope - */ - const controller = function (Base, waves, $scope, user) { - - class FeeList extends Base { - - /** - * @type {*} - */ - tx = null; - /** - * @type {Money} - */ - fee = null; - /** - * @type {Array} - */ - feeList = []; - /** - * @type {Object.} - */ - balanceHash = null; - - - constructor() { - super(); - $scope.$watch('$ctrl.tx', () => this._onChangeTx(), true); - this.observe('balanceHash', this._onChangeBalanceHash); - } - - /** - * @return {null} - * @private - */ - _onChangeTx() { - if (!this.tx) { - return null; - } - - waves.node.getFeeList(this.tx).then(list => { - - this.originalFeeList = list; - this._setActualFeeList(); - - const isEqualAssetId = (asset1, asset2) => asset1.id === asset2.id; - const isEqualMoney = (money1, money2) => - isEqualAssetId(money1.asset, money2.asset) && money1.eq(money2); - - const hasMyFeeInList = this.fee && list.some(item => isEqualMoney(item, this.fee)); - if (!hasMyFeeInList) { - this.fee = null; - } - - if (!(this.fee && list.find(item => item.asset.id === this.fee.asset.id))) { - const fee = this.balanceHash && Object.keys(this.balanceHash).length && this.feeList - .find(item => { - const balance = this.balanceHash[item.asset.id]; - return balance && balance.gte(item); - }); - this.fee = fee || this.feeList[0]; - } - - $scope.$apply(); - }); - } - - /** - * @return {null} - * @private - */ - _onChangeBalanceHash() { - if (!this.fee) { - return null; - } - - this._setActualFeeList(); - - if (this.feeList.length === 1) { - return null; - } - - const feeBalance = this.balanceHash[this.fee.asset.id]; - - if (!feeBalance || feeBalance.lt(this.fee)) { - this.fee = this.balanceHash && Object.keys(this.balanceHash).length && this.feeList.find(item => { - const balance = this.balanceHash[item.asset.id]; - return balance && balance.gte(item); - }) || this.fee; - } - } - - /** - * @param {Array} list - * @return {null} - * @private - */ - _setActualFeeList(list = this.originalFeeList) { - const hasBalances = this.balanceHash && Object.keys(this.balanceHash).length; - - if (!list || list.length < 2 || !hasBalances) { - this.feeList = [...(list || [])]; - return null; - } - - const wavesFee = list.find(item => item.asset.id === 'WAVES'); - const filteredList = list.filter(fee => { - const feeBalance = this.balanceHash[fee.asset.id]; - const canUseOwnFee = user.address !== fee.asset.sender || this.balanceHash.WAVES.gte(wavesFee); - return hasBalances && feeBalance && feeBalance.gte(fee) && canUseOwnFee; - }); - - - if (!filteredList.length) { - filteredList.push(wavesFee); - } - - this.feeList = filteredList; - } - - } - - return new FeeList(); - }; - - controller.$inject = ['Base', 'waves', '$scope', 'user']; - - angular.module('app.ui').component('wFeeList', { - bindings: { - tx: '<', - balanceHash: '<', - disabled: '<', - fee: '=' - }, - scope: false, - transclude: false, - templateUrl: 'modules/ui/directives/feeList/feeList.html', - controller - }); - -})(); diff --git a/src/modules/ui/directives/feeList/fee-list.less b/src/modules/ui/directives/feeList/fee-list.less deleted file mode 100644 index 727c5990c6..0000000000 --- a/src/modules/ui/directives/feeList/fee-list.less +++ /dev/null @@ -1,13 +0,0 @@ -w-fee-list { - width: 100%; - .money-currency { - flex-grow: 1; - width: 100%; - text-align: right; - white-space: nowrap; - } - - .option { - display: flex; - } -} diff --git a/src/modules/ui/directives/feeList/feeList.html b/src/modules/ui/directives/feeList/feeList.html deleted file mode 100644 index 916768b736..0000000000 --- a/src/modules/ui/directives/feeList/feeList.html +++ /dev/null @@ -1,20 +0,0 @@ -
-
- - - {{::fee.asset.displayName}} - - - -
- -
-
diff --git a/src/modules/ui/directives/footer/footer.html b/src/modules/ui/directives/footer/footer.html index 03f09badaf..39ddbc4318 100644 --- a/src/modules/ui/directives/footer/footer.html +++ b/src/modules/ui/directives/footer/footer.html @@ -1,117 +1,9 @@
- -
- - - FAQ -
- -
- - -
- -
- - - - -
- -
-
-
- - - - - -
- -
-
- - - - - -
- -
-
- - -
- -
-
- - - - -
-
- -
- - -
-
-
-
- -
- -
-
- +
+ FAQ +
+
+
+ +
diff --git a/src/modules/ui/directives/footer/footer.less b/src/modules/ui/directives/footer/footer.less index 62330ff4e7..31f74e1d68 100644 --- a/src/modules/ui/directives/footer/footer.less +++ b/src/modules/ui/directives/footer/footer.less @@ -4,19 +4,22 @@ .footer { display: block; - background: @footer-background; &__wrap { - max-width: 1440px; color: @color-basic-600; - display: flex; - padding: 60px 80px; - font-size: 15px; + padding: 20px; + font-size: 13px; margin: 0 auto; position: relative; z-index: 1; } + &-action { + display: flex; + justify-content: space-between; + align-items: center; + } + &__title { margin-bottom: 24px; text-transform: uppercase; @@ -67,59 +70,89 @@ } } -@media screen and (max-width: 1340px) { - .footer__wrap { - padding: 40px; +.footer { + background: @color-info-50; + width: 100%; + + &__wrap { + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; + padding: 12px; + color: @color-basic-500; + font-size: 13px; } -} -@media screen and (max-width: 1174px) { - .footer__right { - padding-left: 0; + &__left { + margin-left: auto; + flex-direction: row-reverse; + display: flex; + align-items: center; + + &-item { + white-space: nowrap; + .footnote-1(); + color: @color-basic-500; + margin-left: 15px; + margin-bottom: 0; + } } -} -@media screen and (max-width: 1024px) { - .footer__right-item { - margin-left: 20px; + &-actions { + display: flex; } -} -@media screen and (max-width: 860px) { - .footer { - &__wrap { - padding: 40px 40px 0; - font-size: 13px; - flex-direction: column; + &-action { + align-items: center; + display: inline-flex; - } + &:not(:first-child) { + margin-left: 10px; - &__title { - margin-bottom: 20px; - font-size: 11px; + &:before { + content: ''; + height: 14px; + width: 1px; + margin-right: 10px; + background: @color-basic-300; + } } + } - &__right { - flex-wrap: wrap; - width: 100%; + &-copyright { + white-space: nowrap; + .footnote-1(); + color: @color-basic-500; + margin-left: 15px; + margin-bottom: 0; + } - &-item { - flex-basis: 50%; - margin: 30px 0 0; - } + .select .select__wrap .select__title { + background: transparent; + + &:after { + width: 10px; + height: 10px; + background: @select-arrow-icon; } } + + .lng-item span { + color: @color-basic-700; + } } -@media screen and (max-width: 480px) { +@media screen and (max-width: 860px) { .footer { &__wrap { - padding-left: 20px; - padding-right: 20px; + padding: 12px 16px; + font-size: 13px; + height: 40px; } - &__link_support { - margin-bottom: 24px; + &-action { + font-size: 12px; } } -} +} \ No newline at end of file diff --git a/src/modules/ui/directives/input/input.less b/src/modules/ui/directives/input/input.less index ef2af6d4d0..6cadd94f1a 100644 --- a/src/modules/ui/directives/input/input.less +++ b/src/modules/ui/directives/input/input.less @@ -81,21 +81,6 @@ input[type="checkbox"] { display: flex; align-items: center; - // .select { - // position: absolute; - // right: 6px; - // width: calc(50% ~'- 12px'); - - // .select__title-content { - // display: flex; - // align-items: center; - // } - - // .select__title { - // background-color: @color-white; - // } - // } - w-input .w-input-wrap { width: 50%; } diff --git a/src/modules/ui/directives/mainHeader/MainHeader.js b/src/modules/ui/directives/mainHeader/MainHeader.js index 6a7ca218df..d7e8d85eaf 100644 --- a/src/modules/ui/directives/mainHeader/MainHeader.js +++ b/src/modules/ui/directives/mainHeader/MainHeader.js @@ -12,7 +12,6 @@ /** * @param Base - * @param {stateManager} stateManager * @param {ModalManager} modalManager * @param {app.utils} utils * @param {ng.IScope} $scope @@ -26,7 +25,6 @@ */ const controller = function ( Base, - stateManager, modalManager, user, $state, @@ -191,7 +189,8 @@ * @public */ logout() { - user.logout('signIn'); + this.closeDropdown(); + user.logout('switch'); } /** @@ -352,6 +351,7 @@ return; } this.closeDropdown(); + this.onMobileFaderClick(); user.logout('switch', true); user.login(toUser); analytics.send({ name: 'Switch Account' }); @@ -494,7 +494,6 @@ controller.$inject = [ 'Base', - 'stateManager', 'modalManager', 'user', '$state', diff --git a/src/modules/ui/directives/mainHeader/less/largeHeader/largeHeader.less b/src/modules/ui/directives/mainHeader/less/largeHeader/largeHeader.less index 2817cc686e..f74f6c49bf 100644 --- a/src/modules/ui/directives/mainHeader/less/largeHeader/largeHeader.less +++ b/src/modules/ui/directives/mainHeader/less/largeHeader/largeHeader.less @@ -95,7 +95,6 @@ & + .main-header { &__header { position: fixed; - top: 40px; } } } @@ -162,7 +161,7 @@ } &_new-user { - position: fixed; + position: relative; z-index: 10; width: 100%; left: 0; diff --git a/src/modules/ui/directives/mainHeader/templates/largeHeader.html b/src/modules/ui/directives/mainHeader/templates/largeHeader.html index cc186c0679..9a190a8887 100644 --- a/src/modules/ui/directives/mainHeader/templates/largeHeader.html +++ b/src/modules/ui/directives/mainHeader/templates/largeHeader.html @@ -1,127 +1,7 @@ - - - - - - - - - - - - +
@@ -255,9 +135,6 @@
{{::user.address}}
- -
-
@@ -277,18 +154,8 @@
{{::user.address}}
- -
- -
- - - -
diff --git a/src/modules/ui/directives/mainHeader/templates/mobileHeader.html b/src/modules/ui/directives/mainHeader/templates/mobileHeader.html index 779081b55f..c17bc1db19 100644 --- a/src/modules/ui/directives/mainHeader/templates/mobileHeader.html +++ b/src/modules/ui/directives/mainHeader/templates/mobileHeader.html @@ -1,69 +1,16 @@ - - + -
+
-
- - - - - - -
  • - - - -
    • -
  • +
  • } - */ - templatePromise = $templateRequest(`${MODULE_PATH}/cameraPopup.html`); - /** - * @type {boolean} - */ - videoError = false; - - - constructor() { - super(); - - this.observe('isWatched', this._dropLastVideoSize); - this.observe(['isWatched', 'videoSize'], this._onChangeWatched); - this.observe('videoSize', this._onChangeVideoSize); - - const positionHandler = utils.debounceRequestAnimationFrame(() => this._onChangePosition()); - - this.listenEventEmitter(window, 'resize', positionHandler, { - on: 'addEventListener', - off: 'removeEventListener' - }); - - this.listenEventEmitter(document, 'scroll', positionHandler, { - on: 'addEventListener', - off: 'removeEventListener', - capture: true - }); - } - - - $onDestroy() { - super.$onDestroy(); - this._removeReadQrService(); - this._removePopup(); - } - - toggleWatchQrCode() { - if (this.isWatched) { - this.stopWatchQrCode(); - return null; - } - - this.videoError = false; - this.isWatched = true; - this.webCamError = false; - - this._createPopup() - .then(() => this._createReadQrService()); - } - - stopWatchQrCode() { - this.isWatched = false; - this._removeReadQrService(); - } - - /** - * @private - */ - _onChangePosition() { - if (this.isWatched) { - this._setPopupPosition(); - } - } - - /** - * @return {QrCodeRead} - * @private - */ - _createReadQrService() { - if (!this.readService) { - const $element = $(this.popupNode).find(VIDEO_WRAPPER_SELECTOR); - - let maxSize; - if (WavesApp.device.phone()) { - maxSize = { - width: window.innerWidth, - height: window.innerHeight - }; - } else { - maxSize = { - width: this.maxWidth, - height: this.maxHeight - }; - } - - this.readService = new QrCodeReadService({ $element, maxSize }); - - this.receiveOnce(this.readService.onRead, this._onSuccessReadQrCode, this); - this.receiveOnce(this.readService.onError, this._onErrorRead, this); - this.receiveOnce(this.readService.onHasSize, this._onAddVideoSize, this); - } - - return this; - } - - /** - * @private - */ - @decorators.async() - _onErrorRead() { - this.videoError = true; - this._setPopupPosition(); - $scope.$apply(); - } - - /** - * @param size - * @private - */ - @decorators.async() - _onAddVideoSize(size) { - this.videoSize = size; - $scope.$apply(); - } - - /** - * @param text - * @private - */ - @decorators.async() - _onSuccessReadQrCode(text) { - this.onRead({ text }); - this.isWatched = false; - } - - /** - * @return {QrCodeRead} - * @private - */ - _removeReadQrService() { - if (this.readService) { - this.stopReceive(this.readService.onRead); - this.stopReceive(this.readService.onError); - this.stopReceive(this.readService.onHasSize); - this.readService.destroy(); - this.readService = null; - this.videoSize = null; - } - - return this; - } - - /** - * @private - */ - _onChangeVideoSize() { - this._addPopupSize(); - this._setPopupPosition(); - } - - /** - * @private - */ - _createPopup() { - if (this.popupNode) { - return Promise.resolve(); - } - - return this.templatePromise.then(template => { - const $node = $compile(template)($scope); - this.popupNode = $node.get(0); - document.body.appendChild(this.popupNode); - this._onChangeWatched(); - this._setPopupPosition(); - }); - } - - /** - * @private - */ - _removePopup() { - if (this.popupNode) { - document.body.removeChild(this.popupNode); - } - } - - /** - * @private - */ - _onChangeWatched() { - if (this.popupNode) { - this.popupNode.classList.toggle('active', this.isWatched); - if (this.isWatched) { - this._setPopupPosition(); - } - } - } - - /** - * @private - */ - _dropLastVideoSize() { - if (!this.isWatched) { - this.stopWatchQrCode(); - } - } - - /** - * @private - */ - _setPopupPosition() { - const $btn = $element.find('.btn'); - const offset = $btn.offset(); - const videoWrapper = this.popupNode.querySelector(VIDEO_WRAPPER_SELECTOR); - const width = videoWrapper.clientWidth; - const height = videoWrapper.clientHeight; - - const top = offset.top - height / 2 + $btn.height() / 2; - const left = offset.left - (width + 10); - - $(this.popupNode).find(VIDEO_WRAPPER_SELECTOR) - .offset({ top, left }); - } - - /** - * @private - */ - _addPopupSize() { - if (!this.videoSize) { - return null; - } - - const videoWrapper = this.popupNode.querySelector(VIDEO_WRAPPER_SELECTOR); - const factor = Math.min(this.maxWidth / this.videoSize.width, this.maxHeight / this.videoSize.height); - - const width = Math.round(this.videoSize.width * factor); - const height = Math.round(this.videoSize.height * factor); - - videoWrapper.style.width = `${width}px`; - videoWrapper.style.height = `${height}px`; - } - - } - - return new QrCodeRead(); - }; - - controller.$inject = [ - 'Base', - '$element', - 'QrCodeReadService', - '$templateRequest', - 'utils', - '$compile', - '$scope', - 'decorators' - ]; - - angular.module('app.ui') - .component('wQrCodeRead', { - bindings: { - maxWidth: '<', - maxHeight: '<', - onRead: '&' - }, - templateUrl: `${MODULE_PATH}/qrCodeRead.html`, - controller - }); -})(); diff --git a/src/modules/ui/directives/qrCodeRead/QrCodeReadService.js b/src/modules/ui/directives/qrCodeRead/QrCodeReadService.js deleted file mode 100644 index 2967bacab2..0000000000 --- a/src/modules/ui/directives/qrCodeRead/QrCodeReadService.js +++ /dev/null @@ -1,385 +0,0 @@ -(function () { - 'use strict'; - - const DEFAULT_READ_COUNT = 4; - - /** - * @param {app.utils.mediaStream} mediaStream - * @param {Poll} Poll - * @return {QrCodeReadService} - */ - const factory = function (mediaStream, Poll) { - - const { Signal } = require('ts-utils'); - const wrapper = require('worker-wrapper'); - - - class QrCodeReadService { - - /** - * @type {Signal} - */ - onRead = new Signal(); - /** - * @type {Signal} - */ - onError = new Signal(); - /** - * @type {Signal} - */ - onHasSize = new Signal(); - /** - * @type {QrCodeReadService.ISize} - */ - size = null; - /** - * @type {HTMLCanvasElement} - * @private - */ - _canvas = document.createElement('CANVAS'); - /** - * @type {CanvasRenderingContext2D} - * @private - */ - _ctx = null; - /** - * @type {MediaStream} - * @private - */ - _stream = null; - /** - * @type {HTMLMediaElement} - * @private - */ - _video = document.createElement('VIDEO'); - /** - * @type {Wrap} - * @private - */ - _worker = null; - /** - * @type {Poll} - * @private - */ - _poll = null; - /** - * @type {Object.} - * @private - */ - _readQrHash = Object.create(null); - /** - * @type {number} - * @private - */ - _readCount = DEFAULT_READ_COUNT; - /** - * @type {ISize} - * @private - */ - _maxSize = null; - /** - * @type {number} - * @private - */ - _factor = 1; - - - /** - * @param {QrCodeReadService.IOptions} options - * @constructor - */ - constructor(options) { - if (options.readCount) { - this._readCount = options.readCount; - } - - this._maxSize = options.maxSize; - - this._initializeDom(options); - - requestAnimationFrame(() => { - this._createWorker() - ._createStream() - .then(() => this._loadVideoSize()) - .then(() => this._createPoll()) - .catch((e) => this._dispatchError(e)); - }); - } - - destroy() { - this._removeWorker() - ._clearSignalHandlers() - ._stopStream() - ._removePoll() - ._removeVideoElement(); - } - - /** - * @param {QrCodeReadService.IOptions} options - * @private - */ - _initializeDom(options) { - this._createContext() - ._addVideoAttrs(); - - // For debug read camera square - // this._canvas.style.cssText = 'position: absolute; top: 0; left: 0; z-index: 10000'; - // document.body.appendChild(this._canvas); - - options.$element.append(this._video); - return this; - } - - /** - * @private - */ - _removeVideoElement() { - if (this._video.parentNode) { - this._video.parentNode.removeChild(this._video); - } - - return this; - } - - /** - * @return {QrCodeReadService} - * @private - */ - _createContext() { - this._ctx = this._canvas.getContext('2d'); - return this; - } - - /** - * @private - */ - _addVideoAttrs() { - this._video.setAttribute('autoplay', 'true'); - this._video.setAttribute('preload', 'auto'); - this._video.setAttribute('muted', 'true'); - this._video.setAttribute('playsinline', 'true'); - - return this; - } - - /** - * @private - */ - _clearSignalHandlers() { - this.onRead.off(); - this.onError.off(); - - return this; - } - - /** - * @private - */ - _removeWorker() { - if (this._worker) { - this._worker.terminate(); - this._worker = null; - } - - return this; - } - - /** - * @private - */ - _stopStream() { - if (this._stream) { - this._stream.stop(); - this._stream = null; - } - - return this; - } - - /** - * @return {QrCodeReadService} - * @private - */ - _createWorker() { - if (this._worker) { - return this; - } - - this._worker = wrapper.create(() => new QrCode(), { - libs: [`/node_modules/qrcode-reader/dist/index.min.js?${WavesApp.version}`] - }); - - return this; - } - - /** - * @return {QrCodeReadService} - * @private - */ - _createPoll() { - if (this._poll) { - return this; - } - - this._poll = new Poll(() => this._decodeImage(), result => this._checkStop(result), 1000 / 24); - - return this; - } - - /** - * @return {QrCodeReadService} - * @private - */ - _removePoll() { - if (!this._poll) { - return this; - } - - this._poll.destroy(); - this._poll = null; - - return this; - } - - /** - * @return {Promise} - * @private - */ - _createStream() { - return mediaStream.create() - .then(stream => { - this._stream = stream; - this._video.srcObject = stream.stream; - }); - } - - /** - * @return {Promise} - * @private - */ - _loadVideoSize() { - return new Promise((resolve) => { - const handler = () => { - this.size = { width: this._video.videoWidth, height: this._video.videoHeight }; - - const factor = this._maxSize && Math.min( - this._maxSize.width / this.size.width, - this._maxSize.height / this.size.height - ) || 1; - - this._factor = factor; - this._video.style.transform = `scale(${factor}) translate(-50%, -50%)`; - this._video.style.transformOrigin = '0 0'; - - this._canvas.width = 170 / factor; - this._canvas.height = 170 / factor; - - this.onHasSize.dispatch({ ...this.size }); - this._video.removeEventListener('loadedmetadata', handler, false); - resolve(); - }; - this._video.addEventListener('loadedmetadata', handler, false); - }); - } - - /** - * @return {Promise} - * @private - */ - _decodeImage() { - if (!this.size || !this.size.width || !this.size.height) { - return null; - } - - const frame = this._getFrame(); - - return this._worker.process((qr, { frame }) => { - return new Promise((resolve) => { - qr.callback = function (error, response) { - if (error) { - resolve(null); - } else { - resolve(response.result); - } - }; - qr.decode(frame); - }); - }, { frame }) - .catch((e) => this._dispatchError(e)); - } - - /** - * @param {string} parsedQr - * @private - */ - _checkStop(parsedQr) { - if (!parsedQr) { - return null; - } - - if (!this._readQrHash[parsedQr]) { - this._readQrHash[parsedQr] = 1; - } else { - this._readQrHash[parsedQr]++; - } - - if (this._readQrHash[parsedQr] >= this._readCount) { - this.onRead.dispatch(parsedQr); - this.destroy(); - } - } - - /** - * @return {ImageData} - * @private - */ - _getFrame() { - const factor = 1 / this._factor; - const size = 170 * factor; - const width = this.size.width; - const height = this.size.height; - - const deltaX = (width - size) / 2; - const deltaY = (height - size) / 2; - - const args = [deltaX, deltaY, size, size, 0, 0, size, size]; - - this._ctx.drawImage(this._video, ...args); - return this._ctx.getImageData(0, 0, size, size); - } - - /** - * @param {Error} error - * @private - */ - _dispatchError(error) { - this.onError.dispatch(error); - this.destroy(); - } - - } - - return QrCodeReadService; - }; - - factory.$inject = ['mediaStream', 'Poll']; - - angular.module('app.ui').factory('QrCodeReadService', factory); -})(); - -/** - * @name QrCodeReadService - */ - -/** - * @typedef {object} QrCodeReadService#IOptions - * @property {JQuery} $element - * @property {ISize} maxSize - * @property {number} [readCount] Count of success read for throw success event - */ - -/** - * @typedef {object} QrCodeReadService#ISize - * @property {number} width - * @property {number} height - */ diff --git a/src/modules/ui/directives/qrCodeRead/cameraPopup.html b/src/modules/ui/directives/qrCodeRead/cameraPopup.html deleted file mode 100644 index fadca26746..0000000000 --- a/src/modules/ui/directives/qrCodeRead/cameraPopup.html +++ /dev/null @@ -1,12 +0,0 @@ -
    -
    - -
    - - - - -
    -
    diff --git a/src/modules/ui/directives/qrCodeRead/qrCodeRead.html b/src/modules/ui/directives/qrCodeRead/qrCodeRead.html deleted file mode 100644 index 3246b509f8..0000000000 --- a/src/modules/ui/directives/qrCodeRead/qrCodeRead.html +++ /dev/null @@ -1 +0,0 @@ -
    diff --git a/src/modules/ui/directives/qrCodeRead/qrCodeReader.less b/src/modules/ui/directives/qrCodeRead/qrCodeReader.less deleted file mode 100644 index ccb6a6037d..0000000000 --- a/src/modules/ui/directives/qrCodeRead/qrCodeReader.less +++ /dev/null @@ -1,104 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; - -w-qr-code-read { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - - .btn::before { - content: ''; - display: block; - width: 24px; - height: 24px; - background-image: @qr-code-big-icon; - background-size: 100% 100%; - cursor: pointer; - } -} - -.camera-popup { - display: none; - position: relative; - z-index: 100; - - &__video-wrapper { - position: absolute; - overflow: hidden; - min-width: 213px; - min-height: 160px; - border-radius: @border-radius / 2; - - & > video { - background-color: @color-black; - position: absolute; - left: 50%; - top: 50%; - } - - &.pending, &.error { - background-color: @color-white; - border: 1px solid @color-basic-200; - border-radius: @border-radius; - } - - &.pending video { - background-color: transparent; - } - - &.error::after { - content: ''; - display: block; - min-width: 213px; - min-height: 160px; - background: url(/img/icons/webcamerror.svg) no-repeat center; - } - - & > w-button.transparent { - display: none; - position: absolute; - bottom: 0; - margin: 0 20px 20px; - width: calc(100% ~'- 40px'); - font-size: 13px; - z-index: 100; - } - } - - &__target-square { - width: 170px; - height: 170px; - position: absolute; - left: 50%; - top: 50%; - z-index: 1; - transform: translate(-50%, -50%); - box-shadow: 0 0 0 2500px rgba(0, 0, 0, 0.3) - } - - &.active { - display: block; - } -} - -@media screen and (max-width: 540px) { - - .camera-popup { - &__video-wrapper { - position: fixed; - max-width: 100%; - max-height: 100%; - top: 0 !important; - left: 0 !important; - width: 100% !important; - height: 100vh !important; - background-color: @color-black; - - & > w-button.transparent { - display: block; - } - } - } - -} diff --git a/src/modules/ui/directives/ratingStars/ratingStars.html b/src/modules/ui/directives/ratingStars/ratingStars.html deleted file mode 100644 index 7f28dd2d64..0000000000 --- a/src/modules/ui/directives/ratingStars/ratingStars.html +++ /dev/null @@ -1,15 +0,0 @@ - -
    -
    -
    - - - WCT - - -
    -
    diff --git a/src/modules/ui/directives/ratingStars/ratingStars.js b/src/modules/ui/directives/ratingStars/ratingStars.js deleted file mode 100644 index 3bd79f6723..0000000000 --- a/src/modules/ui/directives/ratingStars/ratingStars.js +++ /dev/null @@ -1,157 +0,0 @@ -(function () { - 'use strict'; - - const controller = function (Base, - user, - $scope, - RatingStarsFactory, - $element, - waves, - modalManager, - balanceWatcher, - $mdDialog, - utils) { - - const { SIGN_TYPE } = require('@waves/signature-adapter'); - const WCT_ID = WavesApp.WCTAsset; - const WAVES_ID = WavesApp.defaultAssets.WAVES; - const NEED_WCT = 1; - - class RatingStars extends Base { - - /** - * @type JQuery - */ - $container; - /** - * @type boolean - */ - hasBalance = false; - /** - * @type number - */ - rating; - /** - * @type string - */ - size; - /** - * @type string - */ - assetID; - /** - * @type boolean - */ - canRate = false; - - $postLink() { - const ratingStars = new RatingStarsFactory({ - $container: $element.find('.rating-stars-wrapper'), - rating: this.rating, - size: this.size, - canRate: this.canRate, - hasBalance: this.hasBalance - }); - - this.observe('rating', () => { - ratingStars.update(this.rating); - }); - - if (this.canRate) { - this.observe('hasBalance', () => { - ratingStars.updateStatus(this.hasBalance); - $scope.$apply(); - }); - - waves.node.getFee({ type: SIGN_TYPE.DATA }) - .then(money => { - this.fee = money; - this._checkBalance(); - this.receive(ratingStars.vote, this._onVote, this); - }); - } - - } - - _checkBalance() { - const balance = balanceWatcher.getBalance(); - this.wavesBalance = balance[WAVES_ID]; - this.wctBalance = balance[WCT_ID]; - if (this.wavesBalance.gte(this.fee) && this.wctBalance && this.wctBalance.getTokens().gte(NEED_WCT)) { - this.hasBalance = true; - $scope.$apply(); - } - } - - _onVote(rating) { - waves.node.getFee({ type: SIGN_TYPE.DATA }) - .then(money => { - this.fee = money; - - const tx = waves.node.transactions.createTransaction({ - type: SIGN_TYPE.DATA, - data: { - data: [ - { - key: 'tokenRating', - type: 'string', - value: 'tokenRating' - }, { - key: 'assetId', - type: 'string', - value: this.assetId - }, { - key: 'score', - type: 'integer', - value: rating - } - ], - fee: this.fee, - type: SIGN_TYPE.DATA - } - }); - this.signable = ds.signature.getSignatureApi().makeSignable(tx); - - RatingStars._generateTx(this.signable); - }); - - } - - static _generateTx(signable) { - $mdDialog.hide(); - return modalManager.showConfirmTx(signable); - } - - openDex() { - utils.openDex(WCT_ID); - } - - } - - return new RatingStars(); - }; - - controller.$inject = [ - 'Base', - 'user', - '$scope', - 'RatingStarsFactory', - '$element', - 'waves', - 'modalManager', - 'balanceWatcher', - '$mdDialog', - 'utils']; - - angular.module('app.ui').component('wRatingStars', { - bindings: { - rating: '<', - size: '<', - canRate: '<', - assetId: '<' - }, - templateUrl: 'modules/ui/directives/ratingStars/ratingStars.html', - controller - }); - -})(); diff --git a/src/modules/ui/directives/ratingStars/ratingStars.less b/src/modules/ui/directives/ratingStars/ratingStars.less deleted file mode 100644 index b2955850ba..0000000000 --- a/src/modules/ui/directives/ratingStars/ratingStars.less +++ /dev/null @@ -1,88 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; - -.rating-stars { - display: flex; - justify-content: flex-start; - position: relative; - align-items: center; - - &-wrapper { - &.can-rate:not(.has-balance) { - &:hover { - & ~ .tooltip_need-money { - visibility: visible; - opacity: 1; - transition-delay: 0s; - } - } - } - &.can-rate.has-balance { - &:hover { - & ~ .tooltip_vote { - display: flex; - align-items: center; - } - } - } - } - - &__star { - background-image: @rating-star-icon; - background-position: left; - background-repeat: no-repeat; - width: 19px; - height: 14px; - background-size: 14px; - - &.filled { - background-image: @rating-filled-star-icon; - } - } - - &-wrapper.can-rate.has-balance { - &:hover .rating-stars__star { - background-image: @rating-filled-star-icon; - } - .rating-stars__star { - cursor: pointer; - } - .rating-stars__star:hover ~ .rating-stars__star { - background-image: @rating-star-icon; - } - } - - &.m { - .rating-stars__star { - width: 19px; - height: 14px; - background-size: 14px; - } - div.rating-stars__star:last-child { - width: 14px; - } - } - - &.s { - .rating-stars__star { - width: 12px; - height: 9px; - background-size: 9px; - } - div.rating-stars__star:last-child { - width: 19px; - } - } - - &.xl { - .rating-stars__star { - width: 54px; - height: 40px; - background-size: 40px; - } - - div.rating-stars__star:last-child { - width: 40px; - } - } -} diff --git a/src/modules/ui/directives/ratingStars/ratingStarsFactory.js b/src/modules/ui/directives/ratingStars/ratingStarsFactory.js deleted file mode 100644 index 48ba8c508b..0000000000 --- a/src/modules/ui/directives/ratingStars/ratingStarsFactory.js +++ /dev/null @@ -1,126 +0,0 @@ -(function () { - 'use strict'; - - const factory = function () { - - const STARS_AMOUNT = 5; - const { range } = require('ramda'); - const tsUtils = require('ts-utils'); - - class RatingStarsFactory { - - /** - * @public - * @type {array} - */ - starsStringList = []; - - constructor({ $container, rating, size = 'm', canRate = false, hasBalance }) { - /** - * @type {number} - */ - this.rating = rating; - /** - * @type {boolean} - */ - this.canRate = canRate; - /** - * @type {jQuery} - */ - this.$container = $container; - /** - * @type {boolean} - */ - this.hasBalance = hasBalance; - - this.size = size; - this.update(this.rating); - - if (this.canRate) { - this._initHandlers(this.hasBalance); - } - - this.voteSignal = new tsUtils.Signal(); - } - - get vote() { - return this.voteSignal; - } - - - /** - * @param rating - * @return {null} - */ - update(rating) { - const filledAmount = Math.round(rating); - const remapStars = index => ({ - $star: this.getStar(index, filledAmount) - }); - this.starsStringList = range(0, STARS_AMOUNT).map(remapStars); - this._render(this.$container); - } - - /** - * @public - * @param status - */ - updateStatus(status) { - this.hasBalance = status; - this._initHandlers(this.hasBalance); - } - - - /** - * @private - * @param hasBalance - */ - _initHandlers(hasBalance) { - this.starsList.forEach(starObj => { - if (hasBalance) { - starObj.$star.on('click', () => { - this.voteSignal.dispatch(starObj.weight); - }); - } else { - starObj.$star.off(); - } - - }); - } - - /** - * @param $container - * @private - */ - _render($container) { - this.template = ` -
    - ${this.starsStringList.map(obj => obj.$star).join('')} -
    `; - - $container.html(this.template); - this.starsList = this.$container - .find('.rating-stars__star') - .toArray() - .map((star, i) => ({ - $star: $(star), - weight: i + 1 - })); - - this._initHandlers(this.hasBalance); - } - - getStar(index, filledAmount) { - return `
    `; - } - - - } - - return RatingStarsFactory; - }; - - - angular.module('app.ui').factory('RatingStarsFactory', factory); - -})(); diff --git a/src/modules/ui/directives/roadMap/RoadMap.js b/src/modules/ui/directives/roadMap/RoadMap.js deleted file mode 100644 index 6808a493bd..0000000000 --- a/src/modules/ui/directives/roadMap/RoadMap.js +++ /dev/null @@ -1,283 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param {$rootScope.Scope} $scope - * @param {jQuery} $element - * @param $timeout - * @param carouselManager - * @param {app.utils} utils - * @param {JQuery} $document - * @return {RoadMap} - */ - const controller = function ($element, $timeout, carouselManager, utils, Base, $scope, $document) { - - // TODO to config - const edges = [ - { - date: 'roadmap.feb2017.date', - title: 'roadmap.feb2017.title', - text: 'roadmap.feb2017.text', - timeWhenMade: 'past' - }, - { - date: 'roadmap.feb2018.date', - title: 'roadmap.feb2018.title', - text: 'roadmap.feb2018.text', - timeWhenMade: 'past' - }, - { - date: 'roadmap.may2018.date', - title: 'roadmap.may2018.title', - text: 'roadmap.may2018.text', - timeWhenMade: 'past' - }, - { - date: 'roadmap.jul2018.date', - title: 'roadmap.jul2018.title', - text: 'roadmap.jul2018.text', - timeWhenMade: 'past' - }, - { - date: 'roadmap.jul2018.date', - title: 'roadmap.jul2018.title_2', - text: 'roadmap.jul2018.text_2', - timeWhenMade: 'past' - }, - { - date: 'roadmap.sep2018.date', - title: 'roadmap.sep2018.title', - text: 'roadmap.sep2018.text', - timeWhenMade: 'past' - }, - { - date: 'roadmap.nov2018.date', - title: 'roadmap.nov2018.title', - text: 'roadmap.nov2018.text', - timeWhenMade: 'past' - }, - { - date: 'roadmap.dec2018.date', - title: 'roadmap.dec2018.title', - text: 'roadmap.dec2018.text', - timeWhenMade: 'past' - }, - { - date: 'roadmap.dec2018.date', - title: 'roadmap.dec2018.title_2', - text: 'roadmap.dec2018.text_2', - timeWhenMade: 'past' - }, - { - date: 'roadmap.jan2019.date', - title: 'roadmap.jan2019.title', - text: 'roadmap.jan2019.text', - timeWhenMade: 'past' - }, - { - date: 'roadmap.jan2019.date', - title: 'roadmap.jan2019.title_2', - text: 'roadmap.jan2019.text_2', - timeWhenMade: 'past' - }, - { - date: 'roadmap.jun2019.date', - title: 'roadmap.jun2019.title', - text: 'roadmap.jun2019.text', - timeWhenMade: 'now' - }, - { - date: 'roadmap.jul2019.date', - title: 'roadmap.jul2019.title', - text: 'roadmap.jul2019.text', - timeWhenMade: 'now' - }, - { - date: 'roadmap.jul2019.date', - title: 'roadmap.jul2019.title_2', - text: 'roadmap.jul2019.text_2', - timeWhenMade: 'future' - }, - { - date: 'roadmap.jul2019.date', - title: 'roadmap.jul2019.title_3', - text: 'roadmap.jul2019.text_3', - timeWhenMade: 'future' - }, - { - date: 'roadmap.aug2019.date', - title: 'roadmap.aug2019.title', - text: 'roadmap.aug2019.text', - timeWhenMade: 'future' - }, - { - date: 'roadmap.sep2019.date', - title: 'roadmap.sep2019.title', - text: 'roadmap.sep2019.text', - timeWhenMade: 'future' - } - ]; - - const bounce = 32; - - class RoadMap extends Base { - - /** - * @type {number} - */ - length; - /** - * @private - * @type {jQuery} - */ - _wrapper; - /** - * @private - * @type {jQuery} - */ - _content; - /** - * @private - * @type {number} - */ - _diff; - /** - * @private - * @type {number} - */ - _centerSlideX; - /** - * @private - * @type {number} - */ - _leftEdge; - /** - * @private - * @type {number} - */ - _rightEdge; - - - get _wrapperTranslate() { - return this._wrapper.data('translate'); - } - - set _wrapperTranslate(translate) { - this._wrapper.data('translate', translate); - this._wrapper.css('transform', `translateX(${translate}px)`); - } - - $postLink() { - this.edges = edges; - this._wrapper = $element.find('.roadmap-content'); - utils.postDigest($scope).then(() => { - this._content = this._wrapper.children(); - this._remapSlides(); - this._initEvents(); - }); - } - - - /** - * @private - */ - _drawModelState() { - const startAnim = this._wrapperTranslate; - - const centerSlide = this._content.toArray() - .find(slide => Math.abs($(slide).offset().left - this._centerSlideX) <= this._diff / 2); - - const newPos = this._wrapperTranslate + (this._centerSlideX - $(centerSlide).offset().left); - - utils.animate(this._wrapper, { - progress: 1 - }, { - duration: 200, - progress: (animation, progress) => { - this._wrapperTranslate = startAnim + ((newPos - startAnim) * progress); - } - }); - - } - - /** - * @private - */ - _initEvents() { - const onDragStart = eventStart => { - this._wrapper.stop(true, false); - - const utilEventStart = utils.getEventInfo(eventStart); - const startDragX = utilEventStart.pageX; - const offset = startDragX - this._wrapperTranslate; - - this._wrapper.addClass('roadmap_drag'); - - const onDrag = utils.debounceRequestAnimationFrame(event => { - const utilEvent = utils.getEventInfo(event); - const position = Math.round(utilEvent.pageX - offset); - - this._wrapperTranslate = Math.max( - Math.min(this._leftEdge, position), - this._rightEdge - ); - - $scope.$apply(); - }); - - const onDragEnd = utils.debounceRequestAnimationFrame(() => { - $document.off('mousemove touchmove', onDrag); - $document.off('mouseup touchend', onDragEnd); - this._drawModelState(); - $scope.$apply(); - }); - - $document.on('mousemove touchmove', onDrag); - $document.on('mouseup touchend', onDragEnd); - }; - - const onResize = utils.debounceRequestAnimationFrame(() => this._remapSlides()); - - this.listenEventEmitter($element, 'mousedown touchstart', onDragStart); - this.listenEventEmitter($(window), 'resize', onResize); - } - - /** - * @private - */ - _remapSlides() { - const slide = index => this._content.eq(index); - const offsetLeft = slide => slide.offset().left; - - this._diff = offsetLeft(slide(1)) - offsetLeft(slide(0)); - this._centerSlideX = $document.width() / 2 - (slide(0).outerWidth() / 2); - - const nowLeft = offsetLeft($element.find('.now')); - const offset = Math.round(nowLeft - this._centerSlideX); - - this._wrapper.css('transform', `translateX(${-offset}px)`); - - this._leftEdge = offsetLeft($element.find('.now')) - offsetLeft($element.find('.roadmap')) + bounce; - this._rightEdge = -((this._content.length - 1) * this._diff) + this._leftEdge - bounce * 2; - - this._wrapperTranslate = -offset; - } - - } - - return new RoadMap(); - }; - - controller.$inject = ['$element', '$timeout', 'carouselManager', 'utils', 'Base', '$scope', '$document']; - - angular.module('app.ui').component('wRoadMap', { - bindings: { - id: '@', - interval: '@', - startFrom: '@' - }, - controller: controller, - templateUrl: 'modules/ui/directives/roadMap/roadMap.html' - }); -})(); diff --git a/src/modules/ui/directives/roadMap/roadMap.html b/src/modules/ui/directives/roadMap/roadMap.html deleted file mode 100644 index b9138e5fc1..0000000000 --- a/src/modules/ui/directives/roadMap/roadMap.html +++ /dev/null @@ -1,13 +0,0 @@ -
    -
    -
    -
    - -
    -
    -

    -
    -
    -
    -
    diff --git a/src/modules/ui/directives/roadMap/roadMap.less b/src/modules/ui/directives/roadMap/roadMap.less deleted file mode 100644 index 0b2c1b2239..0000000000 --- a/src/modules/ui/directives/roadMap/roadMap.less +++ /dev/null @@ -1,112 +0,0 @@ -@import (reference) "config"; -@import (reference) 'icons'; -@import (reference) '../../../app/less/typography'; - -w-road-map { - display: block; - user-select: none; - cursor: move; -} - -.roadmap { - max-width: 540px; - position: relative; - overflow: hidden; - margin: 60px auto 0; - &::before { - content: ''; - position: absolute; - left: 0; - top: 0; - width: 40px; - height: 100%; - background: linear-gradient(90deg, rgba(255,255,255,1) 0%, rgba(255,255,255,0) 100%); - z-index: 2; - } - &::after { - content: ''; - position: absolute; - right: 0; - top: 0; - width: 40px; - height: 100%; - background: linear-gradient(90deg, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 100%); - z-index: 2; - } -} - -.roadmap-content { - display: flex; -} - - -.roadmap { - display: flex; - - &-icon { - display: inline-flex; - width: 36px; - height: 36px; - border-radius: 50%; - border: 2px solid @color-submit-50; - background-color: @color-white; - background-repeat: no-repeat; - background-position: center; - overflow: visible; - - &-wrap { - display: flex; - justify-items: center; - position: relative; - margin-bottom: 15px; - padding: 0 50px; - background: @color-white; - z-index: 2; - } - } - - &-item { - flex-basis: 300px; - justify-items: center; - align-items: center; - display: flex; - flex-direction: column; - text-align: center; - flex-shrink: 0; - padding: 0 25px; - z-index: 2; - position: relative; - - &:after { - content: ''; - height: 1px; - background: @color-submit-50; - width: 100%; - position: absolute; - top: 19px; - left: 0; - z-index: 1; - } - - &.absolute { - position: absolute; - } - } - - &-title { - font-weight: 400; - } -} - - -@media screen and (min-width: 860px) { - .roadmap { - max-width: 1346px; - &::before { - width: 280px; - } - &::after { - width: 280px; - } - } -} diff --git a/src/modules/ui/directives/scriptTxForm/ScriptTxForm.js b/src/modules/ui/directives/scriptTxForm/ScriptTxForm.js deleted file mode 100644 index ad24c29823..0000000000 --- a/src/modules/ui/directives/scriptTxForm/ScriptTxForm.js +++ /dev/null @@ -1,267 +0,0 @@ -(function () { - 'use strict'; - - const { SIGN_TYPE } = require('@waves/signature-adapter'); - const BASE_64_PREFIX = 'base64:'; - const { uniqueId } = require('ts-utils'); - const { fetch } = require('data-service'); - - /** - * @param {typeof Base} Base - * @param {Waves} waves - * @param {$rootScope.Scope} $scope - * @param {User} user - * @param {BalanceWatcher} balanceWatcher - * @return {ScriptTxForm} - */ - const controller = function (Base, waves, $scope, user, balanceWatcher) { - - class ScriptTxForm extends Base { - - /** - * @type {object} - */ - state = Object.create(null); - /** - * @type {string} - */ - script = ''; - /** - * @type {boolean} - */ - isValid = true; - /** - * @type {Function} - */ - onSuccess = null; - /** - * @type {boolean} - */ - hasScript = user.hasScript(); - /** - * @type {boolean} - */ - requiredError = false; - /** - * @type {boolean} - */ - validationError = false; - /** - * @type {string} - */ - placeHolderLiteral = user.hasScript() ? 'change' : 'create'; - /** - * @type {boolean} - */ - validationPending = false; - /** - * @type {boolean} - */ - hasFee = false; - /** - * @type {args} - */ - signPending = false; - /** - * @type {Promise} - * @private - */ - _validateXHR = null; - /** - * @type {string} - * @private - */ - _activeXHR_Id = null; - /** - * @type {Array} - * @private - */ - _listeners = []; - - - constructor() { - super(); - this.observe('state', this._onChangeState); - this.observe('script', this._onChangeScript); - - this.receive(balanceWatcher.change, () => { - this._currentHasFee(); - $scope.$apply(); - }); - - if (!user.hasScript()) { - this.observe('script', this._updateRequiredErrorState); - this._updateRequiredErrorState(); - } - - this.observe(['requiredError', 'validationError'], this._updateValidationState); - this._updateValidationState(); - this._currentHasFee(); - - const signPendingListener = $scope.$on('signPendingChange', (event, data) => { - this.signPending = data; - }); - - this._listeners.push(signPendingListener); - } - - $postLink() { - this._initScript(); - } - - $onDestroy() { - super.$onDestroy(); - this._listeners.forEach(listener => listener()); - } - - getSignable() { - const tx = waves.node.transactions.createTransaction({ ...this.state.tx, type: SIGN_TYPE.SET_SCRIPT }); - const signable = ds.signature.getSignatureApi().makeSignable({ - type: tx.type, - data: tx - }); - return signable; - } - - next(signable) { - this.onSuccess({ signable }); - } - - /** - * @private - */ - _currentHasFee() { - if (!this.state || !this.state.tx || !this.state.tx.fee) { - return null; - } - - const balanceHash = balanceWatcher.getBalance(); - const fee = this.state.tx.fee; - this.hasFee = balanceHash[fee.asset.id] && balanceHash[fee.asset.id].gte(fee); - } - - /** - * @private - */ - _updateRequiredErrorState() { - this.requiredError = !this.script.replace(BASE_64_PREFIX, ''); - } - - /** - * @private - */ - _updateValidationState() { - this.isValid = !this.validationError && !this.requiredError; - } - - /** - * @private - */ - _initScript() { - const script = (this.state && this.state.tx && this.state.tx.script || BASE_64_PREFIX) - .replace(BASE_64_PREFIX, ''); - - if (this.script !== script) { - this.script = script; - } else { - this._onChangeScript(); - } - - this.state.tx.script = script; - } - - /** - * @private - */ - _onChangeState() { - const state = this.state; - - if (!state.tx) { - state.tx = Object.create(null); - } - - if (!state.tx.fee) { - waves.node.getFee({ type: SIGN_TYPE.SET_SCRIPT }).then(fee => { - state.tx.fee = fee; - this._currentHasFee(); - $scope.$apply(); - }); - } - } - - /** - * @private - */ - _onChangeScript() { - const script = this.script.replace(BASE_64_PREFIX, ''); - - this._clearActiveValidationXHR(); - this._createActiveValidationXHR(script); - } - - /** - * @private - */ - _clearActiveValidationXHR() { - this._activeXHR_Id = null; - this._validateXHR = null; - this.validationPending = false; - } - - /** - * @param code - * @return {null} - * @private - */ - _createActiveValidationXHR(code) { - if (code === '') { - this.validationError = false; - this.state.tx.script = ''; - return null; - } - - this.validationPending = true; - const id = uniqueId('script-form-validate'); - this._activeXHR_Id = id; - this._validateXHR = fetch(`${user.getSetting('network.node')}/utils/script/estimate`, { - method: 'POST', - body: code - }) - .then(() => { - if (this._activeXHR_Id !== id) { - return null; - } - this._clearActiveValidationXHR(); - this.validationError = false; - this.state.tx.script = `${BASE_64_PREFIX}${code}`; - }) - .catch(() => { - if (this._activeXHR_Id !== id) { - return null; - } - this._clearActiveValidationXHR(); - this.validationError = true; - this.state.tx.script = BASE_64_PREFIX; - }) - .then(() => { - $scope.$apply(); - }); - } - - } - - return new ScriptTxForm(); - }; - - controller.$inject = ['Base', 'waves', '$scope', 'user', 'balanceWatcher']; - - angular.module('app.ui').component('wScriptTxForm', { - controller, - scope: false, - bindings: { - state: '<', - onSuccess: '&' - }, - templateUrl: 'modules/ui/directives/scriptTxForm/script-form.html' - }); -})(); diff --git a/src/modules/ui/directives/scriptTxForm/script-form.html b/src/modules/ui/directives/scriptTxForm/script-form.html deleted file mode 100644 index 0fc81140da..0000000000 --- a/src/modules/ui/directives/scriptTxForm/script-form.html +++ /dev/null @@ -1,50 +0,0 @@ -
    -
    - -
    - - - - - - - - - - - - -
    - -
    - -
    -
    -
    -
    - -
    - -
    -
    -
    - - - - diff --git a/src/modules/create/directives/seed/SeedBase.js b/src/modules/ui/directives/seed/SeedBase.js similarity index 98% rename from src/modules/create/directives/seed/SeedBase.js rename to src/modules/ui/directives/seed/SeedBase.js index 2f5ccd0966..ee0d915b03 100644 --- a/src/modules/create/directives/seed/SeedBase.js +++ b/src/modules/ui/directives/seed/SeedBase.js @@ -105,5 +105,5 @@ factory.$inject = ['Base', '$q']; - angular.module('app.create').factory('SeedBase', factory); + angular.module('app.ui').factory('SeedBase', factory); })(); diff --git a/src/modules/create/directives/seed/SeedRead.js b/src/modules/ui/directives/seed/SeedRead.js similarity index 96% rename from src/modules/create/directives/seed/SeedRead.js rename to src/modules/ui/directives/seed/SeedRead.js index 70ed9d844d..9601761a2d 100644 --- a/src/modules/create/directives/seed/SeedRead.js +++ b/src/modules/ui/directives/seed/SeedRead.js @@ -111,12 +111,12 @@ controller.$inject = ['SeedBase', 'seedService', '$element', 'user', 'utils']; - angular.module('app.create').component('wSeedRead', { + angular.module('app.ui').component('wSeedRead', { bindings: { type: '@', seed: '@' }, controller: controller, - templateUrl: 'modules/create/directives/seed/seed.html' + templateUrl: 'modules/ui/directives/seed/seed.html' }); })(); diff --git a/src/modules/create/directives/seed/SeedService.js b/src/modules/ui/directives/seed/SeedService.js similarity index 85% rename from src/modules/create/directives/seed/SeedService.js rename to src/modules/ui/directives/seed/SeedService.js index e68bb062bd..747dfcabba 100644 --- a/src/modules/create/directives/seed/SeedService.js +++ b/src/modules/ui/directives/seed/SeedService.js @@ -11,7 +11,7 @@ factory.$inject = []; - angular.module('app.create').factory('seedService', factory); + angular.module('app.ui').factory('seedService', factory); })(); /** diff --git a/src/modules/create/directives/seed/SeedWrite.js b/src/modules/ui/directives/seed/SeedWrite.js similarity index 99% rename from src/modules/create/directives/seed/SeedWrite.js rename to src/modules/ui/directives/seed/SeedWrite.js index 7cf8e6d9fc..78b2508d2c 100644 --- a/src/modules/create/directives/seed/SeedWrite.js +++ b/src/modules/ui/directives/seed/SeedWrite.js @@ -226,7 +226,7 @@ controller.$inject = ['SeedBase', '$element', 'seedService', '$scope', 'createPromise']; - angular.module('app.create').component('wSeedWrite', { + angular.module('app.ui').component('wSeedWrite', { bindings: { seed: '@', onFulfilled: '&', diff --git a/src/modules/create/directives/seed/seed.html b/src/modules/ui/directives/seed/seed.html similarity index 100% rename from src/modules/create/directives/seed/seed.html rename to src/modules/ui/directives/seed/seed.html diff --git a/src/modules/create/directives/seed/seed.less b/src/modules/ui/directives/seed/seed.less similarity index 100% rename from src/modules/create/directives/seed/seed.less rename to src/modules/ui/directives/seed/seed.less diff --git a/src/modules/ui/directives/setAssetScriptForm/SetAssetScriptFrom.js b/src/modules/ui/directives/setAssetScriptForm/SetAssetScriptFrom.js deleted file mode 100644 index ab56f41723..0000000000 --- a/src/modules/ui/directives/setAssetScriptForm/SetAssetScriptFrom.js +++ /dev/null @@ -1,197 +0,0 @@ -(function () { - 'use strict'; - - const { SIGN_TYPE } = require('@waves/signature-adapter'); - const { signature } = require('data-service'); - const $ = require('jquery'); - - /** - * @param {typeof Base} Base - * @param {Waves} waves - * @param {$rootScope.Scope} $scope - * @param {User} user - * @param {BalanceWatcher} balanceWatcher - */ - const controller = function (Base, waves, $scope, user, balanceWatcher) { - - const analytics = require('@waves/event-sender'); - - class SetAssetScriptFrom extends Base { - - /** - * @return {boolean} - */ - get isAllOk() { - return this.isValidScript && !this.isPendingScrip; - } - - /** - * @type {SetAssetScriptFrom.IState} - */ - state; - /** - * @type {Asset} - */ - asset; - /** - * @type {string} - */ - script = ''; - /** - * @type {boolean} - */ - isValidScript = true; - /** - * @type {boolean} - */ - isPendingScrip = false; - /** - * @type {Money} - */ - fee; - /** - * @type {function(data: {signable: Signable}): void} - */ - onSuccess; - /** - * @type {boolean} - */ - hasFee = true; - /** - * @type {JQueryXHR | null} - * @private - */ - _activeXHR = null; - - - constructor() { - super(); - this.observe('state', this._onChangeState); - this.observe('script', this._onChangeScript); - this.observe('fee', this._currentHasFee); - this.receive(balanceWatcher.change, this._currentHasFee, this); - this._currentHasFee(); - } - - onClickSign() { - analytics.send({ name: 'Update Script Continue Click', target: 'ui' }); - const tx = this._getTx(); - const signable = signature.getSignatureApi().makeSignable({ - type: tx.type, - data: tx - }); - return signable; - } - - /** - * @return - * @private - */ - _onChangeScript() { - const script = this.script.replace('base64:', ''); - - if (this._activeXHR) { - this._activeXHR.abort(); - this._activeXHR = null; - } - - if (!script) { - this.isValidScript = true; - this.isPendingScrip = false; - return null; - } - - this._activeXHR = $.ajax({ - url: `${user.getSetting('network.node')}/utils/script/estimate`, - method: 'POST', - data: script - }); - - this._activeXHR - .then(() => { - this.isValidScript = true; - }) - .catch(() => { - this.isValidScript = false; - }) - .always(() => { - this.isPendingScrip = false; - $scope.$apply(); - }); - } - - /** - * @private - */ - _onChangeState() { - if (!this.state || !this.state.assetId) { - throw new Error('Has no assetId!'); - } - this.script = this.state.script || ''; - waves.node.assets.getAsset(this.state.assetId).then(asset => { - if (!asset.hasScript) { - throw new Error('This asset has no script!'); - } - this.asset = asset; - $scope.$apply(); - }); - waves.node.getFee(this._getTx()).then(fee => { - this.fee = fee; - $scope.$apply(); - }); - } - - /** - * @return {{assetId: string, type: SIGN_TYPE.SET_ASSET_SCRIPT, script: string}} - * @private - */ - _getTx() { - const script = this.script.replace('base64:', ''); - return { - type: SIGN_TYPE.SET_ASSET_SCRIPT, - assetId: this.state.assetId, - script: this.isAllOk && this.script ? `base64:${script}` : 'base64:AQa3b8tH', - fee: this.fee || null - }; - } - - /** - * @private - */ - _currentHasFee() { - const waves = balanceWatcher.getBalance().WAVES; - - if (!this.fee) { - return null; - } - - this.hasFee = waves ? waves.gte(this.fee) : false; - } - - } - - return new SetAssetScriptFrom(); - }; - - controller.$inject = ['Base', 'waves', '$scope', 'user', 'balanceWatcher']; - - angular.module('app.ui').component('wSetAssetScriptFrom', { - bindings: { - state: '<', - onSuccess: '&' - }, - templateUrl: 'modules/ui/directives/setAssetScriptForm/setAssetScriptFrom.html', - transclude: false, - controller - }); -})(); - -/** - * @name SetAssetScriptFrom - */ - -/** - * @typedef {object} SetAssetScriptFrom#IState - * @property {string} assetId - * @property {string} script - */ diff --git a/src/modules/ui/directives/setAssetScriptForm/setAssetScriptFrom.html b/src/modules/ui/directives/setAssetScriptForm/setAssetScriptFrom.html deleted file mode 100644 index 85895de040..0000000000 --- a/src/modules/ui/directives/setAssetScriptForm/setAssetScriptFrom.html +++ /dev/null @@ -1,50 +0,0 @@ -
    - - - -
    -
    -
    {{$ctrl.asset.id}}
    -
    - -
    - - - - - - - - - - - -
    - -
    - - -
    - -
    - -
    - - - - -
    diff --git a/src/modules/ui/directives/tabs/less/tabs_inner.less b/src/modules/ui/directives/tabs/less/tabs_inner.less index 284d3f0dab..bb44fdaede 100644 --- a/src/modules/ui/directives/tabs/less/tabs_inner.less +++ b/src/modules/ui/directives/tabs/less/tabs_inner.less @@ -40,17 +40,6 @@ &:hover { border-bottom: 1px solid @color-info-500; } - - // &_active { - // border-bottom: 1px solid @color-submit-400; - // color: @color-submit-400; - // &:hover { - // border-bottom-color: @color-submit-400; - // } - // &::after { - // display: none; - // } - // } } } } diff --git a/src/modules/ui/directives/ratingStars/tooltip.less b/src/modules/ui/directives/tooltip/tooltip-smart.less similarity index 100% rename from src/modules/ui/directives/ratingStars/tooltip.less rename to src/modules/ui/directives/tooltip/tooltip-smart.less diff --git a/src/modules/ui/directives/transaction/Transaction.js b/src/modules/ui/directives/transaction/Transaction.js deleted file mode 100644 index 839d41ab6a..0000000000 --- a/src/modules/ui/directives/transaction/Transaction.js +++ /dev/null @@ -1,145 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param $filter - * @param {ModalManager} modalManager - * @param {INotification} notification - * @param {Waves} waves - * @param {User} user - * @param {$rootScope.Scope} $scope - * @return {Transaction} - */ - const controller = function (Base, $filter, modalManager, notification, - waves, user, $scope) { - - const { SIGN_TYPE } = require('@waves/signature-adapter'); - class Transaction extends Base { - - $postLink() { - this.typeName = this.transaction.typeName; - this.setScam(); - - this.receive(user.setScamSignal, () => { - this.setScam(); - $scope.$apply(); - }); - } - - setScam() { - this.isScam = !!user.scam[this.transaction.assetId]; - if (this.transaction.type === 7) { - const isScamAmount = !!user.scam[this.transaction.amount.asset]; - const isScamPrice = !!user.scam[this.transaction.price.asset]; - this.isScam = this.isScam || isScamAmount || isScamPrice; - } - } - - cancelLeasing() { - const lease = this.transaction; - const leaseId = lease.id; - return waves.node.getFee({ type: SIGN_TYPE.CANCEL_LEASING }) - .then((fee) => { - const tx = waves.node.transactions.createTransaction({ - fee, - type: SIGN_TYPE.CANCEL_LEASING, - lease, - leaseId - }); - const signable = ds.signature.getSignatureApi().makeSignable({ - type: tx.type, - data: tx - }); - return modalManager.showConfirmTx(signable); - }); - } - - showTransaction() { - modalManager.showTransactionInfo(this.transaction.id); - } - - /** - * return {string} - */ - getCopyAllData() { - const tx = this.transaction; - const id = `Transaction ID: ${tx.id}`; - const type = `Type: ${tx.type} (${this.typeName})`; - - const timestamp = $filter('date')(tx.timestamp, 'MM/dd/yyyy HH:mm'); - const datetime = `Date: ${timestamp}`; - - let sender = `Sender: ${tx.sender}`; - if (tx.typeName === WavesApp.TRANSACTION_TYPES.NODE.EXCHANGE) { - sender += ' (matcher address)'; - } - - let message = `${id}\n${type}\n${datetime}\n${sender}`; - - if (tx.typeName === WavesApp.TRANSACTION_TYPES.EXTENDED.UNKNOWN) { - message += '\n\nRAW TX DATA BELOW\n\n'; - message += JSON.stringify(tx, null, 2); - return message; - } - - if (tx.recipient) { - const recipient = `Recipient: ${tx.recipient}`; - message += `\n${recipient}`; - } - - if (tx.amount && tx.amount instanceof ds.wavesDataEntities.Money) { - const asset = tx.amount.asset; - const amount = `Amount: ${tx.amount.toFormat()} ${asset.name} (${asset.id})`; - message += `\n${amount}`; - } - - if (this.typeName === WavesApp.TRANSACTION_TYPES.EXTENDED.EXCHANGE_BUY || - this.typeName === WavesApp.TRANSACTION_TYPES.EXTENDED.EXCHANGE_SELL) { - const asset = tx.price.asset; - const price = `Price: ${tx.price.toFormat()} ${asset.name} (${asset.id})`; - const totalPrice = `Total price: ${this.totalPrice} ${asset.name}`; - message += `\n${price}\n${totalPrice}`; - } - - if (this.typeName === WavesApp.TRANSACTION_TYPES.EXTENDED.DATA) { - message += '\n\n\nDATA START'; - message += `\n\n${tx.stringifiedData}`; - message += '\n\nDATA END\n\n'; - } - - const fee = `Fee: ${tx.fee.toFormat()} ${tx.fee.asset.name} (${tx.fee.asset.id})`; - message += `\n${fee}`; - - return message; - } - - } - - return new Transaction(); - }; - - controller.$inject = [ - 'Base', - '$filter', - 'modalManager', - 'notification', - 'waves', - 'user', - '$scope' - ]; - - angular.module('app.ui') - .component('wTransaction', { - bindings: { - datePattern: '@', - transaction: '<' - }, - require: { - parent: '^wTransactionList' - }, - templateUrl: 'modules/ui/directives/transaction/transaction.html', - transclude: false, - controller - }); -})(); diff --git a/src/modules/ui/directives/transaction/TransactionIcon.js b/src/modules/ui/directives/transaction/TransactionIcon.js deleted file mode 100644 index 055bef3690..0000000000 --- a/src/modules/ui/directives/transaction/TransactionIcon.js +++ /dev/null @@ -1,10 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.ui').component('wTransactionIcon', { - bindings: { - typeName: '<' - }, - templateUrl: 'modules/ui/directives/transaction/transaction-icon.html' - }); -})(); diff --git a/src/modules/ui/directives/transaction/TransactionInfoRow.js b/src/modules/ui/directives/transaction/TransactionInfoRow.js deleted file mode 100644 index 0b1de643b0..0000000000 --- a/src/modules/ui/directives/transaction/TransactionInfoRow.js +++ /dev/null @@ -1,51 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {BaseAssetService} baseAssetService - * @param {$rootScope.Scope} $scope - * @param {app.utils} utils - * @param $filter - * @return {TransactionInfoRow} - */ - - const controller = function (Base, utils, $scope, $filter) { - - class TransactionInfoRow extends Base { - - $postLink() { - this.type = this.transaction.type; - this.props = { - ...this.transaction, - time: $filter('date')(this.transaction.timestamp, this.datePattern || 'HH:mm'), - isScam: this.isScam - }; - - this.observe('isScam', () => { - this.props.isScam = this.isScam; - utils.safeApply($scope); - }); - } - - } - - return new TransactionInfoRow(); - }; - - controller.$inject = [ - 'Base', - 'utils', - '$scope', - '$filter' - ]; - - angular.module('app.ui').component('wTransactionInfoRow', { - bindings: { - transaction: '<', - datePattern: '<', - isScam: '<' - }, - templateUrl: 'modules/ui/directives/transaction/transaction-info-row.html', - controller - }); -})(); diff --git a/src/modules/ui/directives/transaction/transaction-icon.html b/src/modules/ui/directives/transaction/transaction-icon.html deleted file mode 100644 index 3497176e38..0000000000 --- a/src/modules/ui/directives/transaction/transaction-icon.html +++ /dev/null @@ -1 +0,0 @@ -
    diff --git a/src/modules/ui/directives/transaction/transaction-info-row.html b/src/modules/ui/directives/transaction/transaction-info-row.html deleted file mode 100644 index cdb76c5cf3..0000000000 --- a/src/modules/ui/directives/transaction/transaction-info-row.html +++ /dev/null @@ -1,17 +0,0 @@ -
    - - - - - - - - - - - - - - - -
    diff --git a/src/modules/ui/directives/transaction/transaction.html b/src/modules/ui/directives/transaction/transaction.html deleted file mode 100644 index 5b91d9e1a8..0000000000 --- a/src/modules/ui/directives/transaction/transaction.html +++ /dev/null @@ -1,37 +0,0 @@ -
    - - -
    - - - - - - -
    - - - - - -
    -
    - - - - - -
    - - - - - -     -
    -
    diff --git a/src/modules/ui/directives/transaction/transactions.less b/src/modules/ui/directives/transaction/transactions.less deleted file mode 100644 index 8ccf90a7a3..0000000000 --- a/src/modules/ui/directives/transaction/transactions.less +++ /dev/null @@ -1,452 +0,0 @@ -@import (reference) "../../../app/less/app-icons"; -@import (reference) '../../../app/less/typography'; -@import (reference) 'config'; -@import (reference) 'icons'; - -.tx-block-wrapper { - border-radius: @border-radius; - box-shadow: @shadow-type-1; - background: @color-white; - - .row { - &:first-child { - border-top-left-radius: @border-radius; - border-top-right-radius: @border-radius; - } - - &:last-child { - border-bottom-left-radius: @border-radius; - border-bottom-right-radius: @border-radius; - } - } -} - -.status-label, -.status-label-min { - width: auto; - padding: 4px 11px; - border-radius: @border-radius; - text-transform: uppercase; - color: @color-submit-400; - background-color: @color-bluebar-200; - margin: 0 0 0 6px; - white-space: nowrap; - - &.success, - &.confirmed { - background: @color-success-50; - color: @color-success-400; - } - - &.warning, - &.unconfirmed { - background: rgba(255, 175, 0, 0.1); - color: @color-warning-500; - } - - &.error, - &.cancelled { - background: rgba(239, 72, 41, 0.1); - color: @color-error-500; - } - - &.active { - color: @color-submit-400; - background-color: @color-bluebar-200; - } - - &.inactive { - background-color: @asset-label-suspicious; - color: @color-black; - } -} - -.asset__text { - .js-stars-container { - margin-top: 1px; - } -} - -.status-label-min { - .caption-3(); - padding: 2px 6px; - //margin-top: 4px; - border-radius: @border-radius / 2; - text-transform: uppercase; -} - -w-transaction .transaction { - display: flex; - flex-direction: row; - width: 100%; - height: 100%; - min-height: 74px; - align-items: center; - position: relative; - - .status-label-min { - &.inactive { - margin-bottom: -1px; - } - &:not(.inactive) { - position: absolute; - right: 43px; - bottom: 15px; - } - } - - .exchange-type { - white-space: nowrap; - margin-right: 5px; - } - - .icon { - position: relative; - width: 48px; - height: 48px; - min-width: 48px; - margin: auto 20px auto 20px; - border-radius: 50%; - - &::before { - content: ''; - position: absolute; - width: @tx-icon-size; - height: @tx-icon-size; - overflow: hidden; - left: 9px; - top: 9px; - background-position-y: 0; - display: none; - background: url(/img/icons/transaction-icons-30.svg); - background-repeat: no-repeat; - } - - &.send { - .icon-tx-send(); - } - - &.receive { - .icon-tx-receive(); - } - - &.mass-send { - .icon-tx-mass-transfer(); - } - - &.mass-receive { - .icon-tx-mass-receive(); - } - - &.circular { - .icon-tx-circular(); - } - - &.issue { - .icon-tx-issue(); - } - - &.reissue { - .icon-tx-reissue(); - } - - &.burn { - .icon-tx-burn(); - } - - &.exchange-buy, - &.exchange-sell { - .icon-tx-exchange(); - } - - &.create-alias { - .icon-tx-create-alias(); - } - - &.lease-in { - .icon-tx-incoming-leasing(); - } - - &.lease-out { - .icon-tx-lease(); - } - - &.cancel-leasing { - .icon-tx-cancel-leasing(); - } - - &.unknown { - .icon-tx-unknown(); - } - - &.data { - .icon-tx-data(); - } - - &.data-vote { - .icon-tx-data-vote(); - } - - &.sponsorship-start { - .icon-tx-sponsorship-start(); - } - - &.sponsorship-stop { - .icon-tx-sponsorship-stop(); - } - - &.sponsorship-fee { - .icon-tx-sponsorship-plus(); - } - - &.set-script { - .icon-tx-set-script(); - } - - &.set-script-cancel { - .icon-tx-cancel-script(); - } - - &.set-asset-script { - .icon-tx-set-asset-script(); - } - - &.script-invocation { - .icon-tx-script-invocation(); - } - } - - &.spam .icon { - &.receive { - .icon-tx-spam(); - } - - &.mass-receive { - .icon-tx-mass-spam(); - } - } - - .status-label-min.inactive { - display: none; - } - - .spam { - .status-label-min.inactive { - display: block; - } - } - - .transaction-info { - display: flex; - flex-direction: row; - width: 100%; - - .full-width { - width: 100%; - } - - .line-wrapper { - display: flex; - flex-direction: row; - justify-content: space-between; - - .line { - height: 50%; - flex-basis: 50%; - box-sizing: border-box; - overflow: hidden; - color: @color-basic-700; - - &:last-child { - padding-right: @padding-main-layout * 5; - text-align: right; - - .top { - word-break: break-all; - } - } - - .top { - .spam-label { - display: none; - } - - .ellipsis { - max-width: 120px; - } - } - .bottom { - color: @color-basic-500; - } - } - - &.grow .line { - flex-basis: auto; - flex-grow: 1; - - &:last-child { - flex-grow: 0; - } - } - } - } - - &.spam { - .icon { - &.send, - &.receive, - &.circular, - &.exchange-buy, - &.exchange-sell, - &.reissue, - &.sponsorship-start, - &.sponsorship-stop, - &.sponsorship-fee, - &.mass-send, - &.set-asset-script { - background-color: @color-disabled-50; - &::before { - background-position-y: bottom; - } - } - } - - .transaction-info { - .line-wrapper { - .line { - color: @color-basic-500; - - .bottom { - color: @color-accent-100; - } - - .status-label-min { - display: inline-block; - top: auto; - bottom: 3px; - margin-top: 0; - right: auto; - } - } - } - } - } -} - -.transaction-amounts { - max-width: 100%; - display: inline-block; -} - -@media screen and (max-width: 960px) { - .leasing w-transaction .transaction { - .icon { - margin-right: 20px; - } - - .status-label-min { - right: 40px; - top: 24px; - bottom: auto; - } - - .transaction-info { - - .line-wrapper { - display: flex; - flex-direction: column; - justify-content: space-between; - padding: 5px 0; - - .line { - height: 50%; - - .locale-address { - display: none; - } - - .bottom.fs-mobile { - font-size: @mobile-low-fsize; - } - - .top.fs-mobile { - font-size: @mobile-mid-fsize; - } - - &:last-child { - padding-right: 0; - text-align: left; - } - } - } - } - } -} - -@media screen and (max-width: 768px) { - w-transaction .transaction { - .icon { - margin: auto 20px auto 20px; - } - - .transaction-info { - - .line-wrapper { - display: flex; - flex-direction: column; - justify-content: space-between; - padding: 5px 0; - - .line { - height: 50%; - - .locale-address { - display: none; - } - - .top.fs-mobile { - font-size: @mobile-mid-fsize; - line-height: 1.2em; - } - - .bottom.fs-mobile { - font-size: @mobile-low-fsize; - line-height: 1.2em; - padding-top: 3px; - } - - &:last-child { - padding-right: 0; - text-align: left; - } - } - } - } - - &.spam { - .transaction-info { - .line-wrapper { - .line { - .top { - .status-label-min { - position: absolute; - right: 43px; - bottom: 44px; - } - } - } - } - } - } - } -} - -@media screen and (max-width: 540px) { - md-dialog { - w-transaction .transaction { - .status-label-min { - right: 10px; - } - } - } -} diff --git a/src/modules/ui/directives/transaction/types/burn/Burn.js b/src/modules/ui/directives/transaction/types/burn/Burn.js deleted file mode 100644 index 317eb8821a..0000000000 --- a/src/modules/ui/directives/transaction/types/burn/Burn.js +++ /dev/null @@ -1,64 +0,0 @@ -(function () { - 'use strict'; - - const tsUtils = require('ts-utils'); - const { Money } = require('@waves/data-entities'); - - /** - * @param {User} user - * @return {Burn} - */ - - const controller = function (user) { - - class Burn { - - /** - * {object} - */ - props = null; - - $postLink() { - this.assetName = this.getAssetName( - tsUtils.get(this.props, 'amount.asset') || - tsUtils.get(this.props, 'quantity.asset') || - this.props - ); - this.name = tsUtils.get(this.props, 'amount.asset.name') || - tsUtils.get(this.props, 'quantity.asset.name'); - - const amount = tsUtils.get(this.props, 'amount') || tsUtils.get(this.props, 'quantity'); - this.amount = amount instanceof Money ? - amount.toFormat() : - amount.div(Math.pow(10, this.props.precision)); - } - - /** - * @param {{id: string, name: string}} asset - * @return {string} - */ - getAssetName(asset) { - try { - return !user.scam[asset.id] ? asset.name : ''; - } catch (e) { - return ''; - } - } - - } - - return new Burn(); - }; - - controller.$inject = [ - 'user' - ]; - - angular.module('app.ui').component('wBurn', { - bindings: { - props: '<' - }, - templateUrl: 'modules/ui/directives/transaction/types/burn/burn.html', - controller - }); -})(); diff --git a/src/modules/ui/directives/transaction/types/burn/burn.html b/src/modules/ui/directives/transaction/types/burn/burn.html deleted file mode 100644 index 80fbf9b3ac..0000000000 --- a/src/modules/ui/directives/transaction/types/burn/burn.html +++ /dev/null @@ -1,20 +0,0 @@ -
    -
    -
    - - -
    -
    - -
    -
    -
    -
    - - {{$ctrl.name}} -
    -
    -
    diff --git a/src/modules/ui/directives/transaction/types/cancel-leasing/CancelLeasing.js b/src/modules/ui/directives/transaction/types/cancel-leasing/CancelLeasing.js deleted file mode 100644 index f5bff46b63..0000000000 --- a/src/modules/ui/directives/transaction/types/cancel-leasing/CancelLeasing.js +++ /dev/null @@ -1,10 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.ui').component('wCancelLeasing', { - bindings: { - props: '<' - }, - templateUrl: 'modules/ui/directives/transaction/types/cancel-leasing/cancel-leasing.html' - }); -})(); diff --git a/src/modules/ui/directives/transaction/types/cancel-leasing/cancel-leasing.html b/src/modules/ui/directives/transaction/types/cancel-leasing/cancel-leasing.html deleted file mode 100644 index 6105c74899..0000000000 --- a/src/modules/ui/directives/transaction/types/cancel-leasing/cancel-leasing.html +++ /dev/null @@ -1,20 +0,0 @@ -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    diff --git a/src/modules/ui/directives/transaction/types/create-alias/CreateAlias.js b/src/modules/ui/directives/transaction/types/create-alias/CreateAlias.js deleted file mode 100644 index b6e8618f35..0000000000 --- a/src/modules/ui/directives/transaction/types/create-alias/CreateAlias.js +++ /dev/null @@ -1,10 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.ui').component('wCreateAlias', { - bindings: { - props: '<' - }, - templateUrl: 'modules/ui/directives/transaction/types/create-alias/create-alias.html' - }); -})(); diff --git a/src/modules/ui/directives/transaction/types/create-alias/create-alias.html b/src/modules/ui/directives/transaction/types/create-alias/create-alias.html deleted file mode 100644 index 61b8b4fa42..0000000000 --- a/src/modules/ui/directives/transaction/types/create-alias/create-alias.html +++ /dev/null @@ -1,12 +0,0 @@ -
    -
    -
    - -
    -
    - -
    -
    -
    -
    diff --git a/src/modules/ui/directives/transaction/types/data/Data.js b/src/modules/ui/directives/transaction/types/data/Data.js deleted file mode 100644 index e0a33d07f0..0000000000 --- a/src/modules/ui/directives/transaction/types/data/Data.js +++ /dev/null @@ -1,44 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {Waves} waves - * @return {Issue} - */ - - const controller = function (waves) { - - const { propEq } = require('ramda'); - - class Data { - - /** - * {object} - */ - props = null; - - $postLink() { - if (this.props.typeName === 'data-vote') { - const assetId = this.props.data.find(propEq('key', 'assetId')).value; - waves.node.assets.getAsset(assetId).then(asset => { - this.assetName = asset.displayName; - }); - } - } - - - } - - return new Data(); - }; - - controller.$inject = ['waves']; - - angular.module('app.ui').component('wData', { - bindings: { - props: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transaction/types/data/data.html' - }); -})(); diff --git a/src/modules/ui/directives/transaction/types/data/data.html b/src/modules/ui/directives/transaction/types/data/data.html deleted file mode 100644 index fc8dfef1f5..0000000000 --- a/src/modules/ui/directives/transaction/types/data/data.html +++ /dev/null @@ -1,12 +0,0 @@ -
    -
    -
    - -
    -
    - -
    -
    -
    -
    \ No newline at end of file diff --git a/src/modules/ui/directives/transaction/types/exchange/Exchange.js b/src/modules/ui/directives/transaction/types/exchange/Exchange.js deleted file mode 100644 index 3e29a9290d..0000000000 --- a/src/modules/ui/directives/transaction/types/exchange/Exchange.js +++ /dev/null @@ -1,67 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {User} user - * @param {app.utils} utils - * @return {Exchange} - */ - - const controller = function (user, utils) { - - class Exchange { - - /** - * {object} - */ - props = null; - - $postLink() { - this.typeName = this.props.typeName; - this.amountAssetName = this.getAssetName(this.props.amount.asset); - this.priceAssetName = this.getAssetName(this.props.price.asset); - this.isScamAmount = !!user.scam[this.props.amount.asset]; - this.isScamPrice = !!user.scam[this.props.price.asset]; - this.amountParams = { - sign: this.typeName === 'exchange-buy' ? '+' : '–', - amount: this.props.amount.toFormat(), - name: this.props.amount.asset.name - }; - this.priceParams = { - sign: this.typeName === 'exchange-buy' ? '-' : '+', - amount: utils.getExchangeTotalPrice(this.props.amount, this.props.price), - name: this.props.price.asset.name - }; - - } - - /** - * @param {{id: string, name: string}} asset - * @return {string} - */ - getAssetName(asset) { - try { - return !user.scam[asset.id] ? asset.name : ''; - } catch (e) { - return ''; - } - } - - } - - return new Exchange(); - }; - - controller.$inject = [ - 'user', - 'utils' - ]; - - angular.module('app.ui').component('wExchangeData', { - bindings: { - props: '<' - }, - templateUrl: 'modules/ui/directives/transaction/types/exchange/exchange.html', - controller - }); -})(); diff --git a/src/modules/ui/directives/transaction/types/exchange/exchange.html b/src/modules/ui/directives/transaction/types/exchange/exchange.html deleted file mode 100644 index 12340db0aa..0000000000 --- a/src/modules/ui/directives/transaction/types/exchange/exchange.html +++ /dev/null @@ -1,34 +0,0 @@ -
    -
    -
    - - - {{$ctrl.amountAssetName}} - - /{{$ctrl.priceAssetName}} - - - - - -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    diff --git a/src/modules/ui/directives/transaction/types/issue/Issue.js b/src/modules/ui/directives/transaction/types/issue/Issue.js deleted file mode 100644 index c2571b2405..0000000000 --- a/src/modules/ui/directives/transaction/types/issue/Issue.js +++ /dev/null @@ -1,64 +0,0 @@ -(function () { - 'use strict'; - - const tsUtils = require('ts-utils'); - const { Money } = require('@waves/data-entities'); - - /** - * @param {User} user - * @return {Issue} - */ - - const controller = function (user) { - - class Issue { - - /** - * {object} - */ - props = null; - - $postLink() { - this.assetName = this.getAssetName( - tsUtils.get(this.props, 'amount.asset') || - tsUtils.get(this.props, 'quantity.asset') || - this.props - ); - this.name = tsUtils.get(this.props, 'amount.asset.name') || - tsUtils.get(this.props, 'quantity.asset.name'); - - const amount = tsUtils.get(this.props, 'amount') || tsUtils.get(this.props, 'quantity'); - this.amount = amount instanceof Money ? - amount.toFormat() : - amount.div(Math.pow(10, this.props.precision)); - } - - /** - * @param {{id: string, name: string}} asset - * @return {string} - */ - getAssetName(asset) { - try { - return !user.scam[asset.id] ? asset.name : ''; - } catch (e) { - return ''; - } - } - - } - - return new Issue(); - }; - - controller.$inject = [ - 'user' - ]; - - angular.module('app.ui').component('wIssue', { - bindings: { - props: '<' - }, - templateUrl: 'modules/ui/directives/transaction/types/issue/issue.html', - controller - }); -})(); diff --git a/src/modules/ui/directives/transaction/types/issue/issue.html b/src/modules/ui/directives/transaction/types/issue/issue.html deleted file mode 100644 index ef6ba2af6b..0000000000 --- a/src/modules/ui/directives/transaction/types/issue/issue.html +++ /dev/null @@ -1,23 +0,0 @@ -
    -
    -
    - - -
    -
    - -
    -
    -
    -
    - - {{$ctrl.name}} -
    -
    - -
    -
    -
    diff --git a/src/modules/ui/directives/transaction/types/lease/Lease.js b/src/modules/ui/directives/transaction/types/lease/Lease.js deleted file mode 100644 index 2c91f7f99b..0000000000 --- a/src/modules/ui/directives/transaction/types/lease/Lease.js +++ /dev/null @@ -1,10 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.ui').component('wLease', { - bindings: { - props: '<' - }, - templateUrl: 'modules/ui/directives/transaction/types/lease/lease.html' - }); -})(); diff --git a/src/modules/ui/directives/transaction/types/lease/lease.html b/src/modules/ui/directives/transaction/types/lease/lease.html deleted file mode 100644 index e79860930f..0000000000 --- a/src/modules/ui/directives/transaction/types/lease/lease.html +++ /dev/null @@ -1,21 +0,0 @@ -
    -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    - diff --git a/src/modules/ui/directives/transaction/types/mass-transfer/MassTransfer.js b/src/modules/ui/directives/transaction/types/mass-transfer/MassTransfer.js deleted file mode 100644 index f7ad5a5529..0000000000 --- a/src/modules/ui/directives/transaction/types/mass-transfer/MassTransfer.js +++ /dev/null @@ -1,105 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {typeof Base} Base - * @param {User} user - * @param {BaseAssetService} baseAssetService - * @param {Waves} waves - * @param {$rootScope.Scope} $scope - * @param {app.utils} utils - * @return {MassTransfer} - */ - - const controller = function (Base, user, baseAssetService, waves, $scope, utils) { - - class MassTransfer extends Base { - - /** - * {object} - */ - props = null; - - $postLink() { - this.typeName = this.props.typeName; - this.time = this.props.time; - this.address = this.props.shownAddress; - this.isScam = this.props.isScam; - - this.receive(utils.observe(this.props, 'isScam'), () => { - this.isScam = this.props.isScam; - utils.safeApply($scope); - }); - - const TYPES = waves.node.transactions.TYPES; - - switch (this.typeName) { - case TYPES.SPONSORSHIP_FEE: - this.sponsoredFee(); - break; - default: - this.transfered(); - } - } - - /** - * @param {{id: string, name: string}} asset - * @return {string} - */ - getAssetName(asset) { - try { - return !user.scam[asset.id] ? asset.name : ''; - } catch (e) { - return ''; - } - } - - sponsoredFee() { - this.assetName = this.getAssetName(this.props.fee.asset); - this.amountParams = { - sign: '+', - amount: this.props.fee.toFormat(), - name: this.props.fee.asset.name - }; - } - - transfered() { - this.assetName = this.getAssetName(this.props.amount.asset); - this.amountParams = { - amount: this.props.amount.toFormat(), - name: this.props.amount.asset.name - }; - if (this.props.amount && this.props.amount instanceof ds.wavesDataEntities.Money) { - baseAssetService.convertToBaseAsset(this.props.amount) - .then((baseMoney) => { - this.mirrorBalanceParams = { - amount: baseMoney.toFormat(), - name: baseMoney.asset.name - }; - $scope.$digest(); - }); - } - } - - } - - return new MassTransfer(); - }; - - controller.$inject = [ - 'Base', - 'user', - 'baseAssetService', - 'waves', - '$scope', - 'utils' - ]; - - angular.module('app.ui').component('wMassTransferRow', { - bindings: { - props: '<' - }, - templateUrl: 'modules/ui/directives/transaction/types/mass-transfer/mass-transfer.html', - controller - }); -})(); diff --git a/src/modules/ui/directives/transaction/types/mass-transfer/mass-transfer.html b/src/modules/ui/directives/transaction/types/mass-transfer/mass-transfer.html deleted file mode 100644 index a2559c8eaf..0000000000 --- a/src/modules/ui/directives/transaction/types/mass-transfer/mass-transfer.html +++ /dev/null @@ -1,23 +0,0 @@ -
    -
    -
    - - -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    diff --git a/src/modules/ui/directives/transaction/types/reissue/Reissue.js b/src/modules/ui/directives/transaction/types/reissue/Reissue.js deleted file mode 100644 index 08aa2d9775..0000000000 --- a/src/modules/ui/directives/transaction/types/reissue/Reissue.js +++ /dev/null @@ -1,64 +0,0 @@ -(function () { - 'use strict'; - - const tsUtils = require('ts-utils'); - const { Money } = require('@waves/data-entities'); - - /** - * @param {User} user - * @return {Reissue} - */ - - const controller = function (user) { - - class Reissue { - - /** - * {object} - */ - props = null; - - $postLink() { - this.assetName = this.getAssetName( - tsUtils.get(this.props, 'amount.asset') || - tsUtils.get(this.props, 'quantity.asset') || - this.props - ); - this.name = tsUtils.get(this.props, 'amount.asset.name') || - tsUtils.get(this.props, 'quantity.asset.name'); - - const amount = tsUtils.get(this.props, 'amount') || tsUtils.get(this.props, 'quantity'); - this.amount = amount instanceof Money ? - amount.toFormat() : - amount.div(Math.pow(10, this.props.precision)); - } - - /** - * @param {{id: string, name: string}} asset - * @return {string} - */ - getAssetName(asset) { - try { - return !user.scam[asset.id] ? asset.name : ''; - } catch (e) { - return ''; - } - } - - } - - return new Reissue(); - }; - - controller.$inject = [ - 'user' - ]; - - angular.module('app.ui').component('wReissue', { - bindings: { - props: '<' - }, - templateUrl: 'modules/ui/directives/transaction/types/reissue/reissue.html', - controller - }); -})(); diff --git a/src/modules/ui/directives/transaction/types/reissue/reissue.html b/src/modules/ui/directives/transaction/types/reissue/reissue.html deleted file mode 100644 index cf87788c6e..0000000000 --- a/src/modules/ui/directives/transaction/types/reissue/reissue.html +++ /dev/null @@ -1,23 +0,0 @@ -
    -
    -
    - - -
    -
    - -
    -
    -
    -
    - - {{$ctrl.name}} -
    -
    - -
    -
    -
    diff --git a/src/modules/ui/directives/transaction/types/script-invocation/script-invocation.html b/src/modules/ui/directives/transaction/types/script-invocation/script-invocation.html deleted file mode 100644 index 76b8dbb115..0000000000 --- a/src/modules/ui/directives/transaction/types/script-invocation/script-invocation.html +++ /dev/null @@ -1,12 +0,0 @@ -
    -
    -
    - -
    -
    - -
    -
    -
    -
    diff --git a/src/modules/ui/directives/transaction/types/script-invocation/script-invocation.js b/src/modules/ui/directives/transaction/types/script-invocation/script-invocation.js deleted file mode 100644 index 88c98ec19f..0000000000 --- a/src/modules/ui/directives/transaction/types/script-invocation/script-invocation.js +++ /dev/null @@ -1,10 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.ui').component('wScriptInvocation', { - bindings: { - props: '<' - }, - templateUrl: 'modules/ui/directives/transaction/types/script-invocation/script-invocation.html' - }); -})(); diff --git a/src/modules/ui/directives/transaction/types/set-asset-script/SetAssetScript.js b/src/modules/ui/directives/transaction/types/set-asset-script/SetAssetScript.js deleted file mode 100644 index e27c8c8020..0000000000 --- a/src/modules/ui/directives/transaction/types/set-asset-script/SetAssetScript.js +++ /dev/null @@ -1,42 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {Waves} waves - * @return {Transaction} - */ - - const controller = function (waves) { - - class SetAssetScript { - - /** - * {object} - */ - props = null; - - $postLink() { - if (this.props.assetId) { - waves.node.assets.getAsset(this.props.assetId).then(asset => { - this.name = asset.name; - }); - } - } - - } - - return new SetAssetScript(); - }; - - controller.$inject = [ - 'waves' - ]; - - angular.module('app.ui').component('wSetAssetScript', { - bindings: { - props: '<' - }, - templateUrl: 'modules/ui/directives/transaction/types/set-asset-script/set-asset-script.html', - controller - }); -})(); diff --git a/src/modules/ui/directives/transaction/types/set-asset-script/set-asset-script.html b/src/modules/ui/directives/transaction/types/set-asset-script/set-asset-script.html deleted file mode 100644 index a84780e948..0000000000 --- a/src/modules/ui/directives/transaction/types/set-asset-script/set-asset-script.html +++ /dev/null @@ -1,13 +0,0 @@ -
    -
    -
    - - -
    - -
    -
    -
    -
    -
    diff --git a/src/modules/ui/directives/transaction/types/set-script/SetScript.js b/src/modules/ui/directives/transaction/types/set-script/SetScript.js deleted file mode 100644 index f468cc20bd..0000000000 --- a/src/modules/ui/directives/transaction/types/set-script/SetScript.js +++ /dev/null @@ -1,10 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.ui').component('wSetScript', { - bindings: { - props: '<' - }, - templateUrl: 'modules/ui/directives/transaction/types/set-script/set-script.html' - }); -})(); diff --git a/src/modules/ui/directives/transaction/types/set-script/set-script.html b/src/modules/ui/directives/transaction/types/set-script/set-script.html deleted file mode 100644 index 5ff5dc6fae..0000000000 --- a/src/modules/ui/directives/transaction/types/set-script/set-script.html +++ /dev/null @@ -1,7 +0,0 @@ -
    -
    -
    - -
    -
    -
    diff --git a/src/modules/ui/directives/transaction/types/sponsorship/Sponsorship.js b/src/modules/ui/directives/transaction/types/sponsorship/Sponsorship.js deleted file mode 100644 index f0ed4fa554..0000000000 --- a/src/modules/ui/directives/transaction/types/sponsorship/Sponsorship.js +++ /dev/null @@ -1,54 +0,0 @@ -(function () { - 'use strict'; - - const tsUtils = require('ts-utils'); - - /** - * @param {User} user - * @return {Sponsorship} - */ - - const controller = function (user) { - - class Sponsorship { - - /** - * {object} - */ - props = null; - - $postLink() { - this.assetName = this.getAssetName( - tsUtils.get(this.props, 'minSponsoredAssetFee.asset') - ); - } - - /** - * @param {{id: string, name: string}} asset - * @return {string} - */ - getAssetName(asset) { - try { - return !user.scam[asset.id] ? asset.name : ''; - } catch (e) { - return ''; - } - } - - } - - return new Sponsorship(); - }; - - controller.$inject = [ - 'user' - ]; - - angular.module('app.ui').component('wSponsorship', { - bindings: { - props: '<' - }, - templateUrl: 'modules/ui/directives/transaction/types/sponsorship/sponsorship.html', - controller - }); -})(); diff --git a/src/modules/ui/directives/transaction/types/sponsorship/sponsorship.html b/src/modules/ui/directives/transaction/types/sponsorship/sponsorship.html deleted file mode 100644 index e07b9c2b13..0000000000 --- a/src/modules/ui/directives/transaction/types/sponsorship/sponsorship.html +++ /dev/null @@ -1,12 +0,0 @@ -
    -
    -
    - - -
    -
    - {{::$ctrl.props.time}} -
    -
    -
    -
    diff --git a/src/modules/ui/directives/transaction/types/transfer.html b/src/modules/ui/directives/transaction/types/transfer.html deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/modules/ui/directives/transaction/types/transfer/Transfer.js b/src/modules/ui/directives/transaction/types/transfer/Transfer.js deleted file mode 100644 index 8cf46878d6..0000000000 --- a/src/modules/ui/directives/transaction/types/transfer/Transfer.js +++ /dev/null @@ -1,105 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {typeof Base} Base - * @param {User} user - * @param {BaseAssetService} baseAssetService - * @param {Waves} waves - * @param {$rootScope.Scope} $scope - * @param {app.utils} utils - * @return {Transfer} - */ - - const controller = function (Base, user, baseAssetService, waves, $scope, utils) { - - class Transfer extends Base { - - /** - * @type object - */ - props = Object.create(null); - - $postLink() { - this.typeName = this.props.typeName; - this.time = this.props.time; - this.address = this.props.shownAddress; - this.isScam = this.props.isScam; - - this.receive(utils.observe(this.props, 'isScam'), () => { - this.isScam = this.props.isScam; - utils.safeApply($scope); - }); - - const TYPES = waves.node.transactions.TYPES; - - switch (this.typeName) { - case TYPES.SPONSORSHIP_FEE: - this.sponsoredFee(); - break; - default: - this.transfered(); - } - } - - /** - * @param {{id: string, name: string}} asset - * @return {string} - */ - getAssetName(asset) { - try { - return !user.scam[asset.id] ? asset.name : ''; - } catch (e) { - return ''; - } - } - - sponsoredFee() { - this.assetName = this.getAssetName(this.props.fee.asset); - this.amountParams = { - sign: '+', - amount: this.props.fee.toFormat(), - name: this.props.fee.asset.name - }; - } - - transfered() { - this.assetName = this.getAssetName(this.props.amount.asset); - this.amountParams = { - amount: this.props.amount.toFormat(), - name: this.props.amount.asset.name - }; - if (this.props.amount && this.props.amount instanceof ds.wavesDataEntities.Money) { - baseAssetService.convertToBaseAsset(this.props.amount) - .then((baseMoney) => { - this.mirrorBalanceParams = { - amount: baseMoney.toFormat(), - name: baseMoney.asset.name - }; - $scope.$digest(); - }); - } - } - - } - - return new Transfer(); - }; - - controller.$inject = [ - 'Base', - 'user', - 'baseAssetService', - 'waves', - '$scope', - 'utils' - ]; - - angular.module('app.ui').component('wTransferRow', { - bindings: { - props: '<' - }, - templateUrl: 'modules/ui/directives/transaction/types/transfer/transfer.html', - controller - }); -})(); diff --git a/src/modules/ui/directives/transaction/types/transfer/transfer.html b/src/modules/ui/directives/transaction/types/transfer/transfer.html deleted file mode 100644 index a2559c8eaf..0000000000 --- a/src/modules/ui/directives/transaction/types/transfer/transfer.html +++ /dev/null @@ -1,23 +0,0 @@ -
    -
    -
    - - -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    diff --git a/src/modules/ui/directives/transaction/types/unknown/Unknown.js b/src/modules/ui/directives/transaction/types/unknown/Unknown.js deleted file mode 100644 index b1573f7342..0000000000 --- a/src/modules/ui/directives/transaction/types/unknown/Unknown.js +++ /dev/null @@ -1,10 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.ui').component('wUnknown', { - bindings: { - props: '<' - }, - templateUrl: 'modules/ui/directives/transaction/types/unknown/unknown.html' - }); -})(); diff --git a/src/modules/ui/directives/transaction/types/unknown/unknown.html b/src/modules/ui/directives/transaction/types/unknown/unknown.html deleted file mode 100644 index 29a9be6149..0000000000 --- a/src/modules/ui/directives/transaction/types/unknown/unknown.html +++ /dev/null @@ -1,13 +0,0 @@ -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    diff --git a/src/modules/ui/directives/transactionInfo/TransactionInfo.js b/src/modules/ui/directives/transactionInfo/TransactionInfo.js deleted file mode 100644 index 39000ed6d1..0000000000 --- a/src/modules/ui/directives/transactionInfo/TransactionInfo.js +++ /dev/null @@ -1,76 +0,0 @@ -(function () { - 'use strict'; - - /** - * - * @param Base - * @param {$rootScope.Scope} $scope - * @return {TransactionInfoCtrl} - */ - const controller = function (Base, $scope) { - - const analytics = require('@waves/event-sender'); - const { SIGN_TYPE } = require('@waves/signature-adapter'); - - const ANALYTICS_TX_NAMES = { - [SIGN_TYPE.CREATE_ORDER]: 'Create order', - [SIGN_TYPE.ISSUE]: 'Token Generation', - [SIGN_TYPE.TRANSFER]: 'Transfer', - [SIGN_TYPE.REISSUE]: 'Reissue', - [SIGN_TYPE.BURN]: 'Burn Token', - [SIGN_TYPE.EXCHANGE]: 'Exchange', - [SIGN_TYPE.LEASE]: 'Leasing', - [SIGN_TYPE.CANCEL_LEASING]: 'Cancel Leasing', - [SIGN_TYPE.CREATE_ALIAS]: 'Create Alias', - [SIGN_TYPE.MASS_TRANSFER]: 'Mass Transfer', - [SIGN_TYPE.DATA]: 'Data', - [SIGN_TYPE.SET_SCRIPT]: 'Set Script', - [SIGN_TYPE.SPONSORSHIP]: 'Sponsorship', - [SIGN_TYPE.SET_ASSET_SCRIPT]: 'Set Asset Script', - [SIGN_TYPE.SCRIPT_INVOCATION]: 'Script Invocation' - }; - - class TransactionInfoCtrl extends Base { - - constructor() { - super($scope); - /** - * @type {Signable} - */ - this.signable = null; - } - - $postLink() { - if (!this.signable) { - throw new Error('Has no signable!'); - } - const name = `${this.getEventName(this.signable)} Info Show`; - analytics.send({ name, target: 'ui' }); - } - - getEventName(data) { - if (data.type) { - return data.type in ANALYTICS_TX_NAMES ? ANALYTICS_TX_NAMES[data.type] : 'Unknown'; - } else { - return ANALYTICS_TX_NAMES[SIGN_TYPE.CREATE_ORDER]; - } - } - - } - - return new TransactionInfoCtrl(); - }; - - controller.$inject = ['Base', '$scope']; - - angular.module('app.ui').component('wTransactionInfo', { - bindings: { - signable: '<', - isConfirm: '<', - confirmed: '<' - }, - templateUrl: 'modules/ui/directives/transactionInfo/transaction-info.html', - scope: false, - controller - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/TransactionInfoContent.js b/src/modules/ui/directives/transactionInfo/TransactionInfoContent.js deleted file mode 100644 index 24eda084db..0000000000 --- a/src/modules/ui/directives/transactionInfo/TransactionInfoContent.js +++ /dev/null @@ -1,11 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.ui').component('wTransactionInfoContent', { - bindings: { - signable: '<', - confirmed: '<' - }, - templateUrl: 'modules/ui/directives/transactionInfo/transaction-info-content.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/TransactionInfoGeneral.js b/src/modules/ui/directives/transactionInfo/TransactionInfoGeneral.js deleted file mode 100644 index 0e5af1dfcc..0000000000 --- a/src/modules/ui/directives/transactionInfo/TransactionInfoGeneral.js +++ /dev/null @@ -1,36 +0,0 @@ -(function () { - 'use strict'; - - const controller = function () { - - class TransactionInfoGeneral { - - /** - * @type {number} - */ - height; - /** - * @type {string} - */ - id; - /** - * @type {Money} - */ - fee; - - } - - return new TransactionInfoGeneral(); - }; - - angular.module('app.ui').component('wTransactionInfoGeneral', { - bindings: { - timestamp: '<', - height: '<', - id: '<', - fee: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/transaction-info-general.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/TransactionInfoHeader.js b/src/modules/ui/directives/transactionInfo/TransactionInfoHeader.js deleted file mode 100644 index bfe54746e6..0000000000 --- a/src/modules/ui/directives/transactionInfo/TransactionInfoHeader.js +++ /dev/null @@ -1,106 +0,0 @@ -(function () { - 'use strict'; - - const { SIGN_TYPE } = require('@waves/signature-adapter'); - - /** - * @param {app.utils} utils - * @return {TransactionInfoHeader} - */ - const controller = function (utils, user, waves) { - - const { propEq } = require('ramda'); - - class TransactionInfoHeader { - - /** - * @type {Signable} - */ - signable; - - /** - * @type {boolean} - */ - isScam; - - /** - * @type {boolean} - */ - isScamAmount; - - /** - * @type {boolean} - */ - isScamPrice; - - $postLink() { - const isOrder = this.signable.type === SIGN_TYPE.CREATE_ORDER; - this.typeName = isOrder ? 'create-order' : utils.getTransactionTypeName(this.signable.getTxData()); - this.transaction = this.signable.getTxData(); - if (!this.transaction.assetId) { - this._addAssetId(this.transaction.type); - } - this.isScam = !!user.scam[this.transaction.assetId]; - if (this.transaction.type === 7) { - this.isScamAmount = !!user.scam[this.transaction.amount.asset]; - this.isScamPrice = !!user.scam[this.transaction.price.asset]; - } - if (this.signable.type === 12) { - this._checkDataTx(); - } - } - - _checkDataTx() { - const transaction = this.signable.getTxData(); - const findKey = key => transaction.data.find(propEq('key', key)); - - const keyRating = findKey('score'); - - this.voteObject = Object.create(null); - - if (keyRating) { - this.voteObject.rating = findKey('score').value; - this.voteObject.assetId = findKey('assetId').value; - waves.node.assets.getAsset(this.voteObject.assetId).then(asset => { - this.voteObject.assetName = asset.displayName; - }); - } - } - - _addAssetId(typeName) { - switch (typeName) { - case 4: - case 11: - this.transaction = { - ...this.transaction, - assetId: this.transaction.amount.asset.id - }; - break; - case 14: - this.transaction = { - ...this.transaction, - assetId: this.transaction.minSponsoredAssetFee.asset.id - }; - break; - default: - break; - } - - } - - } - - return new TransactionInfoHeader(); - }; - - controller.$inject = ['utils', 'user', 'waves']; - - angular.module('app.ui').component('wTransactionInfoHeader', { - bindings: { - signable: '<' - }, - templateUrl: 'modules/ui/directives/transactionInfo/transaction-info-header.html', - scope: false, - controller - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/TransactionInfoJson.js b/src/modules/ui/directives/transactionInfo/TransactionInfoJson.js deleted file mode 100644 index 94c0d4486f..0000000000 --- a/src/modules/ui/directives/transactionInfo/TransactionInfoJson.js +++ /dev/null @@ -1,50 +0,0 @@ -(function () { - 'use strict'; - - const controller = function ($scope) { - - class TransactionInfoJson { - - /** - * @type {string} - */ - json = ''; - /** - * @type {Signable} - */ - signable = null; - - $postLink() { - if (!this.signable) { - throw new Error('Has no signable!'); - } - - this.signable.getDataForApi().then(json => { - this.json = WavesApp.stringifyJSON(json, null, 4); - $scope.$apply(); - }); - } - - addAnalytic() { - // analytics.push( - // 'ConfirmTransaction', - // `ConfirmTransaction.${this.signable.type}.CopyTransactionJSON` - // ); - } - - } - - return new TransactionInfoJson(); - }; - - controller.$inject = ['$scope']; - - angular.module('app.ui').component('wTransactionInfoJson', { - bindings: { - signable: '<' - }, - templateUrl: 'modules/ui/directives/transactionInfo/transaction-info-json.html', - scope: false, - controller - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/transaction-info-content.html b/src/modules/ui/directives/transactionInfo/transaction-info-content.html deleted file mode 100644 index b1d025bceb..0000000000 --- a/src/modules/ui/directives/transactionInfo/transaction-info-content.html +++ /dev/null @@ -1,18 +0,0 @@ -
    - - - - - - - - - - - - - - - - -
    diff --git a/src/modules/ui/directives/transactionInfo/transaction-info-general.html b/src/modules/ui/directives/transactionInfo/transaction-info-general.html deleted file mode 100644 index d9df5aded9..0000000000 --- a/src/modules/ui/directives/transactionInfo/transaction-info-general.html +++ /dev/null @@ -1,21 +0,0 @@ -
    -
    -
    {{::$ctrl.timestamp | date:'dd.MM.yyyy HH:mm:ss'}}
    -
    - -
    -
    -
    {{::$ctrl.height}}
    -
    - -
    -
    -
    {{::$ctrl.id}}
    -
    - -
    -
    -
    - -
    -
    diff --git a/src/modules/ui/directives/transactionInfo/transaction-info-header.html b/src/modules/ui/directives/transactionInfo/transaction-info-header.html deleted file mode 100644 index e31adb5d45..0000000000 --- a/src/modules/ui/directives/transactionInfo/transaction-info-header.html +++ /dev/null @@ -1,22 +0,0 @@ -
    - -
    - - - - - - - - - - - - - - - - - - -
    diff --git a/src/modules/ui/directives/transactionInfo/transaction-info-json.html b/src/modules/ui/directives/transactionInfo/transaction-info-json.html deleted file mode 100644 index 7fbe6d9f81..0000000000 --- a/src/modules/ui/directives/transactionInfo/transaction-info-json.html +++ /dev/null @@ -1,12 +0,0 @@ -
    -
    -
    - -
    -
    -
    - 
    {{$ctrl.json}}
    -
    diff --git a/src/modules/ui/directives/transactionInfo/transaction-info.html b/src/modules/ui/directives/transactionInfo/transaction-info.html deleted file mode 100644 index 371b1ab668..0000000000 --- a/src/modules/ui/directives/transactionInfo/transaction-info.html +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/src/modules/ui/directives/transactionInfo/transactionInfo.less b/src/modules/ui/directives/transactionInfo/transactionInfo.less deleted file mode 100644 index bf94b19abb..0000000000 --- a/src/modules/ui/directives/transactionInfo/transactionInfo.less +++ /dev/null @@ -1,635 +0,0 @@ -@import (reference) '../../../app/less/typography'; -@import (reference) "../../../app/less/app-icons"; -@import (reference) '../../../app/less/classes'; -@import (reference) '../../../app/less/app'; -@import (reference) 'config'; -@import (reference) 'icons'; - -@tx-icon-size: 80px; - -md-dialog.txinfo { - md-dialog-content { - padding-top: 0; - } -} - -w-transaction-info, -w-transaction-info-header, -w-transaction-info-content, -w-transaction-export, -w-transaction-info-json { - display: block; - width: 100%; -} - -w-transaction-info-general { - .txinfo__row:first-child { - border-top-style: dashed; - } -} - -w-transaction-info-header + w-transaction-info-general { - .txinfo__row:first-child { - border-top-style: solid; - } -} - -.txinfo { - display: block; - width: 100%; - - &__data { - width: 100%; - } - - .plate-note { - margin: 0 0 20px; - } - - .noborder { - margin-bottom: -1px; - background: @color-white; - position: relative; - z-index: 1; - } - - &__wrapper { - display: flex; - flex-direction: column; - align-items: center; - - .bottom-warning { - width: 100%; - position: relative; - background: @color-white; - margin-bottom: -1px; - padding-top: 30px; - border-top: 1px solid @color-basic-100; - } - - &-scrolled { - max-height: 248px; - overflow: auto; - margin-right: -13px; - padding-right: 13px; - } - } - - &__lead { - text-align: center; - padding: 0 0 30px; - border-bottom: 1px solid @color-basic-100; - .noborder(); - z-index: 2; - - &.noborder { - border-bottom: 0 none; - margin: 0; - } - - h3 { - margin: 0 0 6px; - &.vote-token-h3 { - margin: 20px 0 6px; - } - } - - .txinfo__rating { - padding-top: 83px; - } - - .tooltip { - min-height: 30px; - display: none; - position: absolute; - bottom: 100%; - padding: 5px 0 5px 10px; - transform: translate(calc(-50% + 8px), -8px); - z-index: 2; - cursor: pointer; - border-radius: 4px; - background: #4e5c6e; - } - &__content { - color: #fff; - font-size: 11px; - max-width: 240px; - max-height: 150px; - width: max-content; - overflow: auto; - display: block; - padding-right: 10px; - } - - } - - &__header-wrapper { - display: flex; - align-items: center; - justify-content: center; - margin: 0 0 6px; - h3 { - margin: 0; - } - } - - &__row { - width: 100%; - display: flex; - align-items: flex-start; - justify-content: space-between; - padding: 13px 0; - border-top: 1px dashed @color-basic-100; - - &:first-child:not(.txinfo__row-header) { - border-top: 1px solid @color-basic-100; - } - - &-header { - border-bottom: 1px solid @color-basic-100; - border-top: 0 none; - color: @color-basic-500; - .noborder(); - z-index: 3; - margin: -1px 0; - } - - &-contains-text { - flex-wrap: wrap; - padding-bottom: 0; - .noborder(); - - .txinfo { - &__key { - margin-bottom: 4px; - } - - &__text { - .footnote-1(); - width: 100%; - padding: 13px 16px; - border: 1px dashed @color-basic-100; - border-radius: @border-radius; - background: @color-basic-50; - color: @color-basic-900; - } - } - } - - &-padder { - height: 40px; - padding-top: 5px; - .noborder(); - } - - .txinfo { - .key-props { - flex-basis: auto; - flex-grow: 0; - padding-right: 20px; - overflow: hidden; - .footnote-1(); - } - - &__key { - .key-props(); - color: @color-basic-500; - - &-mass { - .key-props(); - color: @color-basic-900; - } - } - - &__value { - flex-basis: auto; - flex-grow: 0; - text-align: right; - word-break: break-all; - .footnote-1(); - color: @color-basic-900; - &-uppercase:first-letter { - text-transform: uppercase; - } - &-name { - margin-left: 5px; - display: inline-block; - } - } - - &__text { - flex-basis: 100%; - flex-grow: 1; - text-align: left; - } - - &__data { - max-height: 140px; - overflow: scroll; - } - - &__button { - color: @color-submit-300; - cursor: pointer; - } - } - - &-border-ts { - border-top: 1px solid @color-basic-100; - } - - &-data { - .txinfo__row { - &:last-child { - border-bottom: 1px dashed @color-basic-100; - } - } - } - } - - - &__icon { - width: @tx-icon-size; - height: @tx-icon-size; - background: none transparent; - position: relative; - border-radius: 50%; - margin: 60px auto 30px; - - &.send { - .icon-tx-send(); - } - - &.receive { - .icon-tx-receive(); - } - - &.mass-send { - .icon-tx-mass-transfer(); - } - - &.mass-receive { - .icon-tx-mass-receive(); - } - - &.circular { - .icon-tx-circular(); - } - - &.issue { - .icon-tx-issue(); - } - - &.reissue { - .icon-tx-reissue(); - } - - &.burn { - .icon-tx-burn(); - } - - &.exchange-buy, - &.exchange-sell, - &.create-order { - .icon-tx-exchange(); - } - - &.create-alias { - .icon-tx-create-alias(); - } - - &.lease-in { - .icon-tx-incoming-leasing(); - } - - &.lease-out { - .icon-tx-lease(); - } - - &.unknown { - .icon-tx-unknown(); - } - - &.cancel-leasing { - .icon-tx-cancel-leasing(); - } - - &.data { - .icon-tx-data(); - } - - &.sponsorship-start { - .icon-tx-sponsorship-start(); - } - - &.sponsorship-stop { - .icon-tx-sponsorship-stop(); - } - - &.sponsorship-fee { - .icon-tx-sponsorship-plus(); - } - - &.set-script { - .icon-tx-set-script(); - } - - &.set-script-cancel { - .icon-tx-cancel-script(); - } - - &.set-asset-script { - .icon-tx-set-asset-script(); - } - - &.script-invocation { - .icon-tx-script-invocation(); - } - - &::before { - width: @tx-icon-size; - height: @tx-icon-size; - background-size: auto @tx-icon-size * 2; - background-color: @color-white; - background-repeat: no-repeat; - background-image: @transaction-icons; - content: ''; - display: block; - } - } - - .spam { - .txinfo__icon { - &.send, - &.receive, - &.circular, - &.exchange-buy, - &.exchange-sell, - &.reissue, - &.sponsorship-start, - &.sponsorship-stop, - &.sponsorship-fee, - &.set-asset-script, - &.mass-send { - &::before { - background-position-y: bottom; - } - } - } - } - - .exchange-header-row { - margin: 0 0 6px; - display: flex; - align-items: center; - justify-content: center; - h3 { - margin: 0; - } - } - - .spam-label { - display: inline-block; - background-color: @color-disabled-200; - color: @color-basic-900; - position: relative; - top: auto; - bottom: 3px; - margin-top: 0; - right: auto; - } - - &__content.spam { - .txinfo { - &__icon { - &.receive { - .icon-tx-spam(); - } - - &.mass-receive { - .icon-tx-mass-spam(); - } - } - } - } - - .status-label { - margin-top: -4px; - } - - &__item { - display: flex; - flex: 1 1 0; - overflow: hidden; - margin-right: 10px; - .txinfo__unit { - text-overflow: ellipsis; - overflow: hidden; - padding-right: 0; - } - - &:last-child { - justify-content: flex-end; - margin-right: 0; - } - } - - &__show { - &-fields { - margin-bottom: -1px; - padding-bottom: 10px; - } - - &-text { - cursor: pointer; - } - } - - .transaction-details { - display: flex; - flex-direction: column; - margin-bottom: 13px; - padding: 0 0 16px; - border-radius: 4px; - max-height: 217px; - overflow-y: hidden; - background-color: @color-basic-50; - transition: max-height 0.3s, margin 0.3s, padding 0.3s; - &.ng-hide { - max-height: 0; - margin-bottom: 0; - padding: 0; - } - &.ng-hide-add { - overflow-y: hidden; - } - &.ng-hide-remove { - overflow-y: hidden; - } - &__list { - padding: 0 16px; - margin: 0; - max-height: 178px; - overflow: hidden; - transition: max-height 0.3s, margin 0.3s; - } - &__item { - width: 100%; - display: flex; - align-items: flex-start; - justify-content: space-between; - border-top: 1px dashed @color-basic-100; - padding: 12px 0 13px; - &_header { - color: @color-basic-500; - } - &:first-child { - padding-top: 16px; - border-top: 0; - } - &:last-child { - padding-bottom: 16px; - } - } - &__actions { - display: flex; - justify-content: flex-end; - padding: 0 16px; - max-height: 100%; - } - &__action { - cursor: pointer; - display: inline-flex; - align-items: center; - &:not(:first-child) { - &:before { - content: ''; - background: @color-basic-500; - width: 1px; - height: 12px; - margin: 0 10px; - } - } - } - &.show-all { - max-height: 260px; - .transaction-details__list { - overflow-y: auto; - max-height: 226px; - } - } - } - - .invoke-args-list__item-value { - max-width: 216px; - &:hover ~ .tooltip { - display: block; - } - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; - } - - .invoke-args-list__item { - position: relative; - } - - // TODO tooltip - //.tooltip { - // display: none; - // max-width: 100%; - // position: absolute; - // padding: 6px 12px; - // top: 35px; - // right: 149px; - // transform-origin: center; - // color: @color-white; - // font-size: @font-size-caption-2; - // line-height: 13px; - // cursor: pointer; - // text-shadow: 0 1px 6px rgba(78, 92, 110, 0.6); - // z-index: 10; - // text-align: left; - // word-wrap: break-word; - // border-radius: @border-radius; - // background: rgba(78, 92, 110, 0.8); - // span { - // overflow: hidden; - // text-overflow: ellipsis; - // display: inline-block; - // text-align: center; - // } - // - // &::before { - // position: absolute; - // content: ''; - // z-index: -1; - // top: -5px; - // right: 10px; - // opacity: .8; - // width: 0; - // height: 0; - // border: 5px solid transparent; - // border-bottom-color: @color-basic-700; - // border-top: 0 none; - // transform: translate(0); - // } - // - // &.right { - // right: 0; - // } - //} -} - - -@media screen and (max-width: @width-media-tiny) { - .recipients-row { - padding: 9px 0 10px; - &:first-child { - padding-top: 12px; - } - &:last-child { - padding-bottom: 12px; - } - } -} - -.code-wrapper { - border: 1px dashed @color-basic-200; - border-radius: @border-radius; - background: @color-basic-50; - height: auto; - max-height: 300px; - word-break: break-all; - padding: 17px; - display: block; - overflow: scroll; - - &-vertical { - overflow-y: auto; - overflow-x: hidden; - .pre { - white-space: normal; - } - } -} - -@media screen and (max-width: 540px) { - .txinfo { - &__lead { - padding: 10px 0; - } - - &__row { - padding: 8px 0; - - &-contains-text { - flex-direction: column; - } - - &-padder { - height: 30px; - } - } - } -} diff --git a/src/modules/ui/directives/transactionInfo/types/burn/BurnHeader.js b/src/modules/ui/directives/transactionInfo/types/burn/BurnHeader.js deleted file mode 100644 index 709abb6751..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/burn/BurnHeader.js +++ /dev/null @@ -1,44 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {app.utils} utils - * @return {BurnHeader} - */ - const controller = function (utils) { - - class BurnHeader { - - /** - * @type {Signable} - */ - signable; - /** - * @type {boolean} - */ - isScam; - - - $postLink() { - this.transaction = this.signable.getTxData(); - this.quantity = this.transaction.amount.toFormat(); - this.name = this.transaction.amount.asset.name; - this.typeName = utils.getTransactionTypeName(this.transaction); - } - - } - - return new BurnHeader(); - }; - - controller.$inject = ['utils']; - - angular.module('app.ui').component('wBurnHeader', { - bindings: { - signable: '<', - isScam: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/burn/burn-header.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/burn/BurnInfo.js b/src/modules/ui/directives/transactionInfo/types/burn/BurnInfo.js deleted file mode 100644 index 05529e6c1a..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/burn/BurnInfo.js +++ /dev/null @@ -1,96 +0,0 @@ -(function () { - 'use strict'; - - const { Money } = require('@waves/data-entities'); - const ds = require('data-service'); - - /** - * @param {typeof Base} Base - * @param {$rootScope.Scope} $scope - * @param {Waves} waves - * @param {BalanceWatcher} balanceWatcher - * @return {BurnInfo} - */ - const controller = function (Base, $scope, waves, balanceWatcher) { - - class BurnInfo extends Base { - - /** - * @type {Signable} - */ - signable; - /** - * @type {boolean} - */ - isConfirm = false; - /** - * @type {string} - */ - id = ''; - /** - * @type {Money} - */ - toRemainOnBalance; - /** - * @type {Money} - */ - totalAfterIssueTokens; - - - $postLink() { - this.transaction = this.signable.getTxData(); - - const addId = id => (this.id = id); - const getTx = id => waves.node.transactions.get(id); - const $apply = () => $scope.$apply(); - const addConfirm = isConfirm => (this.isConfirm = isConfirm); - - (this.transaction.id ? Promise.resolve(this.transaction.id) : this.signable.getId()) - .then(addId) - .then(getTx) - .then(() => false, () => true) - .then(addConfirm) - .then($apply); - - this.receive(balanceWatcher.change, this._onChangeBalances, this); - - this._onChangeBalances(); - } - - /** - * @private - */ - _onChangeBalances() { - const hash = balanceWatcher.getBalance(); - - if (!Object.keys(hash).length) { - return null; - } - - const assetId = this.transaction.assetId; - ds.api.assets.get(assetId).then(asset => { - const quantity = new Money(asset.quantity, asset); - const toReissue = this.transaction.amount; - - this.toRemainOnBalance = (hash[assetId] || new Money(0, asset)).sub(toReissue); - this.totalAfterIssueTokens = quantity.sub(toReissue); - - $scope.$apply(); - }); - } - - } - - return new BurnInfo(); - }; - - controller.$inject = ['Base', '$scope', 'waves', 'balanceWatcher']; - - angular.module('app.ui').component('wBurnInfo', { - bindings: { - signable: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/burn/burn-info.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/burn/burn-header.html b/src/modules/ui/directives/transactionInfo/types/burn/burn-header.html deleted file mode 100644 index cb88577b94..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/burn/burn-header.html +++ /dev/null @@ -1,10 +0,0 @@ -
    -
    -

    - -
    -
    diff --git a/src/modules/ui/directives/transactionInfo/types/burn/burn-info.html b/src/modules/ui/directives/transactionInfo/types/burn/burn-info.html deleted file mode 100644 index e56e5d3c6b..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/burn/burn-info.html +++ /dev/null @@ -1,21 +0,0 @@ -
    -
    -
    {{::$ctrl.transaction.assetId}}
    -
    -
    -
    -
    -
    -
    -
    -
    {{::$ctrl.toRemainOnBalance.toTokens()}}
    -
    -
    -
    -
    {{::$ctrl.totalAfterIssueTokens.toTokens()}}
    -
    - - diff --git a/src/modules/ui/directives/transactionInfo/types/cancel-lease/CancelLeaseHeader.js b/src/modules/ui/directives/transactionInfo/types/cancel-lease/CancelLeaseHeader.js deleted file mode 100644 index 68b53a1114..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/cancel-lease/CancelLeaseHeader.js +++ /dev/null @@ -1,56 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {app.utils} utils - * @param {BaseAssetService} baseAssetService - * @param {$rootScope.Scope} $scope - * @return {CancelLeaseHeader} - */ - const controller = function (utils, baseAssetService, $scope) { - - class CancelLeaseHeader { - - /** - * @type {Signable} - */ - signable; - /** - * @type {Money} - */ - mirrorBalance; - /** - * @type {boolean} - */ - needShowMirror = false; - - - $postLink() { - this.transaction = this.signable.getTxData(); - this.typeName = utils.getTransactionTypeName(this.transaction); - - if (this.transaction.lease.amount.asset.id !== baseAssetService.getBaseAssetId()) { - baseAssetService.convertToBaseAsset(this.transaction.lease.amount) - .then(mirror => { - this.mirrorBalance = mirror; - this.needShowMirror = this.mirrorBalance.getCoins().gt(0); - $scope.$apply(); - }); - } - } - - } - - return new CancelLeaseHeader(); - }; - - controller.$inject = ['utils', 'baseAssetService', '$scope']; - - angular.module('app.ui').component('wCancelLeaseHeader', { - bindings: { - signable: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/cancel-lease/header.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/cancel-lease/CancelLeaseInfo.js b/src/modules/ui/directives/transactionInfo/types/cancel-lease/CancelLeaseInfo.js deleted file mode 100644 index 6d30741cdf..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/cancel-lease/CancelLeaseInfo.js +++ /dev/null @@ -1,42 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {$rootScope.Scope} $scope - * @return {CancelLeaseInfo} - */ - const controller = function ($scope) { - - class CancelLeaseInfo { - - /** - * @type {Signable} - */ - signable; - - - $postLink() { - this.transaction = this.signable.getTxData(); - - (this.transaction.id ? Promise.resolve(this.transaction.id) : this.signable.getId()) - .then(id => { - this.id = id; - $scope.$apply(); - }); - } - - } - - return new CancelLeaseInfo(); - }; - - controller.$inject = ['$scope']; - - angular.module('app.ui').component('wCancelLeaseInfo', { - bindings: { - signable: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/cancel-lease/info.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/cancel-lease/header.html b/src/modules/ui/directives/transactionInfo/types/cancel-lease/header.html deleted file mode 100644 index 09b6a06713..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/cancel-lease/header.html +++ /dev/null @@ -1,8 +0,0 @@ -
    -

    -
    diff --git a/src/modules/ui/directives/transactionInfo/types/cancel-lease/info.html b/src/modules/ui/directives/transactionInfo/types/cancel-lease/info.html deleted file mode 100644 index 23f782dae2..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/cancel-lease/info.html +++ /dev/null @@ -1,8 +0,0 @@ -
    -
    -
    {{::$ctrl.transaction.leaseId}}
    -
    - diff --git a/src/modules/ui/directives/transactionInfo/types/create-alias/CreateAliasInfo.js b/src/modules/ui/directives/transactionInfo/types/create-alias/CreateAliasInfo.js deleted file mode 100644 index decbd90e21..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/create-alias/CreateAliasInfo.js +++ /dev/null @@ -1,41 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {$rootScope.Scope} $scope - * @return {CreateAliasInfo} - */ - const controller = function ($scope) { - - class CreateAliasInfo { - - /** - * @type {Signable} - */ - signable; - - - $postLink() { - this.transaction = this.signable.getTxData(); - (this.transaction.id ? Promise.resolve(this.transaction.id) : this.signable.getId()) - .then(id => { - this.id = id; - $scope.$apply(); - }); - } - - } - - return new CreateAliasInfo(); - }; - - controller.$inject = ['$scope']; - - angular.module('app.ui').component('wCreateAliasInfo', { - bindings: { - signable: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/create-alias/create-alias-info.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/create-alias/create-alias-info.html b/src/modules/ui/directives/transactionInfo/types/create-alias/create-alias-info.html deleted file mode 100644 index e9a8358a33..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/create-alias/create-alias-info.html +++ /dev/null @@ -1,10 +0,0 @@ -
    -

    {{::$ctrl.transaction.alias}}

    -
    - - - - diff --git a/src/modules/ui/directives/transactionInfo/types/create-order/CreateOrderHeader.js b/src/modules/ui/directives/transactionInfo/types/create-order/CreateOrderHeader.js deleted file mode 100644 index 69267bb698..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/create-order/CreateOrderHeader.js +++ /dev/null @@ -1,52 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {app.utils} utils - * @return {ExchangeHeader} - */ - const controller = function (utils) { - - class ExchangeHeader { - - /** - * @type {string} - */ - typeName; - /** - * @type {Signable} - */ - signable; - /** - * @type {string} - */ - signPrice = '–'; - /** - * @type {string} - */ - signAmount = '+'; - - - $postLink() { - this.transaction = this.signable.getTxData(); - this.typeName = 'create-order'; - this.totalPrice = utils.getExchangeTotalPrice(this.transaction.amount, this.transaction.price); - this.signPrice = this.typeName === 'exchange-buy' ? '–' : '+'; - this.signAmount = this.typeName === 'exchange-buy' ? '+' : '–'; - } - - } - - return new ExchangeHeader(); - }; - - controller.$inject = ['utils', 'baseAssetService', '$scope']; - - angular.module('app.ui').component('wCreateOrderHeader', { - bindings: { - signable: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/create-order/createOrderHeader.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/create-order/CreateOrderInfo.js b/src/modules/ui/directives/transactionInfo/types/create-order/CreateOrderInfo.js deleted file mode 100644 index 80eb587f89..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/create-order/CreateOrderInfo.js +++ /dev/null @@ -1,40 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {$rootScope.Scope} $scope - * @return {CreateOrderInfo} - */ - const controller = function ($scope) { - - class CreateOrderInfo { - - /** - * @type {Signable} - */ - signable; - - - $postLink() { - this.order = this.signable.getTxData(); - this.signable.getId().then(id => { - this.id = id; - $scope.$apply(); - }); - } - - } - - return new CreateOrderInfo(); - }; - - controller.$inject = ['$scope']; - - angular.module('app.ui').component('wCreateOrderInfo', { - bindings: { - signable: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/create-order/createOrder.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/create-order/createOrder.html b/src/modules/ui/directives/transactionInfo/types/create-order/createOrder.html deleted file mode 100644 index 8f7ad18404..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/create-order/createOrder.html +++ /dev/null @@ -1,18 +0,0 @@ -
    -
    -
    {{$ctrl.order.amount.asset.displayName}}/{{$ctrl.order.price.asset.displayName}}
    -
    - -
    -
    -
    {{::$ctrl.order.orderType}}
    -
    - -
    -
    -
    -
    - - diff --git a/src/modules/ui/directives/transactionInfo/types/create-order/createOrderHeader.html b/src/modules/ui/directives/transactionInfo/types/create-order/createOrderHeader.html deleted file mode 100644 index c7e0bbc446..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/create-order/createOrderHeader.html +++ /dev/null @@ -1,18 +0,0 @@ -
    -

    -
    -
    diff --git a/src/modules/ui/directives/transactionInfo/types/data/DataHeader.js b/src/modules/ui/directives/transactionInfo/types/data/DataHeader.js deleted file mode 100644 index 5c83c81208..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/data/DataHeader.js +++ /dev/null @@ -1,11 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.ui').component('wDataHeader', { - bindings: { - signable: '<', - voteObject: '<' - }, - templateUrl: 'modules/ui/directives/transactionInfo/types/data/data-header.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/data/DataInfo.js b/src/modules/ui/directives/transactionInfo/types/data/DataInfo.js deleted file mode 100644 index a884761ea8..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/data/DataInfo.js +++ /dev/null @@ -1,71 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {$rootScope.Scope} $scope - * @param {JQuery} $element - * @return {DataInfo} - */ - const controller = function ($scope, $element) { - - class DataInfo { - - /** - * @type {Signable} - */ - signable; - /** - * @type {string} - */ - json; - /** - * @type {boolean} - */ - dataVisible = false; - /** - * @type {boolean} - */ - allVisible = false; - - - $postLink() { - this.transaction = this.signable.getTxData(); - this.json = JSON.stringify(this.transaction.data, null, '\t'); - (this.transaction.id ? Promise.resolve(this.transaction.id) : this.signable.getId()) - .then(id => { - this.id = id; - $scope.$apply(); - }); - } - - /** - * @public - */ - toggleAll() { - this.allVisible = !this.allVisible; - $element.find('.transaction-details__list').stop().animate({ scrollTop: 0 }, 300); - } - - /** - * @public - */ - toggleVisible() { - this.allVisible = false; - this.dataVisible = !this.dataVisible; - } - - } - - return new DataInfo(); - }; - - controller.$inject = ['$scope', '$element']; - - angular.module('app.ui').component('wDataInfo', { - bindings: { - signable: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/data/data-info.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/data/data-header.html b/src/modules/ui/directives/transactionInfo/types/data/data-header.html deleted file mode 100644 index 560f37f231..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/data/data-header.html +++ /dev/null @@ -1,8 +0,0 @@ -
    -

    -
    - -

    {{$ctrl.voteObject.assetName}}

    -
    {{$ctrl.voteObject.assetId}}
    -
    -
    diff --git a/src/modules/ui/directives/transactionInfo/types/data/data-info.html b/src/modules/ui/directives/transactionInfo/types/data/data-info.html deleted file mode 100644 index 43bf41df81..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/data/data-info.html +++ /dev/null @@ -1,46 +0,0 @@ -
    -
    -
    -
    -
    -
    -
      -
    • -
      -
      -
      -
      • -
    • -
      {{transaction.key}}
      -
      {{transaction.type}}
      -
      {{transaction.value}}
      -
      • -
    -
    - - - -
    -
    -
    - - - - - - - diff --git a/src/modules/ui/directives/transactionInfo/types/exchange/ExchangeHeader.js b/src/modules/ui/directives/transactionInfo/types/exchange/ExchangeHeader.js deleted file mode 100644 index f232e1dca9..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/exchange/ExchangeHeader.js +++ /dev/null @@ -1,64 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {app.utils} utils - * @return {ExchangeHeader} - */ - const controller = function (utils) { - - class ExchangeHeader { - - /** - * @type {string} - */ - typeName; - /** - * @type {Signable} - */ - signable; - /** - * @type {string} - */ - signPrice = '–'; - /** - * @type {string} - */ - signAmount = '+'; - - /** - * @type {boolean} - */ - isScamAmount; - /** - * @type {boolean} - */ - isScamPrice; - - $postLink() { - this.transaction = this.signable.getTxData(); - this.typeName = utils.getTransactionTypeName(this.transaction); - this.totalPrice = utils.getExchangeTotalPrice(this.transaction.amount, this.transaction.price); - this.signPrice = this.typeName === 'exchange-buy' ? '–' : '+'; - this.signAmount = this.typeName === 'exchange-buy' ? '+' : '–'; - // this.isScamAmount = !!user.scam[this.transaction.amount.asset]; - // this.isScamPrice = !!user.scam[this.transaction.price.asset]; - } - - } - - return new ExchangeHeader(); - }; - - controller.$inject = ['utils', 'baseAssetService', '$scope']; - - angular.module('app.ui').component('wExchangeHeader', { - bindings: { - signable: '<', - isScamAmount: '<', - isScamPrice: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/exchange/header.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/exchange/ExchangeInfo.js b/src/modules/ui/directives/transactionInfo/types/exchange/ExchangeInfo.js deleted file mode 100644 index 7ddd8c1994..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/exchange/ExchangeInfo.js +++ /dev/null @@ -1,44 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {app.utils} utils - * @return {ExchangeInfo} - */ - const controller = function (utils) { - - class ExchangeInfo { - - /** - * @type {Signable} - */ - signable; - /** - * @type {Money} - */ - fee; - - - $postLink() { - this.transaction = this.signable.getTxData(); - this.id = this.transaction.id; - this.fee = utils.getExchangeFee(this.transaction); - this.showSellMatcherFee = this.transaction.exchangeType === this.transaction.sellOrder.orderType; - this.showBuyMatcherFee = this.transaction.exchangeType === this.transaction.buyOrder.orderType; - } - - } - - return new ExchangeInfo(); - }; - - controller.$inject = ['utils']; - - angular.module('app.ui').component('wExchangeInfo', { - bindings: { - signable: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/exchange/info.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/exchange/header.html b/src/modules/ui/directives/transactionInfo/types/exchange/header.html deleted file mode 100644 index 4fd41e8084..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/exchange/header.html +++ /dev/null @@ -1,27 +0,0 @@ -
    -
    -

    -

    - -
    -
    -
    - -
    -
    diff --git a/src/modules/ui/directives/transactionInfo/types/exchange/info.html b/src/modules/ui/directives/transactionInfo/types/exchange/info.html deleted file mode 100644 index 2cf06de7eb..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/exchange/info.html +++ /dev/null @@ -1,32 +0,0 @@ -
    -
    -
    - {{::$ctrl.transaction.amount.asset.displayName}}/{{::$ctrl.transaction.price.asset.displayName}} -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - diff --git a/src/modules/ui/directives/transactionInfo/types/issue/IssueHeader.js b/src/modules/ui/directives/transactionInfo/types/issue/IssueHeader.js deleted file mode 100644 index cc83799d86..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/issue/IssueHeader.js +++ /dev/null @@ -1,42 +0,0 @@ -(function () { - 'use strict'; - - /** - * @return {IssueHeader} - */ - const controller = function () { - - class IssueHeader { - - /** - * @type {Signable} - */ - signable; - /** - * @type {*} - * @private - */ - _tx; - - $postLink() { - this._tx = this.signable.getTxData(); - this.name = this._tx.name; - this.quantity = this._tx.quantity.div(Math.pow(10, this._tx.precision)).toFormat(this._tx.precision); - } - - } - - return new IssueHeader(); - }; - - controller.$inject = []; - - angular.module('app.ui').component('wIssueHeader', { - bindings: { - signable: '<', - isScam: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/issue/issue-header.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/issue/IssueInfo.js b/src/modules/ui/directives/transactionInfo/types/issue/IssueInfo.js deleted file mode 100644 index bdfb13a358..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/issue/IssueInfo.js +++ /dev/null @@ -1,61 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {$rootScope.Scope} $scope - * @param {JQuery} $element - * @return {IssueInfo} - */ - const controller = function ($scope, $element) { - - class IssueInfo { - - /** - * @type {Signable} - */ - signable; - /** - * @type {Asset} - */ - asset; - /** - * @type {boolean} - */ - shownScript = false; - /** - * @type {JQuery} - */ - $container; - - - $postLink() { - this.$container = $element.find('.js-script-container'); - this.$container.hide(); - this.transaction = this.signable.getTxData(); - (this.transaction.id ? Promise.resolve(this.transaction.id) : this.signable.getId()) - .then(id => { - this.id = id; - $scope.$apply(); - }); - } - - toggleScript() { - this.shownScript = !this.shownScript; - this.$container.stop(true, true).slideToggle(100); - } - - } - - return new IssueInfo(); - }; - - controller.$inject = ['$scope', '$element']; - - angular.module('app.ui').component('wIssueInfo', { - bindings: { - signable: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/issue/issue-info.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/issue/issue-header.html b/src/modules/ui/directives/transactionInfo/types/issue/issue-header.html deleted file mode 100644 index 7b98cb4333..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/issue/issue-header.html +++ /dev/null @@ -1,10 +0,0 @@ -
    -
    -

    - -
    -
    diff --git a/src/modules/ui/directives/transactionInfo/types/issue/issue-info.html b/src/modules/ui/directives/transactionInfo/types/issue/issue-info.html deleted file mode 100644 index 4d4f2e2943..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/issue/issue-info.html +++ /dev/null @@ -1,35 +0,0 @@ -
    -
    -
    {{::$ctrl.transaction.assetId}}
    -
    - -
    -
    -
    -
    - -
    -
    -
    - -
    -
    - -
    -
    - {{$ctrl.transaction.script}} -
    -
    - -
    -
    -
    {{$ctrl.transaction.description}}
    -
    - - diff --git a/src/modules/ui/directives/transactionInfo/types/lease/LeaseHeader.js b/src/modules/ui/directives/transactionInfo/types/lease/LeaseHeader.js deleted file mode 100644 index c05c2c6b68..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/lease/LeaseHeader.js +++ /dev/null @@ -1,56 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {app.utils} utils - * @param {BaseAssetService} baseAssetService - * @param {$rootScope.Scope} $scope - * @return {LeaseHeader} - */ - const controller = function (utils, baseAssetService, $scope) { - - class LeaseHeader { - - /** - * @type {Signable} - */ - signable; - /** - * @type {Money} - */ - mirrorBalance; - /** - * @type {boolean} - */ - needShowMirror = false; - - - $postLink() { - this.transaction = this.signable.getTxData(); - this.typeName = utils.getTransactionTypeName(this.transaction); - - if (this.transaction.amount.asset.id !== baseAssetService.getBaseAssetId()) { - baseAssetService.convertToBaseAsset(this.transaction.amount) - .then(mirror => { - this.mirrorBalance = mirror; - this.needShowMirror = this.mirrorBalance.getCoins().gt(0); - $scope.$apply(); - }); - } - } - - } - - return new LeaseHeader(); - }; - - controller.$inject = ['utils', 'baseAssetService', '$scope']; - - angular.module('app.ui').component('wLeaseHeader', { - bindings: { - signable: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/lease/lease-header.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/lease/LeaseInfo.js b/src/modules/ui/directives/transactionInfo/types/lease/LeaseInfo.js deleted file mode 100644 index 990b3dc0cd..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/lease/LeaseInfo.js +++ /dev/null @@ -1,108 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {$rootScope.Scope} $scope - * @param {app.utils} utils - * @param {Waves} waves - * @param Base - * @return {LeaseInfo} - */ - const controller = function ($scope, utils, waves, Base) { - - class LeaseInfo extends Base { - - /** - * @type {Signable} - */ - signable; - /** - * @type {boolean} - */ - isLeaseIn = false; - /** - * @type {boolean} - */ - isLeaseOut = false; - /** - * @type {string} - */ - address = ''; - /** - * @type {boolean} - */ - isActive; - /** - * @type {boolean} - */ - confirmed; - - - $postLink() { - this.transaction = this.signable.getTxData(); - - this.isActive = this.transaction.status === 'active'; - const typeName = utils.getTransactionTypeName(this.transaction); - - switch (typeName) { - case WavesApp.TRANSACTION_TYPES.EXTENDED.LEASE_OUT: - this.isLeaseOut = true; - this.address = this.transaction.recipient; - break; - case WavesApp.TRANSACTION_TYPES.EXTENDED.LEASE_IN: - this.isLeaseIn = true; - this.address = this.transaction.sender; - break; - default: - break; - } - - this._getId().then(id => { - this.id = id; - - if (this.confirmed) { - this._applyConfirmed(); - } else { - this.observeOnce('confirmed', this._applyConfirmed); - } - - $scope.$apply(); - }); - } - - /** - * @private - */ - _applyConfirmed() { - waves.node.transactions.getAlways(this.id) - .then(res => { - this.transaction = res; - this.isActive = this.transaction.status === 'active'; - $scope.$apply(); - }); - } - - /** - * @return {Promise} - * @private - */ - _getId() { - return this.transaction.id ? Promise.resolve(this.transaction.id) : this.signable.getId(); - } - - } - - return new LeaseInfo(); - }; - - controller.$inject = ['$scope', 'utils', 'waves', 'Base']; - - angular.module('app.ui').component('wLeaseInfo', { - bindings: { - signable: '<', - confirmed: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/lease/lease-info.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/lease/lease-header.html b/src/modules/ui/directives/transactionInfo/types/lease/lease-header.html deleted file mode 100644 index 8b3991cadf..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/lease/lease-header.html +++ /dev/null @@ -1,8 +0,0 @@ -
    -

    -
    ≈ {{::$ctrl.mirrorBalance.toFormat()}} - {{::$ctrl.mirrorBalance.asset.name}} -
    -
    diff --git a/src/modules/ui/directives/transactionInfo/types/lease/lease-info.html b/src/modules/ui/directives/transactionInfo/types/lease/lease-info.html deleted file mode 100644 index b6870a83d3..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/lease/lease-info.html +++ /dev/null @@ -1,16 +0,0 @@ -
    -
    -
    -
    {{::$ctrl.address}}
    -
    - -
    -
    -
    -
    -
    - - diff --git a/src/modules/ui/directives/transactionInfo/types/mass-transfer/MassTransferHeader.js b/src/modules/ui/directives/transactionInfo/types/mass-transfer/MassTransferHeader.js deleted file mode 100644 index 6a02d750ee..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/mass-transfer/MassTransferHeader.js +++ /dev/null @@ -1,71 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {app.utils} utils - * @param {BaseAssetService} baseAssetService - * @param {$rootScope.Scope} $scope - * @return {MassTransferHeader} - */ - const controller = function (utils, baseAssetService, $scope) { - - class MassTransferHeader { - - /** - * @type {string} - */ - typeName; - /** - * @type {Signable} - */ - signable; - /** - * @type {string} - */ - amount; - /** - * @type {string} - */ - name; - /** - * @type {boolean} - */ - needShowMirror = false; - /** - * @type {Money} - */ - mirrorBalance; - - - $postLink() { - const tx = this.signable.getTxData(); - this.typeName = utils.getTransactionTypeName(tx); - this.amount = tx.amount.toFormat(); - this.name = tx.amount.asset.name; - - if (tx.amount.asset.id !== baseAssetService.getBaseAssetId()) { - baseAssetService.convertToBaseAsset(tx.amount) - .then(mirror => { - this.mirrorBalance = mirror; - this.needShowMirror = this.mirrorBalance.getCoins().gt(0); - $scope.$apply(); - }); - } - } - - } - - return new MassTransferHeader(); - }; - - controller.$inject = ['utils', 'baseAssetService', '$scope']; - - angular.module('app.ui').component('wMassTransferHeader', { - bindings: { - signable: '<', - isScam: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/mass-transfer/header.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/mass-transfer/MassTransferInfo.js b/src/modules/ui/directives/transactionInfo/types/mass-transfer/MassTransferInfo.js deleted file mode 100644 index 6147f67943..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/mass-transfer/MassTransferInfo.js +++ /dev/null @@ -1,72 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {$rootScope.Scope} $scope - * @param {app.utils} utils - * @return {MassTransferInfo} - */ - const controller = function ($scope, utils) { - - class MassTransferInfo { - - /** - * @type {Signable} - */ - signable; - /** - * @type {boolean} - */ - isSend = false; - /** - * @type {boolean} - */ - isReceive = false; - /** - * @type {boolean} - */ - showAllTX = false; - /** - * @type {boolean} - */ - expandList = false; - - - $postLink() { - this.transaction = this.signable.getTxData(); - this.attachment = utils.bytesToSafeString(this.transaction.attachment); - const typeName = utils.getTransactionTypeName(this.transaction); - - switch (typeName) { - case WavesApp.TRANSACTION_TYPES.EXTENDED.MASS_SEND: - this.isSend = true; - break; - case WavesApp.TRANSACTION_TYPES.EXTENDED.MASS_RECEIVE: - this.isReceive = true; - break; - default: - break; - } - - (this.transaction.id ? Promise.resolve(this.transaction.id) : this.signable.getId()) - .then(id => { - this.id = id; - $scope.$apply(); - }); - } - - } - - return new MassTransferInfo(); - }; - - controller.$inject = ['$scope', 'utils']; - - angular.module('app.ui').component('wMassTransferInfo', { - bindings: { - signable: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/mass-transfer/info.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/mass-transfer/header.html b/src/modules/ui/directives/transactionInfo/types/mass-transfer/header.html deleted file mode 100644 index 55e2b77068..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/mass-transfer/header.html +++ /dev/null @@ -1,13 +0,0 @@ -
    -
    -

    - -
    -
    - ≈ {{::$ctrl.mirrorBalance.toFormat()}} {{::$ctrl.mirrorBalance.asset.name}} -
    -
    diff --git a/src/modules/ui/directives/transactionInfo/types/mass-transfer/info.html b/src/modules/ui/directives/transactionInfo/types/mass-transfer/info.html deleted file mode 100644 index 55b6f8ebd4..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/mass-transfer/info.html +++ /dev/null @@ -1,48 +0,0 @@ -
    -
    - -
    - -
    - -
    -
    -
    {{::$ctrl.transaction.sender}}
    -
    - -
    - -
    -
    - -
    -
    -
    {{::transfer.recipient}}
    -
    - -
    -
    -
    - -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    {{::$ctrl.attachment}}
    -
    - - - diff --git a/src/modules/ui/directives/transactionInfo/types/mass-transfer/massTransferInfo.less b/src/modules/ui/directives/transactionInfo/types/mass-transfer/massTransferInfo.less deleted file mode 100644 index 70a2c6c100..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/mass-transfer/massTransferInfo.less +++ /dev/null @@ -1,56 +0,0 @@ -@import (reference) 'config'; - -.recipients-list { - margin-bottom: 13px; - padding: 0 16px; - border-radius: 4px; - max-height: 179px; - overflow-y: auto; - background-color: @color-basic-50; - transition: max-height 0.3s, margin 0.3s; - &.ng-hide { - max-height: 0; - margin-bottom: 0; - } - &.ng-hide-add { - overflow-y: hidden; - } - &.ng-hide-remove { - overflow-y: hidden; - } - .recipients-row__key { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - margin-right: 10px; - } -} - -.recipients-row { - width: 100%; - display: flex; - align-items: flex-start; - justify-content: space-between; - border-top: 1px dashed @color-basic-100; - padding: 12px 0 13px; - &:first-child { - padding-top: 16px; - border-top: 0; - } - &:last-child { - padding-bottom: 16px; - } -} - -@media screen and (max-width: @width-media-tiny) { - .recipients-row { - padding: 9px 0 10px; - &:first-child { - padding-top: 12px; - } - &:last-child { - padding-bottom: 12px; - } - } -} - diff --git a/src/modules/ui/directives/transactionInfo/types/reissue/ReissueHeader.js b/src/modules/ui/directives/transactionInfo/types/reissue/ReissueHeader.js deleted file mode 100644 index 0bfb73dd7a..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/reissue/ReissueHeader.js +++ /dev/null @@ -1,40 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {app.utils} utils - * @return {ReissueHeader} - */ - const controller = function (utils) { - - class ReissueHeader { - - /** - * @type {Signable} - */ - signable; - - - $postLink() { - this.transaction = this.signable.getTxData(); - this.quantity = this.transaction.quantity.toFormat(this.transaction.precision); - this.name = this.transaction.quantity.asset.name; - this.typeName = utils.getTransactionTypeName(this.transaction); - } - - } - - return new ReissueHeader(); - }; - - controller.$inject = ['utils']; - - angular.module('app.ui').component('wReissueHeader', { - bindings: { - signable: '<', - isScam: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/reissue/reissue-header.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/reissue/ReissueInfo.js b/src/modules/ui/directives/transactionInfo/types/reissue/ReissueInfo.js deleted file mode 100644 index e5ab4e4a01..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/reissue/ReissueInfo.js +++ /dev/null @@ -1,97 +0,0 @@ -(function () { - 'use strict'; - - const { Money } = require('@waves/data-entities'); - const ds = require('data-service'); - - /** - * @param {typeof Base} Base - * @param {$rootScope.Scope} $scope - * @param {Waves} waves - * @param {BalanceWatcher} balanceWatcher - * @return {ReissueInfo} - */ - const controller = function (Base, $scope, waves, balanceWatcher) { - - class ReissueInfo extends Base { - - /** - * @type {Signable} - */ - signable; - /** - * @type {boolean} - */ - isConfirm = false; - /** - * @type {string} - */ - id = ''; - /** - * @type {Money} - */ - toRemainOnBalance; - /** - * @type {Money} - */ - totalAfterIssueTokens; - - - $postLink() { - this.transaction = this.signable.getTxData(); - - const addId = id => (this.id = id); - const getTx = id => waves.node.transactions.get(id); - const $apply = () => $scope.$apply(); - const addConfirm = isConfirm => (this.isConfirm = isConfirm); - - (this.transaction.id ? Promise.resolve(this.transaction.id) : this.signable.getId()) - .then(addId) - .then(getTx) - .then(() => false, () => true) - .then(addConfirm) - .then($apply); - - this.receive(balanceWatcher.change, this._onChangeBalances, this); - - this._onChangeBalances(); - } - - /** - * @private - */ - _onChangeBalances() { - const hash = balanceWatcher.getBalance(); - - if (!Object.keys(hash).length) { - return null; - } - - const assetId = this.transaction.assetId; - - ds.api.assets.get(assetId).then(asset => { - const quantity = new Money(asset.quantity, asset); - const toReissue = this.transaction.quantity; - - this.toRemainOnBalance = (hash[assetId] || new Money(0, asset)).add(toReissue); - this.totalAfterIssueTokens = quantity.add(toReissue); - - $scope.$apply(); - }); - } - - } - - return new ReissueInfo(); - }; - - controller.$inject = ['Base', '$scope', 'waves', 'balanceWatcher']; - - angular.module('app.ui').component('wReissueInfo', { - bindings: { - signable: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/reissue/reissue-info.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/reissue/reissue-header.html b/src/modules/ui/directives/transactionInfo/types/reissue/reissue-header.html deleted file mode 100644 index cb88577b94..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/reissue/reissue-header.html +++ /dev/null @@ -1,10 +0,0 @@ -
    -
    -

    - -
    -
    diff --git a/src/modules/ui/directives/transactionInfo/types/reissue/reissue-info.html b/src/modules/ui/directives/transactionInfo/types/reissue/reissue-info.html deleted file mode 100644 index f76ec38836..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/reissue/reissue-info.html +++ /dev/null @@ -1,21 +0,0 @@ -
    -
    -
    {{::$ctrl.transaction.assetId}}
    -
    -
    -
    -
    -
    -
    -
    -
    {{::$ctrl.toRemainOnBalance.toTokens()}}
    -
    -
    -
    -
    {{::$ctrl.totalAfterIssueTokens.toTokens()}}
    -
    - - diff --git a/src/modules/ui/directives/transactionInfo/types/script-invocation/ScriptInvocation.js b/src/modules/ui/directives/transactionInfo/types/script-invocation/ScriptInvocation.js deleted file mode 100644 index 21f318e584..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/script-invocation/ScriptInvocation.js +++ /dev/null @@ -1,89 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {JQuery} $element - * @return {DataInfo} - */ - const controller = function ($element) { - - class DataInfo { - - /** - * @type {Signable} - */ - signable; - /** - * @type {boolean} - */ - dataVisible = false; - /** - * @type {boolean} - */ - allVisible = false; - /** - * @type {string} - */ - function; - /** - * @type {string} - */ - json; - /** - * @type {string} - */ - payment; - /** - * @type {string} - */ - args; - - - $postLink() { - this.transaction = this.signable.getTxData(); - (this.transaction.id ? Promise.resolve(this.transaction.id) : this.signable.getId()) - .then(id => { - this.id = id; - }); - - this.json = JSON.stringify(this.transaction.call && this.transaction.call.args || [], null, 4); - if (this.transaction.payment.length > 0) { - const payment = this.transaction.payment[0]; - this.payment = `${payment.getTokens().toFormat()} ${payment.asset.displayName}`; - } - if (this.transaction.call) { - this.args = this.transaction.call.args; - } - } - - /** - * @public - */ - toggleAll() { - this.allVisible = !this.allVisible; - $element.find('.transaction-details__list').stop().animate({ scrollTop: 0 }, 300); - } - - /** - * @public - */ - toggleVisible() { - this.allVisible = false; - this.dataVisible = !this.dataVisible; - } - - } - - return new DataInfo(); - }; - - controller.$inject = ['$element']; - - angular.module('app.ui').component('wScriptInvocationInfo', { - bindings: { - signable: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/script-invocation/script-invocation-info.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/script-invocation/ScriptInvocationHeader.js b/src/modules/ui/directives/transactionInfo/types/script-invocation/ScriptInvocationHeader.js deleted file mode 100644 index b093b1c9b2..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/script-invocation/ScriptInvocationHeader.js +++ /dev/null @@ -1,11 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.ui').component('wScriptInvocationHeader', { - bindings: { - typeName: '<' - }, - templateUrl: 'modules/ui/directives/transactionInfo/types/script-invocation/script-invocation-header.html' - }); -})(); - diff --git a/src/modules/ui/directives/transactionInfo/types/script-invocation/script-invocation-header.html b/src/modules/ui/directives/transactionInfo/types/script-invocation/script-invocation-header.html deleted file mode 100644 index 81518aa203..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/script-invocation/script-invocation-header.html +++ /dev/null @@ -1,3 +0,0 @@ -
    -

    -
    diff --git a/src/modules/ui/directives/transactionInfo/types/script-invocation/script-invocation-info.html b/src/modules/ui/directives/transactionInfo/types/script-invocation/script-invocation-info.html deleted file mode 100644 index 81d70f0242..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/script-invocation/script-invocation-info.html +++ /dev/null @@ -1,53 +0,0 @@ -
    -
    -
    {{::$ctrl.transaction.call.function || 'Default function'}}
    -
    - -
    -
    -
    -
    -
    -
    -
      -
    • - {{::arg.type}} - {{::arg.value}} -
      • -
    -
    - - - -
    -
    -
    -
    -
    -
    {{::$ctrl.transaction.dApp}}
    -
    -
    -
    -
    {{::$ctrl.payment}}
    -
    -
    -
    -
    {{::$ctrl.transaction.id}}
    -
    - - - \ No newline at end of file diff --git a/src/modules/ui/directives/transactionInfo/types/set-asset-script/SetAssetScriptInfo.js b/src/modules/ui/directives/transactionInfo/types/set-asset-script/SetAssetScriptInfo.js deleted file mode 100644 index 22cefaf67b..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/set-asset-script/SetAssetScriptInfo.js +++ /dev/null @@ -1,70 +0,0 @@ -(function () { - 'use strict'; - - const ds = require('data-service'); - - /** - * @param {$rootScope.Scope} $scope - * @param {JQuery} $element - * @return {SetAssetScriptInfo} - */ - const controller = function ($scope, $element) { - - class SetAssetScriptInfo { - - /** - * @type {Signable} - */ - signable; - /** - * @type {Asset} - */ - asset; - /** - * @type {boolean} - */ - shownScript = false; - /** - * @type {JQuery} - */ - $container; - - - $postLink() { - this.transaction = this.signable.getTxData(); - this.transaction.script = this.transaction.script || ''; - this.$container = $element.find('.js-script-container'); - this.$container.hide(); - - ds.api.assets.get(this.transaction.assetId).then(asset => { - this.asset = asset; - $scope.$apply(); - }); - - (this.transaction.id ? Promise.resolve(this.transaction.id) : this.signable.getId()) - .then(id => { - this.id = id; - $scope.$apply(); - }); - } - - toggleScript() { - this.shownScript = !this.shownScript; - this.$container.stop(true, true).slideToggle(100); - } - - } - - return new SetAssetScriptInfo(); - }; - - controller.$inject = ['$scope', '$element']; - - angular.module('app.ui').component('wSetAssetScriptInfo', { - bindings: { - signable: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/set-asset-script/info.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/set-asset-script/SetScriptAssetHeader.js b/src/modules/ui/directives/transactionInfo/types/set-asset-script/SetScriptAssetHeader.js deleted file mode 100644 index 26f5ac4900..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/set-asset-script/SetScriptAssetHeader.js +++ /dev/null @@ -1,37 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {app.utils} utils - * @return {SetScriptAssetHeader} - */ - const controller = function (utils) { - - class SetScriptAssetHeader { - - /** - * @type {Signable} - */ - signable; - - - $postLink() { - this.transaction = this.signable.getTxData(); - this.typeName = utils.getTransactionTypeName(this.transaction); - } - - } - - return new SetScriptAssetHeader(); - }; - - controller.$inject = ['utils']; - - angular.module('app.ui').component('wSetScriptAssetHeader', { - bindings: { - signable: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/set-asset-script/header.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/set-asset-script/header.html b/src/modules/ui/directives/transactionInfo/types/set-asset-script/header.html deleted file mode 100644 index 0552c6875a..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/set-asset-script/header.html +++ /dev/null @@ -1,3 +0,0 @@ -
    -

    -
    diff --git a/src/modules/ui/directives/transactionInfo/types/set-asset-script/info.html b/src/modules/ui/directives/transactionInfo/types/set-asset-script/info.html deleted file mode 100644 index e0868d61c8..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/set-asset-script/info.html +++ /dev/null @@ -1,24 +0,0 @@ -
    -
    -
    - -
    -
    - -
    -
    - {{$ctrl.transaction.script}} -
    -
    - -
    -
    -
    {{$ctrl.asset.id}}
    -
    - - diff --git a/src/modules/ui/directives/transactionInfo/types/set-script/SetScriptHeader.js b/src/modules/ui/directives/transactionInfo/types/set-script/SetScriptHeader.js deleted file mode 100644 index efa3847945..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/set-script/SetScriptHeader.js +++ /dev/null @@ -1,37 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {app.utils} utils - * @return {SetScriptHeader} - */ - const controller = function (utils) { - - class SetScriptHeader { - - /** - * @type {Signable} - */ - signable; - - - $postLink() { - this.transaction = this.signable.getTxData(); - this.typeName = utils.getTransactionTypeName(this.transaction); - } - - } - - return new SetScriptHeader(); - }; - - controller.$inject = ['utils']; - - angular.module('app.ui').component('wSetScriptHeader', { - bindings: { - signable: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/set-script/header.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/set-script/SetScriptInfo.js b/src/modules/ui/directives/transactionInfo/types/set-script/SetScriptInfo.js deleted file mode 100644 index f6dacbf3e2..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/set-script/SetScriptInfo.js +++ /dev/null @@ -1,48 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {$rootScope.Scope} $scope - * @return {SetScriptInfo} - */ - const controller = function ($scope) { - - class SetScriptInfo { - - /** - * @type {Signable} - */ - signable; - /** - * @type {boolean} - */ - hasScript = false; - - - $postLink() { - this.transaction = this.signable.getTxData(); - this.hasScript = !!((this.transaction.script || '').replace('base64:', '')); - this.transaction.script = this.transaction.script || ''; - - (this.transaction.id ? Promise.resolve(this.transaction.id) : this.signable.getId()) - .then(id => { - this.id = id; - $scope.$apply(); - }); - } - - } - - return new SetScriptInfo(); - }; - - controller.$inject = ['$scope']; - - angular.module('app.ui').component('wSetScriptInfo', { - bindings: { - signable: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/set-script/info.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/set-script/header.html b/src/modules/ui/directives/transactionInfo/types/set-script/header.html deleted file mode 100644 index 5eb31f5cb1..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/set-script/header.html +++ /dev/null @@ -1,3 +0,0 @@ -
    -

    -
    diff --git a/src/modules/ui/directives/transactionInfo/types/set-script/info.html b/src/modules/ui/directives/transactionInfo/types/set-script/info.html deleted file mode 100644 index a3a21ccd09..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/set-script/info.html +++ /dev/null @@ -1,9 +0,0 @@ -
    -
    - {{$ctrl.transaction.script}} -
    - - diff --git a/src/modules/ui/directives/transactionInfo/types/sponsorship/SponsorshipHeader.js b/src/modules/ui/directives/transactionInfo/types/sponsorship/SponsorshipHeader.js deleted file mode 100644 index c83f4ea424..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/sponsorship/SponsorshipHeader.js +++ /dev/null @@ -1,38 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {app.utils} utils - * @return {SponsorshipHeader} - */ - const controller = function (utils) { - - class SponsorshipHeader { - - /** - * @type {Signable} - */ - signable; - - - $postLink() { - this.transaction = this.signable.getTxData(); - this.typeName = utils.getTransactionTypeName(this.transaction); - } - - } - - return new SponsorshipHeader(); - }; - - controller.$inject = ['utils']; - - angular.module('app.ui').component('wSponsorshipHeader', { - bindings: { - signable: '<', - isScam: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/sponsorship/header.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/sponsorship/SponsorshipInfo.js b/src/modules/ui/directives/transactionInfo/types/sponsorship/SponsorshipInfo.js deleted file mode 100644 index d77149b4fa..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/sponsorship/SponsorshipInfo.js +++ /dev/null @@ -1,42 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {$rootScope.Scope} $scope - * @return {SponsorshipInfo} - */ - const controller = function ($scope) { - - class SponsorshipInfo { - - /** - * @type {Signable} - */ - signable; - - - $postLink() { - this.transaction = this.signable.getTxData(); - - (this.transaction.id ? Promise.resolve(this.transaction.id) : this.signable.getId()) - .then(id => { - this.id = id; - $scope.$apply(); - }); - } - - } - - return new SponsorshipInfo(); - }; - - controller.$inject = ['$scope']; - - angular.module('app.ui').component('wSponsorshipInfo', { - bindings: { - signable: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/sponsorship/info.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/sponsorship/header.html b/src/modules/ui/directives/transactionInfo/types/sponsorship/header.html deleted file mode 100644 index fc536cc8f8..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/sponsorship/header.html +++ /dev/null @@ -1,8 +0,0 @@ -
    -
    -

    - -
    -
    diff --git a/src/modules/ui/directives/transactionInfo/types/sponsorship/info.html b/src/modules/ui/directives/transactionInfo/types/sponsorship/info.html deleted file mode 100644 index d245962518..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/sponsorship/info.html +++ /dev/null @@ -1,15 +0,0 @@ -
    -
    -
    {{$ctrl.transaction.minSponsoredAssetFee.asset.id}}
    -
    -
    -
    -
    - -
    -
    - - diff --git a/src/modules/ui/directives/transactionInfo/types/transfer/TransferHeader.js b/src/modules/ui/directives/transactionInfo/types/transfer/TransferHeader.js deleted file mode 100644 index 3932d04226..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/transfer/TransferHeader.js +++ /dev/null @@ -1,76 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {app.utils} utils - * @param {BaseAssetService} baseAssetService - * @param {$rootScope.Scope} $scope - * @return {TransferHeader} - */ - const controller = function (utils, baseAssetService, $scope) { - - class TransferHeader { - - /** - * @type {string} - */ - typeName; - /** - * @type {Signable} - */ - signable; - /** - * @type {string} - */ - amount; - /** - * @type {string} - */ - name; - /** - * @type {boolean} - */ - needShowMirror = false; - /** - * @type {Money} - */ - mirrorBalance; - /** - * @type {boolean} - */ - isSponsor = false; - - - $postLink() { - const tx = this.signable.getTxData(); - this.typeName = utils.getTransactionTypeName(tx); - this.isSponsor = this.typeName === WavesApp.TRANSACTION_TYPES.EXTENDED.SPONSORSHIP_FEE; - this.amount = this.isSponsor ? tx.fee.toFormat() : tx.amount.toFormat(); - this.name = this.isSponsor ? tx.fee.asset.name : tx.amount.asset.name; - - if (!this.isSponsor && tx.amount.asset.id !== baseAssetService.getBaseAssetId()) { - baseAssetService.convertToBaseAsset(tx.amount) - .then(mirror => { - this.mirrorBalance = mirror; - this.needShowMirror = this.mirrorBalance.getCoins().gt(0); - $scope.$apply(); - }); - } - } - - } - - return new TransferHeader(); - }; - - controller.$inject = ['utils', 'baseAssetService', '$scope']; - - angular.module('app.ui').component('wTransferHeader', { - bindings: { - signable: '<', - isScam: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/transfer/transfer-header.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/transfer/TransferInfo.js b/src/modules/ui/directives/transactionInfo/types/transfer/TransferInfo.js deleted file mode 100644 index c76d790962..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/transfer/TransferInfo.js +++ /dev/null @@ -1,81 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {$rootScope.Scope} $scope - * @param {app.utils} utils - * @return {TransferInfo} - */ - const controller = function ($scope, utils) { - - class TransferInfo { - - /** - * @type {Signable} - */ - signable; - /** - * @type {boolean} - */ - isReceive = false; - /** - * @type {boolean} - */ - isSend = false; - /** - * @type {boolean} - */ - isSelf = false; - /** - * @type {boolean} - */ - isSponsor = false; - /** - * @type {string} - */ - attachment = ''; - - - $postLink() { - this.transaction = this.signable.getTxData(); - this.attachment = utils.bytesToSafeString(this.transaction.attachment); - - const typeName = utils.getTransactionTypeName(this.transaction); - switch (typeName) { - case WavesApp.TRANSACTION_TYPES.EXTENDED.CIRCULAR: - this.isSelf = true; - break; - case WavesApp.TRANSACTION_TYPES.EXTENDED.SEND: - this.isSend = true; - break; - case WavesApp.TRANSACTION_TYPES.EXTENDED.RECEIVE: - this.isReceive = true; - break; - case WavesApp.TRANSACTION_TYPES.EXTENDED.SPONSORSHIP_FEE: - this.isSponsor = true; - break; - default: - break; - } - (this.transaction.id ? Promise.resolve(this.transaction.id) : this.signable.getId()) - .then(id => { - this.id = id; - $scope.$apply(); - }); - } - - } - - return new TransferInfo(); - }; - - controller.$inject = ['$scope', 'utils']; - - angular.module('app.ui').component('wTransferInfo', { - bindings: { - signable: '<' - }, - controller, - templateUrl: 'modules/ui/directives/transactionInfo/types/transfer/transfer-info.html' - }); -})(); diff --git a/src/modules/ui/directives/transactionInfo/types/transfer/transfer-header.html b/src/modules/ui/directives/transactionInfo/types/transfer/transfer-header.html deleted file mode 100644 index 18a684ba69..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/transfer/transfer-header.html +++ /dev/null @@ -1,14 +0,0 @@ -
    -
    -

    - -
    -
    - ≈ {{::$ctrl.mirrorBalance.toFormat()}} {{::$ctrl.mirrorBalance.asset.name}} -
    - -
    diff --git a/src/modules/ui/directives/transactionInfo/types/transfer/transfer-info.html b/src/modules/ui/directives/transactionInfo/types/transfer/transfer-info.html deleted file mode 100644 index 3a1c98b77e..0000000000 --- a/src/modules/ui/directives/transactionInfo/types/transfer/transfer-info.html +++ /dev/null @@ -1,21 +0,0 @@ -
    -
    -
    -
    {{::$ctrl.transaction.recipient}}
    -
    {{::$ctrl.transaction.sender}}
    -
    - -
    -
    -
    {{$ctrl.transaction.fee.asset.id}}
    -
    - -
    -
    -
    {{::$ctrl.attachment}}
    -
    - - diff --git a/src/modules/ui/directives/transactionList/TransactionList.js b/src/modules/ui/directives/transactionList/TransactionList.js deleted file mode 100644 index dda5ca7620..0000000000 --- a/src/modules/ui/directives/transactionList/TransactionList.js +++ /dev/null @@ -1,111 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param {User} user - * @param i18n - * @param {Waves} waves - * @param {app.utils} utils - * @return {TransactionList} - */ - const controller = function (Base, user, i18n, waves, utils) { - - class TransactionList extends Base { - - constructor() { - super(); - /** - * @type {Array} - */ - this._transactions = null; - /** - * @type {Array} - */ - this.transactions = null; - /** - * @type {boolean} - */ - this.pending = false; - /** - * @type {boolean} - */ - this.dontShowSpam = user.getSetting('dontShowSpam'); - - this.syncSettings({ - dontShowSpam: 'dontShowSpam' - }); - - this.observe(['_transactions', 'dontShowSpam'], this._onChangeTransactions); - } - - $postLink() { - this.parentSelector = this.parentSelector || 'ul'; - } - - /** - * @private - */ - _onChangeTransactions() { - let transactions = (this._transactions || []); - if (this.dontShowSpam) { - transactions = transactions.filter(this._filterSpam); - } - - const hash = Object.create(null); - const toDate = tsUtils.date('DD.MM.YYYY'); - - transactions.forEach((transaction) => { - const date = toDate(transaction.timestamp); - if (!hash[date]) { - hash[date] = { timestamp: transaction.timestamp, transactions: [] }; - } - hash[date].transactions.push(transaction); - }); - - const dates = Object.keys(hash) - .sort(utils.comparators.process((name) => hash[name].timestamp).desc); - - this.transactions = dates.map((date) => ({ - transactions: hash[date].transactions, - timestamp: hash[date].timestamp, - date - })); - } - - _filterSpam(transaction) { - const isScam = !!user.scam[transaction.assetId]; - let isScamAmount, isScamPrice; - if (transaction.type === 7) { - isScamAmount = !!user.scam[transaction.amount.asset]; - isScamPrice = !!user.scam[transaction.price.asset]; - } - return !(isScam || isScamAmount || isScamPrice); - } - - } - - return new TransactionList(); - }; - - controller.$inject = [ - 'Base', - 'user', - 'i18n', - 'waves', - 'utils' - ]; - - angular.module('app.ui') - .component('wTransactionList', { - bindings: { - transactionDatePattern: '@', - parentSelector: '@', - pending: '<', - _transactions: ' -
      -
    • -
      {{ ::data.timestamp | date:'MMM, d, yyyy' }}
      - -
      -
      - - - -
      -
      - -
      • -
    - - - diff --git a/src/modules/ui/directives/transactionList/transactionList.less b/src/modules/ui/directives/transactionList/transactionList.less deleted file mode 100644 index 7d07233115..0000000000 --- a/src/modules/ui/directives/transactionList/transactionList.less +++ /dev/null @@ -1,131 +0,0 @@ -@import (reference) 'config'; - -.transactions-container w-scroll-box, -.transactions w-scroll-box { - border-radius: @border-radius; - margin: 0 -10px; - padding: 10px; - overflow: auto; - - .scroll-list { - height: 100%; - } -} - -w-transaction-list { - display: flex; - height: 100%; - - w-transaction { - width: 100%; - } - - .w-visible { - min-height: 74px; - } - - .transaction-list-mixin { - background-color: @color-white; - border-radius: @border-radius; - } - - .no-transactions { - .transaction-list-mixin(); - position: relative; - min-height: 230px; - width: 100%; - display: flex; - flex-direction: column; - justify-content: space-around; - align-items: center; - } - - .w-transaction-list { - width: 100%; - border-radius: @border-radius; - transform: translate3d(0, 0, 0); - - ul { - list-style: none; - margin: 0; - padding: 0; - transform: translate3d(0, 0, 0); - height: 100%; - - li { - padding: 0; - - .date { - line-height: 42px; - padding-left: 23px; - height: 42px; - text-transform: uppercase; - background-color: @app-background; - font-family: @font-roboto-medium; - letter-spacing: 2px; - } - - .row { - .w-visible { - border-bottom: 1px solid @color-basic-50; - } - - &:last-child { - .w-visible { - border-bottom: none; - } - } - - &:hover { - background: @hover-default; - } - } - } - } - } -} - -.fake-transaction-line { - display: block; - position: relative; - margin: 30px 0; - height: 13px; - - .loader { - margin: 0 auto; - } -} - -@media screen and (max-width: 768px) { - .transaction-item .date { - padding-left: 23px; - } - - body.transactions { - .main-content { - .w-visible { - height: 91px; - } - - w-transaction-list { - min-height: calc(100vh ~'- 148px'); - .w-transaction-list { - - ul { - overflow: auto; - } - - &.no-transactions { - min-height: 250px; - } - } - } - } - } - - .transactions w-scroll-box { - .scroll-list { - height: auto; - } - } -} diff --git a/src/modules/ui/services/CarouselManager.js b/src/modules/ui/services/CarouselManager.js deleted file mode 100644 index 852ca60f88..0000000000 --- a/src/modules/ui/services/CarouselManager.js +++ /dev/null @@ -1,69 +0,0 @@ -(function () { - 'use strict'; - - const factory = function ($q) { - - class CarouselManager { - - constructor() { - this.slidersHash = Object.create(null); - this.promiseHash = Object.create(null); - this.defersHash = Object.create(null); - } - - /** - * @param {string} id - * @param {Carousel} slider - */ - registerSlider(id, slider) { - this.slidersHash[id] = slider; - if (this.defersHash[id]) { - this.defersHash[id].resolve(slider); - delete this.promiseHash[id]; - } - if (this.promiseHash[id]) { - delete this.promiseHash[id]; - } - } - - /** - * @param {string} id - */ - removeSlider(id) { - if (this.slidersHash[id]) { - delete this.slidersHash[id]; - } - if (this.promiseHash[id]) { - delete this.promiseHash[id]; - } - if (this.defersHash[id]) { - delete this.defersHash[id]; - } - } - - /** - * @param {string} id - * @return {Carousel} - */ - getSlider(id) { - if (this.slidersHash[id]) { - return $q.when(this.slidersHash[id]); - } else if (this.promiseHash[id]) { - return this.promiseHash[id]; - } else { - const defer = $q.defer(); - this.promiseHash[id] = defer.promise; - this.defersHash[id] = defer; - return this.promiseHash[id]; - } - } - - } - - return new CarouselManager(); - }; - - factory.$inject = ['$q']; - - angular.module('app.ui').factory('carouselManager', factory); -})(); diff --git a/src/modules/ui/services/ConfirmTxService.js b/src/modules/ui/services/ConfirmTxService.js deleted file mode 100644 index 137047bf1d..0000000000 --- a/src/modules/ui/services/ConfirmTxService.js +++ /dev/null @@ -1,252 +0,0 @@ -(function () { - 'use strict'; - - const ds = require('data-service'); - const { Asset } = require('@waves/data-entities'); - const { SIGN_TYPE } = require('@waves/signature-adapter'); - const analytics = require('@waves/event-sender'); - - const NO_EXPORT_TYPES = [ - SIGN_TYPE.MASS_TRANSFER, - SIGN_TYPE.CREATE_ORDER, - SIGN_TYPE.DATA, - SIGN_TYPE.SCRIPT_INVOCATION - ]; - - const ANALYTICS_TX_NAMES = { - [SIGN_TYPE.CREATE_ORDER]: 'Create order', - [SIGN_TYPE.ISSUE]: 'Token Generation', - [SIGN_TYPE.TRANSFER]: 'Transfer', - [SIGN_TYPE.REISSUE]: 'Reissue Token', - [SIGN_TYPE.BURN]: 'Burn Token', - [SIGN_TYPE.EXCHANGE]: 'Exchange', - [SIGN_TYPE.LEASE]: 'Leasing', - [SIGN_TYPE.CANCEL_LEASING]: 'Leasing cancel', - [SIGN_TYPE.CREATE_ALIAS]: 'Create Alias', - [SIGN_TYPE.MASS_TRANSFER]: 'Mass Transfer', - [SIGN_TYPE.DATA]: 'Data', - [SIGN_TYPE.SET_SCRIPT]: 'Set Script', - [SIGN_TYPE.SPONSORSHIP]: 'Sponsorship', - [SIGN_TYPE.SET_ASSET_SCRIPT]: 'Set Asset Script' - }; - - const factory = function (Base, waves, utils, $mdDialog, modalManager) { - - class ConfirmTxService extends Base { - - /** - * @type {function} - */ - onTxSent = null; - /** - * @type {number} - */ - step = 0; - /** - * @type {string} - */ - txId = ''; - /** - * @type {Signable} - */ - signable = null; - /** - * @type {boolean} - */ - advancedMode = false; - /** - * @type {string} - */ - activeTab = 'details'; - /** - * @type {boolean} - */ - canCreateLink = false; - /** - * @type {string} - */ - exportLink = WavesApp.origin; - /** - * @type {number} - */ - errorType = null; - /** - * @type {string} - */ - errorMessage = null; - /** - * @type {object} - */ - errorParams = Object.create(null); - /** - * @type {boolean} - */ - isTransaction = false; - /** - * @type {$rootScope.Scope} - * @private - */ - __$scope = null; - - - constructor($scope) { - super($scope); - - this.__$scope = $scope; - - this.syncSettings({ - advancedMode: 'advancedMode' - }); - this.observe('signable', this.onChangeSignable); - } - - sendTransaction() { - const method = ConfirmTxService._getSendMethod(this.signable.type); - - return this.signable.getDataForApi() - .then(method) - .then(data => { - analytics.send(this.getAnalytics(data, true)); - return data; - }, (error) => { - analytics.send(this.getAnalytics(this.signable.getTxData(), false)); - return Promise.reject(error); - }); - } - - getEventName(data) { - if (data.type) { - return data.type in ANALYTICS_TX_NAMES ? ANALYTICS_TX_NAMES[data.type] : 'Unknown'; - } else { - return ANALYTICS_TX_NAMES[SIGN_TYPE.CREATE_ORDER]; - } - } - - getAnalytics(data, success) { - const NAME = this.getEventName(data); - const name = success ? `${NAME} Transaction Success` : `${NAME} Transaction Error`; - return { name, params: { type: data.type } }; - } - - confirm() { - return this.sendTransaction().then(tx => { - - if (ConfirmTxService._isIssueTx(tx)) { - this._saveIssueAsset(tx); - } - - this.step++; - this.onTxSent({ id: tx.id }); - this.__$scope.$apply(); - }).catch(e => { - if (e.error && utils.checkIsScriptError(e.error)) { - this.errorType = e.error; - this.errorParams = e.params; - } else { - this.errorMessage = e.message; - } - this.__$scope.$apply(); - }); - } - - showTxInfo() { - this.signable.getId().then(id => { - $mdDialog.hide(); - setTimeout(() => { // Timeout for routing (if modal has route) - modalManager.showTransactionInfo(id); - }, 1000); - }); - } - - /** - * @param tx - * @private - */ - _saveIssueAsset(tx) { - waves.node.height().then(height => { - ds.assetStorage.save(tx.id, new Asset({ - ...tx, - ticker: null, - precision: tx.decimals, - hasScript: !!(tx.script && tx.script.replace('base64:', '')), - height - })); - }); - } - - /** - * @protected - */ - initExportLink() { - const type = this.signable.type; - this.signable.getDataForApi().then(data => { - - this.exportLink = `${WavesApp.origin}/#tx${utils.createQS(data)}`; - - this.canCreateLink = !NO_EXPORT_TYPES.includes(type) && - this.exportLink.length <= WavesApp.MAX_URL_LENGTH; - this.__$scope.$apply(); - }); - } - - /** - * @protected - */ - onChangeSignable() { - if (this.signable) { - this.isTransaction = this.signable.type < 100; - if (this.advancedMode) { - this.signable.hasMySignature().then(state => { - if (state) { - this.initExportLink(); - } - }); - } - this.tx = waves.node.transactions.createTransaction(this.signable.getTxData()); - this.signable.getId().then(id => { - this.txId = id; - this.__$scope.$digest(); - }); - } else { - this.txId = ''; - this.tx = null; - } - } - - /** - * @param tx - * @return {boolean} - * @private - */ - static _isIssueTx(tx) { - return tx.type === SIGN_TYPE.ISSUE; - } - - static _getSendMethod(type) { - switch (type) { - case SIGN_TYPE.CREATE_ORDER: - return ds.createOrder; - case SIGN_TYPE.CANCEL_ORDER: - return ds.cancelOrder; - default: - return ds.broadcast; - } - } - - /** - * @param {Money} [amount] - * @return {string | undefined} - */ - static toBigNumber(amount) { - return amount && amount.getTokens().toFixed() || undefined; - } - - } - - return ConfirmTxService; - }; - - factory.$inject = ['Base', 'waves', 'utils', '$mdDialog', 'modalManager']; - - angular.module('app.ui').factory('ConfirmTxService', factory); -})(); diff --git a/src/modules/utils/directives/validators/Validate.js b/src/modules/utils/directives/validators/Validate.js index a8f7a658f8..07bf5ec03d 100644 --- a/src/modules/utils/directives/validators/Validate.js +++ b/src/modules/utils/directives/validators/Validate.js @@ -21,8 +21,6 @@ 'alias', 'address', 'wavesAddress', - 'outerBlockchains', - 'anyAddress', 'pattern', 'custom' ]; @@ -207,12 +205,6 @@ case 'integer': this._validators[name] = this._createIntegerValidator(name); break; - case 'anyAddress': - this._validators[name] = this._createAnyAddressValidator(name); - break; - case 'outerBlockchains': - this._validators[name] = this._createOuterBlockchainsValidator(name); - break; case 'pattern': this._validators[name] = this._createPatternValidator(name); break; @@ -274,54 +266,6 @@ }; } - _createOuterBlockchainsValidator(name) { - - let value = null; - - const validator = { - name, - value: null, - handler: function (address) { - return validateService.outerBlockchains(address, validator.value); - } - }; - - Object.defineProperty(validator, 'value', { - get: () => value, - set: (data) => { - value = Validate._toAssetId(data); - } - }); - - this._listenValidatorChanges(name, validator); - - return validator; - } - - _createAnyAddressValidator(name) { - - let value = null; - - const validator = { - name, - value: null, - handler: function (address) { - return validateService.anyAddress(address, validator.value); - } - }; - - Object.defineProperty(validator, 'value', { - get: () => value, - set: (data) => { - value = Validate._toAssetId(data); - } - }); - - this._listenValidatorChanges(name, validator); - - return validator; - } - _createCompareValidator(name) { let value = null; diff --git a/src/modules/utils/directives/validators/ValidateService.js b/src/modules/utils/directives/validators/ValidateService.js index 98e57256b2..aec638da66 100644 --- a/src/modules/utils/directives/validators/ValidateService.js +++ b/src/modules/utils/directives/validators/ValidateService.js @@ -7,12 +7,11 @@ /** * @param {Waves} waves * @param {$q} $q - * @param {Object.} outerBlockchains * @param {app.utils} utils * @param {User} user * @return {ValidateService} */ - const factory = function (waves, $q, outerBlockchains, utils, user) { + const factory = function (waves, $q, utils, user) { const fetchAliases = utils.cache( {}, @@ -84,10 +83,6 @@ return inputValue.round().eq(inputValue); } - anyAddress(address, assetId) { - return this.outerBlockchains(address, assetId) ? true : this.wavesAddress(address); - } - /** * @param {string} address * @param {'no-self'} [value] @@ -135,20 +130,6 @@ } - outerBlockchains(address, assetId) { - if (!address || !assetId) { - return true; - } - - const outerChain = outerBlockchains[assetId]; - - if (!outerChain) { - return false; - } - - return outerChain.isValidAddress(address); - } - /** * @param {string} alias * @return {boolean} @@ -256,7 +237,7 @@ return utils.bind(new ValidateService()); }; - factory.$inject = ['waves', '$q', 'outerBlockchains', 'utils', 'user']; + factory.$inject = ['waves', '$q', 'utils', 'user']; angular.module('app.utils').factory('validateService', factory); })(); diff --git a/src/modules/utils/modals/ModalManager.js b/src/modules/utils/modals/ModalManager.js index ed0afd2c52..842a14196e 100644 --- a/src/modules/utils/modals/ModalManager.js +++ b/src/modules/utils/modals/ModalManager.js @@ -18,9 +18,6 @@ const tsUtils = require('ts-utils'); const ds = require('data-service'); - const { Money } = require('@waves/data-entities'); - const { SIGN_TYPE } = require('@waves/signature-adapter'); - const analytics = require('@waves/event-sender'); const DEFAULT_OPTIONS = { clickOutsideToClose: true, @@ -234,15 +231,6 @@ return $templateRequest(url); } - showScriptModal() { - return this._getModal({ - id: 'script-modal', - contentUrl: 'modules/utils/modals/script/script.html', - controller: 'ScriptModalCtrl', - title: 'modal.script.setScript' - }); - } - showPasswordModal() { return this._getModal({ id: 'password-modal', @@ -268,19 +256,6 @@ }); } - showTryDesktopModal() { - analytics.send({ name: 'Onboarding Platform Popup Show', target: 'ui' }); - return this._getModal({ - id: 'try-desktop', - title: '', - contentUrl: 'modules/utils/modals/tryDesktop/tryDesktop.html', - controller: 'TryDesktopCtrl', - clickOutsideToClose: false, - escapeToClose: false, - mod: 'try-desktop-modal' - }); - } - showExportAccount() { return this._getModal({ id: 'export-account', @@ -301,91 +276,6 @@ }); } - /** - * @param {Signable} signable - * @param anyData - * @return {Promise} - */ - showSignByDevice(signable, anyData = null) { - return this._getModal({ - id: 'sign-by-device', - contentUrl: 'modules/utils/modals/signByDevice/signByDevice.html', - controller: 'SignByDeviceCtrl', - locals: { signable, anyData }, - clickOutsideToClose: false, - escapeToClose: false - }); - } - - showConfirmOrder(options) { - return this._getModal({ - id: 'confirm-correct-order', - contentUrl: 'modules/utils/modals/confirmOrder/confirmOrder.html', - controller: 'ConfirmOrderCtrl', - locals: options - }); - } - - /** - * @param {Promise} promise - * @param {string} type - * @return {Promise} - */ - showLoginByDevice(promise, type) { - return this._getModal({ - id: 'login-by-device', - contentUrl: 'modules/utils/modals/loginByDevice/loginByDevice.html', - controller: 'LoginByDeviceCtrl', - locals: () => ({ promise, type }), - clickOutsideToClose: false, - escapeToClose: false - }); - } - - showSignDeviceError(locals) { - return this._getModal({ - id: 'error-sign-device', - contentUrl: 'modules/utils/modals/signDeviceError/signDeviceError.html', - controller: 'SignDeviceError', - locals: { ...locals }, - clickOutsideToClose: false, - escapeToClose: false - }); - } - - showGatewaySign(search) { - return this._getModal({ - id: 'gateway-sign-in', - title: '{{$ctrl.titleLiteral}}', - contentUrl: 'modules/utils/modals/gateway/gatewaySign.html', - controller: 'GatewaySignCtrl', - locals: { search }, - clickOutsideToClose: false, - escapeToClose: false - }); - } - - showPinAsset() { - return this._getModal({ - id: 'pin-asset', - title: 'modal.pinAsset.title', - templateUrl: 'modules/utils/modals/pinAsset/pinAsset.html', - controller: 'PinAssetCtrl', - mod: 'pin-asset-modal' - }); - } - - showAssetInfo(asset) { - return this._getModal({ - id: 'asset-info', - title: 'modal.assetInfo.title', - contentUrl: 'modules/utils/modals/assetInfo/assetInfo.html', - locals: asset, - controller: 'AssetInfoCtrl', - mod: 'm-dialog m-dialog_asset-info' - }); - } - showSettings() { return this._getModal({ id: 'user-settings', @@ -409,14 +299,6 @@ }); } - showTutorialModals() { - return this._getModal({ - id: 'tutorial-modals', - templateUrl: 'modules/utils/modals/tutorialModals/tutorialModals.html', - controller: 'TutorialModalsCtrl' - }); - } - showSeedBackupModal() { const api = ds.signature.getSignatureApi(); @@ -444,17 +326,6 @@ }); } - showDexScriptedPair(assets) { - return this._getModal({ - id: 'dex-scripted-pair', - templateUrl: 'modules/utils/modals/dexScriptedPair/dexScriptedPair.html', - controller: 'DexScriptedPairCtrl', - locals: { - assets - } - }); - } - showAccountChangeName() { return this._getModal({ id: 'changeName', @@ -489,233 +360,6 @@ }); } - /** - * @param {object} [data] - * @param {string} [data.assetId] - * @param {'singleSend'|'massSend'} [data.mode] - * @param {string} [data.amount] - * @param {string} [data.recipient] - * @param {boolean} [data.strict] - * @param {string} [data.referrer] - * @return {Promise} - */ - showSendAsset(data) { - data = data || Object.create(null); - - return this._getModal({ - id: 'send-asset', - controller: 'AssetSendCtrl', - templateUrl: 'modules/utils/modals/sendAsset/send.modal.html', - mod: 'modal-send', - locals: { - assetId: data.assetId, - canChooseAsset: !data.assetId, - mode: data.mode, - amount: data.amount, - recipient: data.recipient, - strict: data.strict, - referrer: data.referrer, - attachment: data.attachment - } - }); - } - - /** - * @param {Asset} [asset] - * @return {Promise} - */ - showReceiveModal(asset) { - return this._getModal({ - id: 'receive-popup', - locals: { asset }, - templateUrl: 'modules/utils/modals/receive/Receive.html', - controller: 'ReceiveCtrl' - }); - } - - /** - * @param {User} user - * @param {Asset} asset - * @return {Promise} - */ - showDepositAsset(user, asset) { - return this._getModal({ - id: 'deposit-asset', - locals: { address: user.address, asset }, - title: 'modal.deposit.title', - titleParams: { assetName: asset.name }, - contentUrl: 'modules/utils/modals/depositAsset/deposit-asset.modal.html', - controller: 'DepositAsset', - mod: 'modal-deposit-asset' - }); - } - - /** - * @param {User} user - * @param {Asset} asset - * @return {Promise} - */ - showSepaAsset(user, asset) { - return this._getModal({ - id: 'sepa-asset', - locals: { address: user.address, asset }, - title: 'modal.sepa.title', - titleParams: { assetName: asset.name }, - contentUrl: 'modules/utils/modals/sepaAsset/sepa-asset.modal.html', - controller: 'SepaAsset', - mod: 'modal-sepa-asset' - }); - } - - showTransactionInfo(transactionId) { - return this._getModal({ - id: 'transaction-info', - ns: 'app.ui', - controller: 'TransactionInfoCtrl', - templateUrl: 'modules/utils/modals/transactionInfo/transaction-info.modal.html', - mod: 'transaction-info', - locals: { transactionId } - }); - } - - showAnyTx(tx, analyticsText) { - return this._getModal({ - id: 'any-tx-modal', - controller: 'AnyTxModalCtrl', - contentUrl: 'modules/utils/modals/anyTxModal/any-tx-modal.html', - title: 'modals.anyTx.title', - locals: { tx, analyticsText } - }); - } - - showStartLeasing() { - return this._getModal({ - id: 'start-leasing', - ns: 'app.utils', - controller: 'StartLeasingCtrl', - titleContent: '{{$ctrl.title}}', - mod: 'start-leasing', - contentUrl: 'modules/utils/modals/startLeasing/startLeasing.html' - }); - } - - showConfirmTx(signable, analyticsText) { - return this._getModal({ - id: 'confirm-tx', - mod: 'confirm-tx', - ns: 'app.ui', - locals: { signable, analyticsText }, - controller: 'ConfirmTxCtrl', - contentUrl: 'modules/utils/modals/confirmTx/confirmTx.modal.html' - }); - } - - showBurnModal(assetId) { - return $injector.get('waves').node.assets.balance(assetId).then(({ available }) => this._getModal({ - id: 'token-burn', - mod: 'change-token', - locals: { money: available, txType: 'burn' }, - titleContent: '', - contentUrl: 'modules/utils/modals/changeToken/change-token-modal.html', - controller: 'TokenChangeModalCtrl' - })); - } - - showReissueModal(assetId) { - return $injector.get('waves').node.assets.balance(assetId).then(({ available }) => this._getModal({ - id: 'token-burn', - mod: 'change-token', - locals: { money: available, txType: 'reissue' }, - titleContent: '', - contentUrl: 'modules/utils/modals/changeToken/change-token-modal.html', - controller: 'TokenChangeModalCtrl' - })); - } - - showSponsorshipModal(assetId, isEdit) { - const title = isEdit ? 'modal.sponsorship_edit.title' : 'modal.sponsorship.title'; - return ds.api.assets.get(assetId).then((asset) => { - return this._getModal({ - id: 'sponsorship', - mod: 'sponsorship', - locals: { asset, assetId, isCreateSponsored: !isEdit }, - titleContent: ``, - controller: 'SponsoredModalCtrl', - contentUrl: 'modules/utils/modals/sponsored/sponsored.html' - }); - }); - } - - showSetAssetScriptModal(assetId) { - const title = 'modal.setAssetScript.title'; - return this._getModal({ - id: 'setAssetScript', - mod: 'setAssetScript', - locals: assetId, - titleContent: ``, - controller: 'SetAssetScriptModalCtrl', - contentUrl: 'modules/utils/modals/setAssetScript/setAssetScript.html' - }); - } - - showSponsorshipStopModal(assetId) { - const waves = $injector.get('waves'); - - return Promise.all([ - ds.api.assets.get(assetId), - waves.node.getFee({ type: SIGN_TYPE.SPONSORSHIP }) - ]).then(([asset, fee]) => { - const money = new Money(0, asset); - const tx = waves.node.transactions.createTransaction({ - type: SIGN_TYPE.SPONSORSHIP, - assetId, - asset, - minSponsoredAssetFee: money, - fee - }); - const signable = ds.signature.getSignatureApi().makeSignable({ - type: tx.type, - data: tx - }); - - return this.showConfirmTx(signable); - }); - } - - showImportAccountsModal() { - return this._getModal({ - id: 'import-accounts', - mod: 'import-accounts', - controller: 'ImportAccountsCtrl', - contentUrl: 'modules/utils/modals/importAccounts/importAccounts.html' - }); - } - - showConfirmLogout() { - return this._getModal({ - id: 'logout-modal', - contentUrl: 'modules/utils/modals/confirmLogout/confirmLogout.modal.html', - title: '' - }); - } - - showLockPairWarning(amountTicker, priceTicker) { - return this._getModal({ - id: 'logout-modal', - controller: 'LockPairWarningCtrl', - contentUrl: 'modules/utils/modals/lockPairWarning/lockPairWarning.modal.html', - locals: { amountTicker, priceTicker } - }); - } - - showMigrateModal() { - return this._getModal({ - id: 'migrate-modal', - controller: 'MigrateModalCtrl', - contentUrl: 'modules/utils/modals/migrateModal/migrateModal.html' - }); - } - showMigrateFAQ() { return this._getModal({ id: 'migrate-faq', diff --git a/src/modules/utils/modals/ModalRouter.js b/src/modules/utils/modals/ModalRouter.js deleted file mode 100644 index 2cf6480e47..0000000000 --- a/src/modules/utils/modals/ModalRouter.js +++ /dev/null @@ -1,151 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {User} user - * @param {ModalManager} modalManager - * @param {Waves} waves - * @param {typeof Router} Router - * @param {app.utils} utils - * @return {ModalRouter} - */ - const factory = function (user, modalManager, waves, Router, utils) { - - class ModalRouter { - - constructor() { - /** - * @type {boolean} - * @private - */ - this._sleep = false; - /** - * @type string - * @private - */ - this._firstUrl = ModalRouter._getUrlData(); - this._router = new Router(); - this._router.registerRouteHash(this._wrapClose(this._getRoutes())); - - if (WavesApp.isDesktop()) { - window.listenMainProcessEvent((eventType, urlString) => { - user.onLogin().then(() => { - const { hash } = utils.parseElectronUrl(urlString); - - if (hash) { - this._apply(ModalRouter._getUrlData(hash.replace('#', ''))); - } - }); - }); - } - } - - initialize() { - window.addEventListener('hashchange', () => { - if (!this._sleep) { - this._apply(ModalRouter._getUrlData()); - } - }, false); - - waves.node.assets.userBalances().then(() => { - this._apply(this._firstUrl); - this._firstUrl = window.location.href; - }); - } - - /** - * @param {string} url - * @private - */ - _apply(url) { - return this._router.apply(url); - } - - /** - * @return {Object.} - * @private - */ - _getRoutes() { - return { - [Router.ROUTES.SEND]: () => modalManager.showSendAsset(), - [Router.ROUTES.SEND_ASSET]: ({ assetId }, search) => { - return modalManager.showSendAsset({ ...search, assetId }); - }, - [Router.ROUTES.ASSET_INFO]: ({ assetId }) => { - return waves.node.assets.getAsset(assetId).then((asset) => { - return modalManager.showAssetInfo(asset); - }); - }, - // '/receive': () => modalManager.showReceiveAsset(user), // TODO : decide on that - [Router.ROUTES.ACCOUNT]: () => modalManager.showAccountInfo(), - [Router.ROUTES.GATEWAY_AUTH]: (params, search) => modalManager.showGatewaySign(search), - [Router.ROUTES.ANY_TX]: (params, search) => modalManager.showAnyTx(search) - }; - } - - /** - * @param hash - * @returns {*} - * @private - */ - _wrapClose(hash) { - Object.keys(hash).forEach((key) => { - const handler = hash[key]; - - hash[key] = (...args) => { - this._sleep = true; - - return user.onLogin().then(() => { - const result = handler(...args); - - if (!result || !result.then || typeof result.then !== 'function') { - throw new Error('Modal result must be a promise!'); - } - - const cb = () => { - this._sleep = false; - location.hash = ''; - }; - - result.then(cb, cb); - - return result; - }); - }; - }); - - return hash; - } - - /** - * @param {string} [fromUrl] - * @return {string} - * @private - */ - static _getUrlData(fromUrl) { - return `/${decodeURIComponent(fromUrl || ModalRouter._getLocation())}`; - } - - /** - * @return {string} - * @private - */ - static _getLocation() { - if (WavesApp.isDesktop()) { - const lastIndex = location.hash.lastIndexOf('#'); - const firstIndex = location.hash.indexOf('#'); - return lastIndex > firstIndex ? location.hash.slice(lastIndex + 1) : ''; - } else { - return location.hash.replace('#', ''); - } - } - - } - - return ModalRouter; - }; - - factory.$inject = ['user', 'modalManager', 'waves', 'Router', 'utils']; - - angular.module('app.ui').factory('ModalRouter', factory); -})(); diff --git a/src/modules/utils/modals/accountInfo/AccountInfoCtrl.js b/src/modules/utils/modals/accountInfo/AccountInfoCtrl.js index 71cb8d5a43..db1abf34d2 100644 --- a/src/modules/utils/modals/accountInfo/AccountInfoCtrl.js +++ b/src/modules/utils/modals/accountInfo/AccountInfoCtrl.js @@ -1,22 +1,14 @@ (function () { 'use strict'; - const MIN_ALIAS_LENGTH = 4; - const MAX_ALIAS_LENGTH = 30; - const ALIAS_PATTERN = /^[a-z0-9-@_.]*$/; - const { SIGN_TYPE } = require('@waves/signature-adapter'); - /** * @param Base * @param {$rootScope.Scope} $scope * @param {User} user * @param {Waves} waves - * @param {INotification} notification - * @param {app.utils} utils - * @param {BalanceWatcher} balanceWatcher * @return {AccountInfoCtrl} */ - const controller = function (Base, $scope, user, waves, notification, utils, balanceWatcher) { + const controller = function (Base, $scope, user, waves) { const analytics = require('@waves/event-sender'); class AccountInfoCtrl extends Base { @@ -27,63 +19,18 @@ * @type {string} */ this.address = user.address; - /** - * @type {number} - */ - this.createAliasStep = 0; /** * @type {Array} */ this.aliases = null; - /** - * @type {string} - */ - this.newAlias = ''; - /** - * @type {Money} - */ - this.fee = null; - /** - * @type {boolean} - */ - this.noMoneyForFee = true; /** * @type {boolean} */ this.invalid = false; - /** - * @type {boolean} - */ - this.invalidMinLength = false; - /** - * @type {boolean} - */ - this.invalidMaxLength = false; - /** - * @type {boolean} - */ - this.invalidPattern = false; /** * @type {string} */ this.transactionId = ''; - /** - * @type {boolean} - */ - this.signLoader = false; - /** - * @type {boolean} - */ - this.signDeviceFail = false; - /** - * @type {boolean} - */ - this.invalidExist = false; - /** - * @type {Money} - * @private - */ - this._balance = null; /** * @type {string} */ @@ -97,79 +44,10 @@ */ this.isKeeper = user.userType === 'wavesKeeper'; - /** - * @type {boolean} - */ - this.errorCreateAliasMsg = ''; - - this.receive(balanceWatcher.change, this._updateBalance, this); - this._updateBalance(); - - const feePromise = waves.node.getFee({ type: SIGN_TYPE.CREATE_ALIAS }); - - Promise.all([feePromise, balanceWatcher.ready]) - .then(([fee]) => { - this.fee = fee; - this.observe(['_balance', 'fee'], this._onChangeBalance); - this._onChangeBalance(); - $scope.$digest(); - }); - this.aliases = waves.node.aliases.getAliasList(); - this.observe(['newAlias'], this._validateNewAlias); analytics.send({ name: 'Account Show', target: 'ui' }); } - getSignableTx() { - const type = 10; - const timestamp = ds.utils.normalizeTime(Date.now()); - const data = { alias: this.newAlias, fee: this.fee, timestamp }; - return ds.signature.getSignatureApi() - .makeSignable({ type, data }); - } - - createAlias() { - const signable = this.getSignableTx(); - return signable.getId() - .then( - (id) => { - this.signDeviceFail = false; - this.transactionId = id; - this.signLoader = user.userType && user.userType !== 'seed'; - $scope.$digest(); - }) - .then(() => signable.getDataForApi()) - .then( - (preparedTx) => { - if (this.wasDestroed) { - return Promise.reject(); - } - - this.signLoader = false; - return ds.broadcast(preparedTx).then(() => { - // analytics.push('User', `User.CreateAlias.Success.${WavesApp.type}`); - analytics.send({ name: 'Account Alias Create Transaction Success', target: 'ui' }); - this.aliases.push(this.newAlias); - this.newAlias = ''; - this.createAliasStep = 0; - notification.info({ - ns: 'app.utils', - title: { literal: 'modal.account.notifications.aliasCreated' } - }); - $scope.$digest(); - }); - }, - () => { - this.signDeviceFail = true; - this.signLoader = false; - $scope.$digest(); - }) - .catch((error) => { - analytics.send({ name: 'Account Alias Create Transaction Error', target: 'ui' }); - this.errorCreateAliasMsg = utils.parseError(error); - }); - } - onCopyAddress() { // analytics.push('User', `User.CopyAddress.${WavesApp.type}`); } @@ -178,64 +56,12 @@ // analytics.push('User', `User.CopyAlias.${WavesApp.type}`); } - reset() { - this.newAlias = ''; - } - - /** - * @private - */ - _onChangeBalance() { - this.noMoneyForFee = (!this.fee || !this._balance) || - this._balance.getTokens().lt(this.fee.getTokens()); - this.invalid = this.invalid || this.noMoneyForFee; - $scope.$digest(); - } - - _updateBalance() { - balanceWatcher.getBalanceByAssetId(WavesApp.defaultAssets.WAVES) - .then(money => { - this._balance = money; - utils.safeApply($scope); - }); - } - - /** - * @return {Promise} - * @private - */ - async _validateNewAlias() { - this.invalidMinLength = this.newAlias && this.newAlias.length < MIN_ALIAS_LENGTH; - this.invalidMaxLength = this.newAlias && this.newAlias.length > MAX_ALIAS_LENGTH; - this.invalidPattern = this.newAlias && !ALIAS_PATTERN.test(this.newAlias); - const invalid = this.noMoneyForFee || this.invalidMinLength || - this.invalidMaxLength || this.invalidPattern; - - if (this.newAlias && !invalid) { - this.pendingAlias = true; - this.invalid = true; - try { - await ds.api.aliases.getAddressByAlias(this.newAlias); - this.invalidExist = true; - } catch (e) { - this.invalidExist = false; - } - - this.pendingAlias = false; - this.invalid = invalid || this.invalidExist; - $scope.$digest(); - } else { - this.invalidExist = false; - this.invalid = invalid; - } - } - } return new AccountInfoCtrl(); }; - controller.$inject = ['Base', '$scope', 'user', 'waves', 'notification', 'utils', 'balanceWatcher']; + controller.$inject = ['Base', '$scope', 'user', 'waves']; angular.module('app.utils') .controller('AccountInfoCtrl', controller); diff --git a/src/modules/utils/modals/accountInfo/account-info.modal.html b/src/modules/utils/modals/accountInfo/account-info.modal.html index 9a15e85dd8..29c29846a5 100644 --- a/src/modules/utils/modals/accountInfo/account-info.modal.html +++ b/src/modules/utils/modals/accountInfo/account-info.modal.html @@ -19,102 +19,6 @@ info="::alias"> {{::alias}} - - - -
    - - - - - - -
    -     - -
    - -
    -     -     - -
    -
    - - - - - - -
    - - - - - - -
    - -
    -
    -
    {{$ctrl.transactionId}}
    -
    - -
    -
    - -
    -
    - -
    - -
    - -
    -
    -
    {{$ctrl.errorCreateAliasMsg}}
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -     -
    -     -
    -
    -     -     diff --git a/src/modules/utils/modals/anyTxModal/AnyTxModalCtrl.js b/src/modules/utils/modals/anyTxModal/AnyTxModalCtrl.js deleted file mode 100644 index 6f29e2c221..0000000000 --- a/src/modules/utils/modals/anyTxModal/AnyTxModalCtrl.js +++ /dev/null @@ -1,51 +0,0 @@ -(function () { - 'use strict'; - - const controller = function (Base, $scope) { - - const analytics = require('@waves/event-sender'); - - class AnyTxModalCtrl extends Base { - - /** - * @param {object} - * @type {null} - */ - state = null; - /** - * @type {null} - */ - signable = null; - /** - * @type {number} - */ - step = 0; - - - constructor({ tx, analyticsText }) { - super($scope); - this.analyticsText = analyticsText; - this.state = { tx }; - } - - onFillTxForm(signable) { - if (this.analyticsText) { - analytics.send({ name: this.analyticsText, target: 'ui' }); - } - this.signable = signable; - this.step++; - } - - onConfirmBack() { - this.step--; - } - - } - - return new AnyTxModalCtrl(this.locals); - }; - - controller.$inject = ['Base', '$scope']; - - angular.module('app.utils').controller('AnyTxModalCtrl', controller); -})(); diff --git a/src/modules/utils/modals/anyTxModal/any-tx-modal.html b/src/modules/utils/modals/anyTxModal/any-tx-modal.html deleted file mode 100644 index a4a356349c..0000000000 --- a/src/modules/utils/modals/anyTxModal/any-tx-modal.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - -
    - - Icon/80/error-80-error500 - - - - - -
    -

    -
    - -
    -     diff --git a/src/modules/utils/modals/assetInfo/AssetInfoCtrl.js b/src/modules/utils/modals/assetInfo/AssetInfoCtrl.js deleted file mode 100644 index 4c548dfac7..0000000000 --- a/src/modules/utils/modals/assetInfo/AssetInfoCtrl.js +++ /dev/null @@ -1,181 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param {$rootScope.Scope} $scope - * @param {User} user - * @param {IPollCreate} createPoll - * @param {app.utils} utils - * @param {Waves} waves - * @return {AssetInfoCtrl} - */ - const controller = function (Base, $scope, user, createPoll, utils, waves) { - - const ds = require('data-service'); - const { BigNumber } = require('@waves/bignumber'); - - class AssetInfoCtrl extends Base { - - /** - * @param {Asset} asset - */ - constructor(asset) { - super($scope); - this.asset = asset; - this.wavesId = WavesApp.defaultAssets.WAVES; - this.isDemo = !user.address; - this.quantity = this.asset.quantity.div(new BigNumber(10).pow(this.asset.precision)).toFormat(); - this.minFee = ds.utils.getTransferFeeList().find(money => money.asset.id === this.asset.id); - const assetList = user.getSetting('pinnedAssetIdList'); - this.assetList = assetList; - this.pinned = assetList.indexOf(asset.id) !== -1; - this.circleChartData = null; - this.totalBalance = null; - this.transactions = []; - this.transactionsPending = true; - - const { - link, email, provider, description - } = utils.getDataFromOracles(this.asset.id); - - // this.ticker = path(['ticker'], data); // TODO STEP 2= - this.link = link; - - this.email = email; - - this.provider = provider; - this.description = description || asset.description; - - this.withScam = null; - this.spam = []; - - /** - * @type {string} - */ - this.tab = 'info'; - - this.chartOptions = { - items: { - available: { - color: '#66bf00', - radius: 66 - }, - leased: { - color: '#ffebc0', - radius: 50 - }, - inOrders: { - color: '#bacaf5', - radius: 58 - } - }, - center: 27, - direction: true, - startFrom: Math.PI / 2 - }; - - if (!this.isDemo) { - const isBalance = true; - createPoll(this, this._getCircleGraphData, this._setCircleGraphData, 15000); - createPoll(this, AssetInfoCtrl._getTxList, this._setTxList, 4000, { isBalance, $scope }); - } - - this._updateAsset().then(asset => { - this.quantity = asset.quantity.div(new BigNumber(10).pow(asset.precision)).toFormat(); - $scope.$apply(); - }); - } - - togglePin() { - this.assetList = this.assetList.filter(tsUtils.notContains(this.asset.id)); - if (!this.pinned) { - this.assetList = this.assetList.concat(this.asset.id); - } - this.pinned = !this.pinned; - user.setSetting('pinnedAssetIdList', this.assetList); - } - - _setTxList(transactions) { - this.transactionsPending = false; - - this.transactions = transactions.filter((tx) => { - const TYPES = waves.node.transactions.TYPES; - - switch (tx.typeName) { - case TYPES.SEND: - case TYPES.RECEIVE: - case TYPES.MASS_RECEIVE: - case TYPES.MASS_SEND: - case TYPES.CIRCULAR: - return tx.amount.asset.id === this.asset.id; - case TYPES.EXCHANGE_BUY: - case TYPES.EXCHANGE_SELL: - return ( - tx.amount.asset.id === this.asset.id || - tx.price.asset.id === this.asset.id - ); - case TYPES.LEASE_IN: - case TYPES.LEASE_OUT: - case TYPES.CANCEL_LEASING: - return this.asset.id === WavesApp.defaultAssets.WAVES; - case TYPES.ISSUE: - case TYPES.REISSUE: - case TYPES.BURN: - return (tx.assetId || tx.amount && tx.amount.asset.id) === this.asset.id; - case TYPES.SPONSORSHIP_START: - case TYPES.SPONSORSHIP_STOP: - return tx.assetId === this.asset.id; - case TYPES.SPONSORSHIP_FEE: - return this.asset.id === tx.feeAssetId; - default: - return false; - } - }); - } - - /** - * @return {*} - * @private - */ - _getCircleGraphData() { - return waves.node.assets.balance(this.asset.id); - } - - /** - * @return {*} - * @private - */ - _updateAsset() { - return waves.node.assets.info(this.asset.id); - } - - /** - * @param available - * @param leasedOut - * @param inOrders - * @private - */ - _setCircleGraphData({ available, leasedOut, inOrders }) { - this.circleChartData = [ - { id: 'available', value: available }, - { id: 'leased', value: leasedOut }, - { id: 'inOrders', value: inOrders } - ]; - this.totalBalance = available.add(leasedOut).add(inOrders); - $scope.$digest(); - } - - static _getTxList() { - return waves.node.transactions.list(100); - } - - } - - return new AssetInfoCtrl(this.locals); - }; - - controller.$inject = ['Base', '$scope', 'user', 'createPoll', 'utils', 'waves']; - - angular.module('app.ui').controller('AssetInfoCtrl', controller); -})(); diff --git a/src/modules/utils/modals/assetInfo/assetInfo.html b/src/modules/utils/modals/assetInfo/assetInfo.html deleted file mode 100644 index c11e1eb52b..0000000000 --- a/src/modules/utils/modals/assetInfo/assetInfo.html +++ /dev/null @@ -1,110 +0,0 @@ -
    - - - - - -
    -
    -
    {{::$ctrl.asset.sender}}
    -
    -
    -
    -
    {{::$ctrl.asset.id}}
    -
    -
    -
    -
    {{::$ctrl.asset.name}}
    -
    -
    -
    -
    {{::$ctrl.asset.ticker}}
    -
    -
    -
    -
    {{$ctrl.quantity}}
    -
    -
    -
    -
    {{::$ctrl.asset.precision}}
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    {{::$ctrl.asset.timestamp | date:'dd.MM.yyyy HH:mm'}}
    -
    -
    -
    - {{::$ctrl.link}} -
    -
    -
    - {{::$ctrl.email}} -
    -
    - - {{::$ctrl.provider}} -
    -
    - {{::$ctrl.description}} -
    - -     - -
    -
    - -
    -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -     - - - -     -
    diff --git a/src/modules/utils/modals/assetInfo/assetInfo.less b/src/modules/utils/modals/assetInfo/assetInfo.less deleted file mode 100644 index 30756c1129..0000000000 --- a/src/modules/utils/modals/assetInfo/assetInfo.less +++ /dev/null @@ -1,359 +0,0 @@ -@import (reference) 'config'; -@import (reference) '../../../app/less/typography'; - -// do not forget add all the same changes to 'sponsored.less' - -.asset-modal { - height: 100%; - - &__head { - padding-top: @padding-main-layout * 4; - height: 170px; - position: relative; - } - - &__head-content { - display: flex; - } - - &__logo { - position: relative; - margin: 0 20px 0 0; - left: 0; - z-index: 1; - } - - &__name { - display: flex; - align-items: center; - margin: 0; - font-weight: normal; - } - - &__data { - display: flex; - flex-direction: column; - min-height: 65px; - justify-content: center; - flex: 1 0; - } - - &__help { - .help-icon__content { - width: calc(100% ~'- 105px'); - } - } - - .chart-wrapper { - position: absolute; - opacity: 0.2; - height: 76px; - width: calc(100% ~'+ 80px'); - left: -40px; - bottom: 0; - border-bottom: 1px solid @color-submit-300; - - .interactive-stop { - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - } - - .chart-tooltip, - .chart-legend { // Lib ng3-charts - display: none !important; - } - } - - .rating-wrapper { - display: flex; - justify-content: flex-start; - align-items: center; - margin-top: 7px; - position: relative; - z-index: 10; - } - - .rating-number { - margin-left: 10px; - } -} - -.m-dialog_asset-info { - md-dialog-content { - overflow-y: hidden; - padding: 0; - - &::after { - display: none; - } - } - - .asset-description { - word-wrap: break-word; - word-break: break-word; - } - - .tab-tem { - .footnote-1(); - overflow-y: auto; - max-height: calc(~'90vh - 280px'); - } - - @media screen and (max-width: 768px) { - .asset { - &-modal__name { - flex-direction: column; - align-items: flex-start; - font-size: 20px; - } - &__ticker { - margin-top: 5px; - } - } - .status-label-min { - margin: 5px 0 0; - } - } - - .padding-content .tab-tem { - padding: 40px; - - .line { - display: flex; - flex-direction: row; - justify-content: space-between; - border-bottom: 1px solid @color-basic-100; - padding: 5px 0; - align-items: center; - - &-description { - width: 100%; - padding: 13px 16px; - border: 1px dashed @color-basic-100; - border-radius: @border-radius; - background: @color-basic-50; - } - - &:first-child { - margin-top: -10px; - } - - &.chart-container { - .legend-item { - white-space: nowrap; - } - - .circle-chart-legend { - .legend-item { - height: 38px; - } - } - - & > div:first-child { - width: 140px; - flex-grow: 0; - } - - & > div:last-child { - width: calc(100% ~'- 140px'); - flex-grow: 1; - margin-left: 30px; - } - } - - &-description { - padding-top: 20px; - - div:last-child { - padding-top: 6px; - min-height: 30px; - } - } - - &:last-child { - border-bottom: 0 none; - } - - & > div:first-child { - align-items: center; - display: flex; - } - - & > div:last-child { - align-items: center; - display: flex; - flex-direction: column; - text-align: right; - margin-left: 20px; - - .legend-item, .total { - display: flex; - width: 100%; - border-bottom: 1px solid @color-basic-100; - align-items: center; - - & > div { - flex-basis: 50%; - - &:first-child { - text-align: left; - } - &:last-child { - text-align: right; - } - - .legend-color { - width: 12px; - height: 12px; - border-radius: 50%; - display: inline-block; - margin: -3px 7px 0 0; - vertical-align: middle; - } - } - } - - .total { - border-bottom: 0 none; - font-family: @font-roboto-medium; - - div:first-child { - color: @color-basic-500; - } - } - - } - } - - } - - .padding-content.tab-details .tab-tem { - .footnote-1(); - .line { - min-height: 38px; - } - .line > div:last-child { - display: block; - } - } - - .tabs__wrap { - w-transaction-list ul { - border-top: none; - - .transaction-item { - .date { - padding-left: 40px; - letter-spacing: 2px; - } - - .row { - padding-left: 20px; - - .line:last-child { - padding-right: 40px; - } - } - } - } - - .locale-address { - display: none; - } - - .actions { - display: none; - } - } - - .no-transactions { - .empty-block, - .error-block { - margin: 20px auto; - } - } -} - -@media screen and (max-width: 768px) { - - .m-dialog_asset-info { - .tabs__wrap w-transaction-list { - .w-visible { - height: 91px; - } - ul { - .transaction-item { - .date { - padding-left: 20px; - } - - .row { - padding-left: 0; - - .line:last-child { - padding-right: 0; - } - } - } - } - } - } -} - -@media screen and (max-width: 540px) { - .m-dialog.m-dialog_asset-info { - padding-bottom: 0; - - md-dialog-content { - overflow-y: auto; - padding: 0; - } - - .padding-content .tab-tem { - padding: 40px 20px; - } - - .tab-tem { - overflow-y: visible; - max-height: 100%; - padding: 0; - - .line { - w-circle-chart { - margin: 0 auto; - } - } - - .footnote-1.fs-mobile { - font-size: @mobile-low-fsize; - } - } - - .tabs__wrap { - w-transaction-list ul .transaction-item .date { - padding-left: 23px; - } - } - } -} - -@media screen and (max-width: 420px) { - .m-dialog_asset-info { - .padding-content .tab-tem { - .line.chart-container { - flex-direction: column; - - & > div:first-child { - width: 100%; - } - & > div:last-child { - margin: 0; - width: 100%; - } - } - } - } -} diff --git a/src/modules/utils/modals/changeToken/TokenChangeModalCtrl.js b/src/modules/utils/modals/changeToken/TokenChangeModalCtrl.js deleted file mode 100644 index 67b0432751..0000000000 --- a/src/modules/utils/modals/changeToken/TokenChangeModalCtrl.js +++ /dev/null @@ -1,224 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param {$rootScope.Scope} $scope - * @param createPoll - * @param {app.utils} utils - * @param {Waves} waves - * @param {User} user - * @param {BalanceWatcher} balanceWatcher - * @return {TokenChangeModalCtrl} - */ - const controller = function (Base, $scope, createPoll, utils, waves, user, balanceWatcher) { - - const entities = require('@waves/data-entities'); - const { SIGN_TYPE } = require('@waves/signature-adapter'); - - const analytics = require('@waves/event-sender'); - const ds = require('data-service'); - - class TokenChangeModalCtrl extends Base { - - /** - * @type {args} - */ - signPending = false; - /** - * @type {Array} - * @private - */ - _listeners = []; - - constructor({ money, txType }) { - super($scope); - /** - * @type {number} - */ - this.step = 0; - /** - * @type {boolean} - */ - this.noFee = false; - /** - * @type {'burn'|'reissue'} - */ - this.txType = txType; - /** - * @type {ExtendedAsset} - */ - this.asset = money.asset; - /** - * @type {boolean} - */ - this.issue = money.asset.reissuable; - /** - * @type {BigNumber} - */ - this.maxCoinsCount = WavesApp.maxCoinsCount.sub(money.asset.quantity); - /** - * @type {Money} - */ - this.balance = money; - /** - * @type {Money} - */ - this.precision = money.asset.precision; - /** - * @type {Precision} - */ - this.input = null; - /** - * @type {Money} - */ - this.quantity = new entities.Money(this.asset.quantity, this.asset); - /** - * @type {Money} - * @private - */ - this._waves = null; - - const { - description - } = utils.getDataFromOracles(money.asset); - - this.description = description || money.asset.description; - - const { TokenChangeModalCtrl = {} } = user.getThemeSettings(); - - this.options = { - grid: { - x: false, - y: false - }, - margin: { - top: 0, - right: 0, - left: 0, - bottom: 0 - }, - series: [ - { - dataset: 'values', - key: 'rate', - label: 'Rate', - color: TokenChangeModalCtrl.seriesColor || '#5a81ea', - type: ['line', 'area'] - } - ], - axes: { - x: { - key: 'timestamp', - type: 'date', - ticks: 4 - } - } - }; - - const type = this.txType === 'burn' ? SIGN_TYPE.BURN : SIGN_TYPE.REISSUE; - waves.node.getFee({ type, assetId: money.asset.id }).then((fee) => { - this.fee = fee; - $scope.$digest(); - }); - - createPoll(this, this._getGraphData, 'chartData', 15000); - ds.api.assets.get(WavesApp.defaultAssets.WAVES).then(asset => { - this.receive(balanceWatcher.change, () => this._updateWavesBalance(asset)); - this._updateWavesBalance(asset); - }); - - this.observe(['input', 'issue'], this._createTx); - this.observe(['_waves', 'fee'], this._changeHasFee); - - const signPendingListener = $scope.$on('signPendingChange', (event, data) => { - this.signPending = data; - }); - - this._listeners.push(signPendingListener); - } - - $onDestroy() { - super.$onDestroy(); - this._listeners.forEach(listener => listener()); - } - - getSignable() { - const name = this.txType.slice(0, 1).toUpperCase() + this.txType.slice(1); - analytics.send({ name: `${name} Token Continue Click`, target: 'ui' }); - return this.signable; - } - - next() { - this.step++; - } - - /** - * @param {Asset} asset - * @private - */ - _updateWavesBalance(asset) { - this._waves = balanceWatcher.getBalanceByAsset(asset); - utils.safeApply($scope); - } - - /** - * @private - */ - _changeHasFee() { - if (!this._waves || !this.fee) { - return null; - } - - this.noFee = this._waves.lt(this.fee); - } - - /** - * @private - */ - _createTx() { - const input = this.input; - const type = this.txType === 'burn' ? SIGN_TYPE.BURN : SIGN_TYPE.REISSUE; - const quantityField = this.txType === 'burn' ? 'amount' : 'quantity'; - - - if (input) { - const tx = waves.node.transactions.createTransaction({ - type, - assetId: input.asset.id, - description: input.asset.description, - fee: this.fee, - [quantityField]: input, - precision: input.asset.precision, - reissuable: this.issue - }); - this.signable = ds.signature.getSignatureApi().makeSignable({ - type, - data: tx - }); - } else { - this.tx = null; - this.signable = null; - } - } - - /** - * @return {Promise<{values: {rate: number, timestamp: Date}[]}>} - * @private - */ - _getGraphData() { - const startDate = utils.moment().add().day(-100); - return waves.utils.getRateHistory(this.asset.id, user.getSetting('baseAssetId'), startDate) - .then((values) => ({ values })); - } - - } - - const { money, txType } = this; - return new TokenChangeModalCtrl({ money, txType }); - }; - - controller.$inject = ['Base', '$scope', 'createPoll', 'utils', 'waves', 'user', 'balanceWatcher']; - - angular.module('app.utils').controller('TokenChangeModalCtrl', controller); -})(); diff --git a/src/modules/utils/modals/changeToken/change-token-modal.html b/src/modules/utils/modals/changeToken/change-token-modal.html deleted file mode 100644 index a0ee13982b..0000000000 --- a/src/modules/utils/modals/changeToken/change-token-modal.html +++ /dev/null @@ -1,119 +0,0 @@ - - -
    - -
    - -
    - -
    -
    -
    -
    {{::$ctrl.asset.id}}
    -
    - -
    -
    -
    {{::$ctrl.description}}
    -
    - -
    -
    -
    {{::$ctrl.quantity.toFormat($ctrl.asset.precision)}}
    -
    - -
    -
    -
    - -
    -
    -
    - -
    -
    -
    - -
    - - -
    - - -
    - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - -     - -
    -
    -
    -
    -
    - -
    -
    - - - -
    -     - - - - -     diff --git a/src/modules/utils/modals/changeToken/change-token-modal.less b/src/modules/utils/modals/changeToken/change-token-modal.less deleted file mode 100644 index d89e748185..0000000000 --- a/src/modules/utils/modals/changeToken/change-token-modal.less +++ /dev/null @@ -1,85 +0,0 @@ -@import (reference) 'config'; - -md-dialog.change-token { - - md-dialog-content { - padding: 0 40px; - } - - //TODO refactor input-like - .input-like { - padding: 0; - display: flex; - align-items: center; - height: 44px; - - w-input { - display: block; - width: 50%; - - input { - height: 40px; - border: none; - border-radius: @border-radius; - } - } - - .select-wrapper { - position: relative; - height: 100%; - width: 50%; - background-color: @color-disabled-50; - border-top-right-radius: @border-radius; - border-bottom-right-radius: @border-radius; - - .select { - width: calc(100% ~"- 12px"); - top: 6px; - } - } - } - - .rows { - .flex-row { - display: flex; - justify-content: space-between; - width: 100%; - } - - .row-style { - - &.description { - padding: 13px 16px; - border: 1px dashed @color-basic-100; - border-radius: @border-radius; - background: @color-basic-50; - white-space: normal; - word-break: normal; - max-height: 200px; - overflow: auto; - align-items: flex-start; - margin-top: 4px; - } - - padding: 12px 0; - border-bottom: 1px dashed @color-basic-100; - align-items: center; - - &:first-child { - border-top: 1px solid @color-basic-100; - } - - &:last-child { - border-bottom: 1px solid @color-basic-100; - } - } - } -} - -@media screen and (max-width: 540px) { - md-dialog.change-token { - md-dialog-content { - padding: 0 20px; - } - } -} diff --git a/src/modules/utils/modals/confirmLogout/confirmLogout.modal.html b/src/modules/utils/modals/confirmLogout/confirmLogout.modal.html deleted file mode 100644 index dcf14958c2..0000000000 --- a/src/modules/utils/modals/confirmLogout/confirmLogout.modal.html +++ /dev/null @@ -1,18 +0,0 @@ -
    -
    - -

    - -
    - -
    - - - - - - -
    -
    diff --git a/src/modules/utils/modals/confirmLogout/confirmLogout.modal.less b/src/modules/utils/modals/confirmLogout/confirmLogout.modal.less deleted file mode 100644 index 73bae38c07..0000000000 --- a/src/modules/utils/modals/confirmLogout/confirmLogout.modal.less +++ /dev/null @@ -1,21 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; -@import (reference) "../../../app/less/app-icons"; -@import (reference) '../../../app/less/typography'; - -.confirm-logout { - text-align: center; - .icon-logout-warning { - .icon-script-warning; - } - - h3 { - font-family: @font-roboto-regular; - } -} - -@media screen and (max-width: 540px) { - .icon-logout-warning { - margin-top: 30px; - } -} diff --git a/src/modules/utils/modals/confirmOrder/ConfirmOrderCtrl.js b/src/modules/utils/modals/confirmOrder/ConfirmOrderCtrl.js deleted file mode 100644 index 631706776a..0000000000 --- a/src/modules/utils/modals/confirmOrder/ConfirmOrderCtrl.js +++ /dev/null @@ -1,38 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param $scope - * @param {$mdDialog} $mdDialog - * @return {ConfirmOrderCtrl} - */ - const controller = function (Base, $scope, $mdDialog) { - - class ConfirmOrderCtrl extends Base { - - constructor({ locals }) { - super($scope); - this.type = locals.orderType; - this.orderLimit = locals.orderLimit; - this.isSell = this.type === 'sell'; - } - - agree() { - $mdDialog.hide(); - } - - close() { - $mdDialog.cancel(); - } - - } - - return new ConfirmOrderCtrl(this); - }; - - controller.$inject = ['Base', '$scope', '$mdDialog']; - - angular.module('app.ui') - .controller('ConfirmOrderCtrl', controller); -})(); diff --git a/src/modules/utils/modals/confirmOrder/confirmOrder.html b/src/modules/utils/modals/confirmOrder/confirmOrder.html deleted file mode 100644 index c1c82b4e9e..0000000000 --- a/src/modules/utils/modals/confirmOrder/confirmOrder.html +++ /dev/null @@ -1,29 +0,0 @@ -
    -
    -
    - - -

    -

    - -
    - -
    - - - - - - -
    -
    - -
    diff --git a/src/modules/utils/modals/confirmOrder/confirmOrder.less b/src/modules/utils/modals/confirmOrder/confirmOrder.less deleted file mode 100644 index 87a8c987b5..0000000000 --- a/src/modules/utils/modals/confirmOrder/confirmOrder.less +++ /dev/null @@ -1,10 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; - -.confirm-order { - .icon-close { - right: 30px; - top: 30px; - position: absolute; - } -} diff --git a/src/modules/utils/modals/confirmTx/ConfirmTxCtrl.js b/src/modules/utils/modals/confirmTx/ConfirmTxCtrl.js deleted file mode 100644 index b31bb12ead..0000000000 --- a/src/modules/utils/modals/confirmTx/ConfirmTxCtrl.js +++ /dev/null @@ -1,54 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param $scope - * @param {$mdDialog} $mdDialog - * @returns {ConfirmTxCtrl} - */ - const controller = function (Base, $scope, $mdDialog) { - const analytics = require('@waves/event-sender'); - - class ConfirmTxCtrl extends Base { - - /** - * @type {boolean} - * @private - */ - _resolveOnClose = false; - - - constructor({ signable, analyticsText }) { - super($scope); - this.signable = signable; - if (analyticsText) { - analytics.send({ name: analyticsText, target: 'ui' }); - } - } - - back() { - $mdDialog.cancel(); - } - - close() { - if (this._resolveOnClose) { - $mdDialog.hide(); - } else { - $mdDialog.cancel(); - } - } - - onSendTransaction() { - this._resolveOnClose = true; - } - - } - - return new ConfirmTxCtrl(this.locals); - }; - - controller.$inject = ['Base', '$scope', '$mdDialog']; - - angular.module('app.utils').controller('ConfirmTxCtrl', controller); -})(); diff --git a/src/modules/utils/modals/confirmTx/confirmTx.modal.html b/src/modules/utils/modals/confirmTx/confirmTx.modal.html deleted file mode 100644 index ec91d9f8fe..0000000000 --- a/src/modules/utils/modals/confirmTx/confirmTx.modal.html +++ /dev/null @@ -1,7 +0,0 @@ -
    -
    - -
    diff --git a/src/modules/utils/modals/dexScriptedPair/DexScriptedPairCtrl.js b/src/modules/utils/modals/dexScriptedPair/DexScriptedPairCtrl.js deleted file mode 100644 index 0660274dac..0000000000 --- a/src/modules/utils/modals/dexScriptedPair/DexScriptedPairCtrl.js +++ /dev/null @@ -1,33 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param user - * @param {$mdDialog} $mdDialog - * @return {DexScriptedPair} - */ - const controller = function (Base, user, $mdDialog) { - - class DexScriptedPair extends Base { - - constructor({ assets }) { - super(); - this.assets = assets; - this.tradeWithScriptAssets = false; - } - - confirm() { - user.setSetting('tradeWithScriptAssets', this.tradeWithScriptAssets); - $mdDialog.hide(); - } - - } - - return new DexScriptedPair(this.locals); - }; - - controller.$inject = ['Base', 'user', '$mdDialog']; - - angular.module('app.utils').controller('DexScriptedPairCtrl', controller); -})(); diff --git a/src/modules/utils/modals/dexScriptedPair/dexScriptedPair.html b/src/modules/utils/modals/dexScriptedPair/dexScriptedPair.html deleted file mode 100644 index 7a82015f7d..0000000000 --- a/src/modules/utils/modals/dexScriptedPair/dexScriptedPair.html +++ /dev/null @@ -1,31 +0,0 @@ - -
    - -
    - -
    - -
    -

    -
    - -
    - - Cancel - - - Continue - -
    - -
    - - -
    - -
    -     -     diff --git a/src/modules/utils/modals/dexScriptedPair/dexScriptedPair.less b/src/modules/utils/modals/dexScriptedPair/dexScriptedPair.less deleted file mode 100644 index 37d3ec1fc5..0000000000 --- a/src/modules/utils/modals/dexScriptedPair/dexScriptedPair.less +++ /dev/null @@ -1,22 +0,0 @@ -.dex-scripted-pair { - - .pair-wrapper { - width: 100%; - align-items: center; - display: flex; - justify-content: center; - } - - .asset-logo { - display: inline-block; - & + .asset-logo { - margin-left: 24px; - } - } - - &__text { - div { - margin-top: 10px; - } - } -} diff --git a/src/modules/utils/modals/gateway/GatewaySignCtrl.js b/src/modules/utils/modals/gateway/GatewaySignCtrl.js deleted file mode 100644 index 1be655f936..0000000000 --- a/src/modules/utils/modals/gateway/GatewaySignCtrl.js +++ /dev/null @@ -1,259 +0,0 @@ -(function () { - 'use strict'; - - const LOCALIZATION = { - title: { - normal: 'modal.gatewaySign.title', - error: 'modal.gatewaySign.error.title' - } - }; - - /** - * @param {Base} Base - * @param {$rootScope.Scope} $scope - * @param {User} user - * @param {app.utils} utils - * @param {$mdDialog} $mdDialog - * @return {GatewaySignCtrl} - */ - const controller = function (Base, $scope, user, utils, $mdDialog) { - - const isEmpty = (value) => !value; - const tsApiValidator = require('ts-api-validator'); - const { SIGN_TYPE } = require('@waves/signature-adapter'); - const ds = require('data-service'); - const schema = new tsApiValidator.Schema({ - type: tsApiValidator.ObjectPart, - required: true, - content: { - referrer: { type: tsApiValidator.StringPart, isEmpty, path: 'r', required: true }, - name: { type: tsApiValidator.StringPart, isEmpty, path: 'n', required: true }, - data: { type: tsApiValidator.StringPart, isEmpty, path: 'd', required: true }, - iconPath: { type: tsApiValidator.StringPart, path: 'i', required: false }, - successPath: { type: tsApiValidator.StringPart, path: 's', required: false }, - debug: { type: tsApiValidator.BooleanPart, required: false, defaultValue: false } - } - }); - - class GatewaySignCtrl extends Base { - - /** - * @type {boolean} - */ - isSeed = false; - /** - * @type {boolean} - */ - signAdapterError = false; - /** - * @type {boolean} - */ - signPending = false; - /** - * @type {boolean} - */ - isDesktop = WavesApp.isDesktop(); - /** - * @type {boolean} - */ - hasError = false; - /** - * @type {string} - */ - imageSrc = ''; - /** - * @type {string} - */ - referrer = ''; - /** - * @type {string} - */ - name = ''; - /** - * @type {string} - * @private - */ - successUrl = ''; - /** - * @readonly - * @type {boolean} - */ - debug = false; - /** - * @type {Object} - */ - search = null; - /** - * @type {string} - */ - userType = null; - /** - * @type {string} - */ - titleLiteral = LOCALIZATION.title.normal; - - /** - * @param {object} search - * @param {string} search.n Gateaway application name - * @param {string} search.r Gateaway referrer - * @param {string} search.i Gateaway icon path - * @param {string} search.d Gateaway data for signable - * @param {string} search.s Gateaway path for success auth - * @param {string} search.debug Gateaway show errors - */ - constructor(search) { - super($scope); - this.search = search; - this.userType = user.userType; - this.debug = !!search.debug; - this.isSeed = user.userType === 'seed'; - this.observe('hasError', (value) => { - if (value) { - this.titleLiteral = LOCALIZATION.title.error; - } else { - this.titleLiteral = LOCALIZATION.title.normal; - } - }); - - schema.parse(search) - .then((params) => { - this.urlParams = params; - const { referrer, name, iconPath } = params; - this.referrer = referrer; - this.name = name; - - this._setImageUrl(referrer, iconPath); - - return this.createUrl(); - }).catch((e) => { - this._sendError(e.message || e); - this.signPending = false; - }).finally(() => $scope.$apply()); - } - - sign() { - this.createUrl() - .catch((e) => { - this._sendError(e.message || e); - this.signPending = false; - }).finally(() => $scope.$apply()); - } - - signAuth(adapter, data) { - this.signPending = true; - const signable = adapter.makeSignable(data); - signable.getId().then(id => { - this.id = id; - $scope.$apply(); - }); - return signable.getSignature(); - } - - createUrl() { - const { referrer, data, successPath } = this.urlParams; - const prefix = 'WavesWalletAuthentication'; - const host = GatewaySignCtrl._getDomain(referrer); - const signData = { - type: SIGN_TYPE.AUTH, - data: { prefix, host, data } - }; - const adapter = ds.signature.getSignatureApi(); - const sign = this.signAuth(adapter, signData); - - return Promise.all([sign, adapter.getPublicKey()]).then(([signature, publicKey]) => { - const search = `?s=${signature}&p=${publicKey}&a=${user.address}`; - const path = successPath || ''; - const url = `${referrer}/${path}${search}`; - this.signPending = false; - this.signAdapterError = false; - this.successUrl = GatewaySignCtrl._normalizeUrl(url); - - if (!this.isSeed) { - this.send(); - $mdDialog.cancel(); - } - - }).catch(e => { - this.signPending = false; - - if (this.isSeed) { - return Promise.reject(e); - } - - this.signAdapterError = true; - }); - } - - send() { - utils.redirect(this.successUrl); - } - - /** - * @param {string} referrer - * @param {string} iconPath - * @return {null} - * @private - */ - _setImageUrl(referrer, iconPath) { - if (!iconPath) { - return null; - } - - const getUrl = function () { - try { - return new URL(iconPath).href; - } catch (e) { - return GatewaySignCtrl._normalizeUrl(`${referrer}/${iconPath}`); - } - }; - - const url = getUrl(); - utils.loadImage(url).then(() => { - this.imageSrc = url; - $scope.$digest(); - }); - } - - /** - * @param {string} message - * @private - */ - _sendError(message) { - this.hasError = true; - this.errorMessage = message; - } - - /** - * @param {string} referer - * @return {string} - * @private - */ - static _getDomain(referer) { - const url = new URL(referer); - if (url.protocol !== 'https:') { - throw new Error('Protocol must be "https:"'); - } - return url.hostname; - } - - /** - * @param {string} urlString - * @return {string} - * @private - */ - static _normalizeUrl(urlString) { - const url = new URL(urlString); - const protocol = `${url.protocol}//`; - return protocol + (`${url.host}/${url.pathname}/${url.search}${url.hash}`.replace(/\/+/g, '/')) - .replace(/\/$/, ''); - } - - } - - return new GatewaySignCtrl(this.search); - }; - - controller.$inject = ['Base', '$scope', 'user', 'utils', '$mdDialog']; - - angular.module('app.utils').controller('GatewaySignCtrl', controller); -})(); diff --git a/src/modules/utils/modals/gateway/gatewaySign.html b/src/modules/utils/modals/gateway/gatewaySign.html deleted file mode 100644 index 4b14edfb45..0000000000 --- a/src/modules/utils/modals/gateway/gatewaySign.html +++ /dev/null @@ -1,77 +0,0 @@ -
    -
    - -
    -
    - -
    -
    - -

    - -

    - -
    - - -
    - -
    - - - - - - -
    -
    - -
    -
    -
    -
    {{$ctrl.id}}
    -
    -
    - -
    -
    - -
    -
    -

    -

    -
    - -
    - - - - - - - - - -
    -
    -
    -
    - -

    - -

    - -
    - 
    {{::$ctrl.errorMessage}}
    -
    - - - - -
    -
    diff --git a/src/modules/utils/modals/gateway/gatewaySign.less b/src/modules/utils/modals/gateway/gatewaySign.less deleted file mode 100644 index 2766f9cd48..0000000000 --- a/src/modules/utils/modals/gateway/gatewaySign.less +++ /dev/null @@ -1,75 +0,0 @@ -@import (reference) 'config'; -@import (reference) '../../../app/less/typography'; -@import (reference) 'icons'; - -.gateway { - - .gateway-icon { - margin: 30px auto 50px auto; - - img { - display: inline-block; - min-width: 140px; - min-height: 30px; - max-width: 200px; - max-height: 50px; - } - div { - margin: 0 auto; - } - } - - h3 { - max-width: 100%; - text-overflow: ellipsis; - overflow: hidden; - span.link { - font-size: inherit; - cursor: text; - word-wrap: break-word; - } - } - - .row { - width: 100%; - height: 40px; - display: flex; - align-items: center; - justify-content: space-between; - - &.bordered { - border-top: 1px solid @color-basic-200; - border-bottom: 1px solid @color-basic-200; - } - } - - .content { - i { - display: inline-block; - vertical-align: top; - min-width: 24px; - } - } - - .flex-caption { - display: flex; - align-items: flex-start; - - div { - flex-grow: 1; - } - } - - .buttons-wrapper { - display: flex; - justify-content: space-between; - - & > w-button { - flex-basis: 48%; - } - } - - .plate-note { - overflow: auto; - } -} diff --git a/src/modules/utils/modals/importAccounts/ImportAccountsCtrl.js b/src/modules/utils/modals/importAccounts/ImportAccountsCtrl.js deleted file mode 100644 index 6a88222f99..0000000000 --- a/src/modules/utils/modals/importAccounts/ImportAccountsCtrl.js +++ /dev/null @@ -1,102 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param {$rootScope.Scope} $scope - * @param {app.utils} utils - * @param {User} user - * @param {$mdDialog} $mdDialog - * @param {Storage} storage - * @param {*} $state - * @returns {ImportAccountsCtrl} - */ - const controller = function (Base, $scope, utils, user, storage, $state, $mdDialog) { - - const { find, propEq, uniqBy, filter, pipe, prop } = require('ramda'); - const { isValidAddress } = require('@waves/signature-adapter'); - - const OLD_ORIGIN = 'https://client.wavesplatform.com'; - - class ImportAccountsCtrl extends Base { - - get hasSelected() { - return Object.values(this.checkedHash).filter(Boolean).length > 0; - } - - constructor() { - super($scope); - - this.pending = true; - this.userList = []; - this.wasImportOld = false; - this.checkedHash = Object.create(null); - this._myUserList = []; - - user.getFilteredUserList() - .catch(() => []) - .then((userList) => { - this._myUserList = userList; - return this.importFromOld(); - }); - } - - /** - * @public - * @return {Promise} - */ - importAccounts() { - const users = Object.keys(this.checkedHash) - .filter(address => this.checkedHash[address]) - .map((address) => { - return find(propEq('address', address), this.userList); - }); - - return user.getFilteredUserList() - .then((list) => storage.save('userList', list.concat(users))) - .then(() => storage.save('accountImportComplete', true)) - .then(() => { - $mdDialog.hide(); - $state.go('welcome'); - }); - } - - importFromOld() { - this.wasImportOld = true; - return this._import(OLD_ORIGIN); - } - - _import(origin) { - return utils.importAccountByTab(origin, 5000) - .catch(() => []) - .then(list => { - this.pending = false; - const networkByte = WavesApp.network.code.charCodeAt(0); - const filteredList = list.filter(user => isValidAddress(user.address, networkByte)); - this._addAccountList(filteredList); - }); - } - - _addAccountList(list) { - const myUsersHash = utils.toHash(this._myUserList || [], 'address'); - this.userList = pipe( - uniqBy(prop('address')), - filter(user => !myUsersHash[user.address]) - )(list).reverse(); - - this.userList.forEach((user) => { - this.checkedHash[user.address] = true; - }); - - $scope.$apply(); - } - - } - - return new ImportAccountsCtrl(); - }; - - controller.$inject = ['Base', '$scope', 'utils', 'user', 'storage', '$state', '$mdDialog']; - - angular.module('app.utils').controller('ImportAccountsCtrl', controller); -})(); diff --git a/src/modules/utils/modals/importAccounts/importAccounts.html b/src/modules/utils/modals/importAccounts/importAccounts.html deleted file mode 100644 index bf9aa55e20..0000000000 --- a/src/modules/utils/modals/importAccounts/importAccounts.html +++ /dev/null @@ -1,53 +0,0 @@ - - -
    -
    - -
    - -

    - -
      -
    • - -
      - {{::user.name}} - {{::user.address}} - -
      -
      • -
    - -
    - - - - - - -
    -
    - -
    - -
    - - -

    - -
    - -
    - - - - - -
    - -
    -
    diff --git a/src/modules/utils/modals/importAccounts/importAccounts.less b/src/modules/utils/modals/importAccounts/importAccounts.less deleted file mode 100644 index 312ee31c80..0000000000 --- a/src/modules/utils/modals/importAccounts/importAccounts.less +++ /dev/null @@ -1,128 +0,0 @@ -@import (reference) "config"; -@import (reference) "icons"; - -.import-accounts { - min-height: 322px; - padding-top: 20px; - - .icon-close { - position: absolute; - right: -10px; - top: -50px; - } -} - -.import-modal { - position: relative; - - &__icon { - display: block; - background-position: center; - background-repeat: no-repeat; - background-size: 100% auto; - flex-shrink: 0; - width: 40px; - height: 40px; - margin: 0 20px 0 0; - - &-error { - width: 80px; - height: 80px; - display: block; - margin: 40px auto 30px auto; - } - } - - &__blocks-wrapper { - display: flex; - justify-content: center; - align-items: inherit; - flex-wrap: wrap; - justify-content: center; - - w-button { - width: 100%; - } - } - - &__select { - height: auto; - max-height: 242px; - border-radius: @border-radius; - list-style-type: none; - border: 1px solid @color-basic-100; - padding: 0; - margin: 40px 0; - overflow: auto; - - li { - height: 48px; - cursor: pointer; - display: flex; - padding: 8px 55px 8px 15px; - white-space: nowrap; - position: relative; - - .name { - font-size: 15px; - line-height: 1em; - margin: 0 0 4px 0; - } - - .has-name { - display: flex; - flex-direction: column; - } - - .address { - line-height: 1em; - } - - &:hover { - background: @color-basic-50; - } - } - } - - &__checkbox { - position: absolute; - right: 30px; - top: 50%; - transform: translate(0, -50%); - } - - &__block { - padding: 12px; - margin: 0 0 10px 0; - box-shadow: 0 1px 4px 0 rgba(58, 78, 136, 0.1); - border-radius: @border-radius; - background: @color-white; - cursor: pointer; - transition: .3s; - - &:hover { - transform: translate3d(0,-3px,0); - box-shadow: @shadow-main-hover; - } - - w-button { - & > * { - height: 36px; - border-radius: @border-radius / 2; - } - } - } - - w-help-icon { - text-align: left; - - .help-icon__content { - right: -15px; - left: auto; - } - } - - h3 { - margin-top: 40px; - } -} \ No newline at end of file diff --git a/src/modules/utils/modals/lockPairWarning/LockPairWarningCtrl.js b/src/modules/utils/modals/lockPairWarning/LockPairWarningCtrl.js deleted file mode 100644 index b0663c8980..0000000000 --- a/src/modules/utils/modals/lockPairWarning/LockPairWarningCtrl.js +++ /dev/null @@ -1,28 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param $scope - * @return {LockPairWarningCtrl} - */ - const controller = function (Base, $scope) { - - class LockPairWarningCtrl extends Base { - - constructor({ amountTicker, priceTicker }) { - super($scope); - this.amountTicker = amountTicker; - this.priceTicker = priceTicker; - } - - } - - return new LockPairWarningCtrl(this); - }; - - controller.$inject = ['Base', '$scope', '$mdDialog']; - - angular.module('app.ui') - .controller('LockPairWarningCtrl', controller); -})(); diff --git a/src/modules/utils/modals/lockPairWarning/lockPairWarning.modal.html b/src/modules/utils/modals/lockPairWarning/lockPairWarning.modal.html deleted file mode 100644 index e5523f9bbb..0000000000 --- a/src/modules/utils/modals/lockPairWarning/lockPairWarning.modal.html +++ /dev/null @@ -1,13 +0,0 @@ -
    -
    - -

    -
    - - - -
    diff --git a/src/modules/utils/modals/lockPairWarning/lockPairWarning.modal.less b/src/modules/utils/modals/lockPairWarning/lockPairWarning.modal.less deleted file mode 100644 index 73bae38c07..0000000000 --- a/src/modules/utils/modals/lockPairWarning/lockPairWarning.modal.less +++ /dev/null @@ -1,21 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; -@import (reference) "../../../app/less/app-icons"; -@import (reference) '../../../app/less/typography'; - -.confirm-logout { - text-align: center; - .icon-logout-warning { - .icon-script-warning; - } - - h3 { - font-family: @font-roboto-regular; - } -} - -@media screen and (max-width: 540px) { - .icon-logout-warning { - margin-top: 30px; - } -} diff --git a/src/modules/utils/modals/loginByDevice/LoginByDeviceCtrl.js b/src/modules/utils/modals/loginByDevice/LoginByDeviceCtrl.js deleted file mode 100644 index 53200fc94a..0000000000 --- a/src/modules/utils/modals/loginByDevice/LoginByDeviceCtrl.js +++ /dev/null @@ -1,74 +0,0 @@ -(function () { - 'use strict'; - - const $ = require('jquery'); - - /** - * @param Base - * @param {$rootScope.Scope} $scope - * @param {$mdDialog} $mdDialog - * @return {LoginByDeviceCtrl} - */ - const controller = function (Base, $scope, $mdDialog) { - - class LoginByDeviceCtrl extends Base { - - /** - * @type {JQuery.Deferred} - */ - deferred = $.Deferred(); - /** - * @type {boolean} - */ - loading = true; - /** - * @type {boolean} - */ - isLedger = false; - /** - * @type {boolean} - */ - isKeeper = false; - - /** - * @param {Promise} promise - * @param {string} adapterType - */ - constructor(callback) { - super($scope); - - const { promise, type } = callback(); - this.isLedger = type === 'ledger'; - this.isKeeper = type === 'wavesKeeper'; - - this.deferred.promise() - .then(() => this.onLoad()) - .catch(error => this.onError(error)); - - promise.then(this.deferred.resolve, this.deferred.reject); - } - - onClose() { - this.deferred.reject(); - } - - onLoad() { - $mdDialog.hide(); - $scope.$destroy(); - } - - onError(e) { - $mdDialog.cancel(e); - $scope.$destroy(); - } - - } - - return new LoginByDeviceCtrl(this.locals); - }; - - controller.$inject = ['Base', '$scope', '$mdDialog']; - - angular.module('app.utils') - .controller('LoginByDeviceCtrl', controller); -})(); diff --git a/src/modules/utils/modals/loginByDevice/loginByDevice.html b/src/modules/utils/modals/loginByDevice/loginByDevice.html deleted file mode 100644 index cf78faf07d..0000000000 --- a/src/modules/utils/modals/loginByDevice/loginByDevice.html +++ /dev/null @@ -1,34 +0,0 @@ -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    PIN code
    -
    Waves
    -
    -
    -

    -
    -
    -
    -
    -
    - -
    - -
    -
    -

    -
    - -
    - -
    diff --git a/src/modules/utils/modals/loginByDevice/loginByDevice.less b/src/modules/utils/modals/loginByDevice/loginByDevice.less deleted file mode 100644 index bdb4225e5d..0000000000 --- a/src/modules/utils/modals/loginByDevice/loginByDevice.less +++ /dev/null @@ -1,164 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; - -.ledger-modal { - - .keeper-img { - background: @keeper-icon; - width: 60px; - height: 60px; - margin: 60px auto 30px; - } - - .device-img { - width: 278px; - height: 146px; - background: @ledger-step1; - position: relative; - display: block; - margin: 60px auto 20px calc(50% ~'- 193px'); - } - - .connect-mode { - text-align: center; - - .texts-wrapper { - position: relative; - height: 20px; - margin-bottom: 30px; - } - - .animate-show { - animation-duration: 9s; - animation-name: showLedger; - animation-fill-mode: both; - animation-iteration-count: infinite; - } - - .display { - position: absolute; - width: 70px; - height: 26px; - margin: 0 auto; - text-align: center; - top: 99px; - left: 140px; - font-size: 7px; - font-family: @font-roboto-medium; - color: @color-submit-300; - } - - .text1 { - animation-delay: 0s; - } - - .display1 { - padding-top: 5px; - } - - .display2 { - animation-delay: 3s; - background: @ledger-pin no-repeat; - background-position-y: 15px; - background-position-x: center; - } - - .text2 { - animation-delay: 3s; - } - - .display3 { - animation-delay: 6s; - background: @ledger-apps no-repeat; - background-position-y: 6px; - background-position-x: center; - top: 97px; - left: 138px; - line-height: 43px; - } - - .text3 { - animation-delay: 6s; - } - - .dot { - animation-duration: 9s; - animation-name: showDot; - display: inline-block; - width: 3px; - height: 3px; - background-color: #5a81ea; - position: relative; - margin: 2px; - opacity: 0; - } - - .dot1 { - animation-delay: 0s; - } - .dot2 { - animation-delay: 0.5s; - } - .dot3 { - animation-delay: 1s; - } - .dot4 { - animation-delay: 1.5s; - } - .dot5 { - animation-delay: 2s; - } - - .info-text { - position: absolute; - width: 100%; - text-align: center; - margin: 0; - } - - .loader { - top: 5px; - position: relative; - } - } -} - -@keyframes showDot { - 0% { - opacity: 0; - } - - 3% { - opacity: 1; - } - - 50% { - opacity: 1; - } - - 51% { - opacity: 0; - } - - 100% { - opacity: 0; - } -} - -@keyframes showLedger { - 0% { - opacity: 0; - } - 10% { - opacity: 1; - } - 30% { - opacity: 1; - } - 35% { - opacity: 0; - } - 100% { - opacity: 0; - } -} diff --git a/src/modules/utils/modals/migrateModal/migrateModal.html b/src/modules/utils/modals/migrateModal/migrateModal.html deleted file mode 100644 index f10c93d6a1..0000000000 --- a/src/modules/utils/modals/migrateModal/migrateModal.html +++ /dev/null @@ -1,42 +0,0 @@ -
    -
    - - - -
    -

    -
    -

    -

    -

    -
    -
    -
    -
    -
    -
    - - - - - - -
    -     - - - - - - -
    -

    -
    Waves.Exchange
    -

    -
    -

    -
    -     - -     -
    \ No newline at end of file diff --git a/src/modules/utils/modals/migrateModal/migrateModal.js b/src/modules/utils/modals/migrateModal/migrateModal.js deleted file mode 100644 index e172413966..0000000000 --- a/src/modules/utils/modals/migrateModal/migrateModal.js +++ /dev/null @@ -1,128 +0,0 @@ -(() => { - 'use strict'; - - const ds = require('data-service'); - - /** - * @param {*} Base - * @param {ng.ILogService} $log - * @param {*} $mdDialog - * @param {*} storageExporter - * @param {*} exportStorageService - * @param {*} $state - * @param {*} $scope - * @param {*} storage - */ - const controller = function (Base, - $log, - $mdDialog, - storageExporter, - $state, - $scope, - storage, - exportStorageService) { - - const analytics = require('@waves/event-sender'); - - class MigrateModalCtrl extends Base { - - /** - * @type {number} - */ - step = 0; - - moving() { - analytics.send({ - name: 'Start migration', - target: 'all' - }); - - if (WavesApp.isDesktop()) { - $state.go('desktopUpdate'); - } else { - this._export(); - } - } - - _export() { - const connectProvider = this._getConnectProvider(); - - this.step = this.step + 1; - - exportStorageService.export({ - provider: connectProvider, - attempts: 20, - timeout: 2000 - }); - - exportStorageService.onData().then(result => { - if (result.payload === 'ok') { - this.step = this.step + 1; - $log.log('done'); - $scope.$apply(); - - analytics.send({ - name: 'End migration', - target: 'all' - }); - - return storage.save('migrationSuccess', true); - } else { - analytics.send({ - name: 'Bad migration', - target: 'all' - }); - - this.step = this.step - 1; - $log.log('fail', result); - $scope.$apply(); - - return storage.save('migrationSuccess', false); - } - }); - } - - cancel() { - analytics.send({ - name: 'Cancel migration', - target: 'all' - }); - $mdDialog.cancel(); - storage.save('notAutoOpenMigrationModal', true); - } - - /** - * @returns {ConnectProvider} - */ - _getConnectProvider() { - const origins = WavesApp.isProduction() ? - WavesApp.network.migration.origins : - '*'; - - const childWindow = window.open(WavesApp.network.migration.webUrl); - - return new ds.connect.PostMessageConnectProvider({ - win: childWindow, - mode: 'export', - origins - }); - } - - } - - return new MigrateModalCtrl(); - }; - - controller.$inject = [ - 'Base', - '$log', - '$mdDialog', - 'storageExporter', - '$state', - '$scope', - 'storage', - 'exportStorageService' - ]; - - angular.module('app.utils').controller('MigrateModalCtrl', controller); -})(); diff --git a/src/modules/utils/modals/pinAsset/PinAssetCtrl.js b/src/modules/utils/modals/pinAsset/PinAssetCtrl.js deleted file mode 100644 index 388d0b5aba..0000000000 --- a/src/modules/utils/modals/pinAsset/PinAssetCtrl.js +++ /dev/null @@ -1,214 +0,0 @@ -const ds = require('data-service'); -const R = require('ramda'); - -(function () { - 'use strict'; - - const HIDDEN_ASSETS = WavesApp.ALWAYS_PINNED_ASSETS; - - /** - * - * @param Base - * @param $scope - * @param {Waves} waves - * @param {IPollCreate} PromiseControl - * @param $mdDialog - * @param {User} user - * @return {PinAssetCtrl} - */ - const controller = function (Base, $scope, waves, PromiseControl, $mdDialog, user) { - - const analytics = require('@waves/event-sender'); - - class PinAssetCtrl extends Base { - - constructor() { - super($scope); - /** - * @type {string} - */ - this.search = ''; - /** - * @type {boolean} - */ - this.withScam = null; - /** - * @type {boolean} - */ - this.dontShowSpam = null; - /** - * @type {Array} - */ - this.pinnedAssetNewList = []; - /** - * @type {Array} - */ - this.pinnedAssetIdList = []; - /** - * @type {Array} - */ - this.spam = []; - /** - * @type {Object} - */ - this.selectedHash = {}; - - this.syncSettings({ - pinnedAssetIdList: 'pinnedAssetIdList', - spam: 'wallet.portfolio.spam', - withScam: 'withScam', - dontShowSpam: 'dontShowSpam' - }); - - this.observe('search', this._fillList); - this.loadPromise = this._getAvilableAssets(); - this._fillList(); - - $scope.$watch('$ctrl.pinnedAssetNewList', () => this.checkChecked(), true); - } - - /** - * return {void} - */ - checkChecked() { - this.selected = 0; - this.pinnedAssetNewList.forEach(asset => { - if (asset.pinned) { - this.selectedHash[asset.id] = true; - } else { - delete this.selectedHash[asset.id]; - } - }); - this.selected = Object.keys(this.selectedHash).length; - } - - /** - * return {void} - */ - onSubmit() { - const selectedAssets = Object.keys(this.selectedHash); - analytics.send({ - name: 'Wallet Assets Pin', - params: { Currency: selectedAssets }, - target: 'ui' - }); - this.pinnedAssetIdList = R.uniq([...this.pinnedAssetIdList, ...selectedAssets]); - this.spam = this.spam.filter((spamId) => !this.pinnedAssetIdList.includes(spamId)); - $mdDialog.hide({ selected: this.selected.length }); - } - - /** - * @param {Asset} asset - * @return {boolean} - * @private - */ - _isSpam(asset) { - return (this.spam || []).includes(asset.id); - } - - /** - * @return {Promise>} - * @private - */ - async _getAvilableAssets() { - const myAssets = await ds.dataManager.getBalances(); - const defaultAssets = await waves.node.assets.getAsset(Object.values(WavesApp.defaultAssets)); - return R.uniqBy(R.prop('id'), [...defaultAssets, ...myAssets.map(x => x.asset)]).map((asset) => { - const pinned = this.pinnedAssetIdList.includes(asset.id); - return { ...asset, pinned }; - }); - } - - /** - * @return {Promise} - * @private - */ - async _fillList() { - const assetsList = this._filterAndSort(await this.loadPromise); - const searchList = this._filterAndSort(await this._searchByApi()); - this.pinnedAssetNewList = R.uniqBy(R.prop('id'), [...assetsList, ...searchList]); - $scope.$digest(); - } - - /** - * @param {Array} assetsList - * @return {Array} - * @private - */ - _filterAndSort(assetsList) { - const filteredList = []; - - for (const asset of assetsList) { - if (this.pinnedAssetIdList.includes(asset.id)) { - continue; - } - - if (HIDDEN_ASSETS.includes(asset.id)) { - continue; - } - - if (!this.withScam && (PinAssetCtrl._isScam(asset) || this._isSpam(asset))) { - continue; - } - - if (this._isInSearch(asset)) { - filteredList.push(asset); - } - } - - return filteredList; - } - - /** - * @return {Promise>} - * @private - */ - _searchByApi() { - if (!this.search || !this.search.trim().length) { - return []; - } - - if (this._searchPromise) { - this._searchPromise.drop(); - } - - this._searchPromise = new PromiseControl(waves.node.assets.search(this.search.trim())); - - return this._searchPromise.then( - list => list, - () => [] - ); - } - - /** - * @param {Asset} asset - * @return {boolean} - * @private - */ - _isInSearch(asset) { - const search = this.search.toUpperCase().trim(); - - if (!search || !this.search.length) { - return true; - } - return `${asset.id} ${asset.name} ${asset.ticker}`.toUpperCase().includes(search); - } - - /** - * @param {Asset} asset - * @return {boolean} - * @private - * @static - */ - static _isScam(asset) { - return (user.scam || {})[asset.id]; - } - - } - - return new PinAssetCtrl(); - }; - - controller.$inject = ['Base', '$scope', 'waves', 'PromiseControl', '$mdDialog', 'user']; - angular.module('app.utils').controller('PinAssetCtrl', controller); -})(); diff --git a/src/modules/utils/modals/pinAsset/pinAsset.html b/src/modules/utils/modals/pinAsset/pinAsset.html deleted file mode 100644 index ba8283f466..0000000000 --- a/src/modules/utils/modals/pinAsset/pinAsset.html +++ /dev/null @@ -1,40 +0,0 @@ - - -
    -
    -
    -

    -
    - - - -
      -
    • - -
      • -
    -
    -
    -
    - - - - - - -
    -
    -     -     diff --git a/src/modules/utils/modals/pinAsset/pinAsset.less b/src/modules/utils/modals/pinAsset/pinAsset.less deleted file mode 100644 index 7f91bb69a9..0000000000 --- a/src/modules/utils/modals/pinAsset/pinAsset.less +++ /dev/null @@ -1,93 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; -@import (reference) '../../../app/less/typography'; - -.add-asset { - padding-top: 20px; - - &__header { - display: inline-block; - position: relative; - width: 100%; - - h3 { - margin: 30px; - } - } - - .search-wrapper { - border: 1px solid @color-basic-100; - border-radius: @border-radius @border-radius 0 0; - margin: -1px 0 0; - height: 48px; - width: 100%; - - .search-input { - .body-2(); - color: @color-basic-700; - } - } - - &__select { - max-height: 242px; - border-radius: 0 0 @border-radius @border-radius; - list-style-type: none; - border: 1px solid @color-basic-100; - padding: 0; - margin: -1px 0 0; - overflow: auto; - - li { - height: 48px; - cursor: pointer; - display: flex; - padding: 8px 15px 8px 82px; - white-space: nowrap; - position: relative; - - .asset-logo { - position: absolute; - left: 45px; - top: 50%; - transform: translateY(-50%); - } - - .name { - font-size: 15px; - line-height: 1em; - margin: 0 0 4px 0; - } - - .asset-id { - line-height: 1em; - color: @color-basic-500; - } - - &:hover { - background: @color-basic-50; - } - } - } - - &__checkbox { - position: absolute; - left: 14px; - top: 50%; - transform: translate(0, -50%); - } -} - -@media screen and (max-width: 540px) { - .add-asset { - min-height: 360px; - - &__wrapper { - height: calc(100% ~'- 106px'); - min-height: 440px; - } - - &__select { - max-height: calc(100% ~'- 200px'); - } - } -} diff --git a/src/modules/utils/modals/receive/Receive.html b/src/modules/utils/modals/receive/Receive.html deleted file mode 100644 index 3c2c53b77b..0000000000 --- a/src/modules/utils/modals/receive/Receive.html +++ /dev/null @@ -1,44 +0,0 @@ - - -
    -
    - - - - - - - - - - - - - - - - - - -
    -     -     diff --git a/src/modules/utils/modals/receive/Receive.js b/src/modules/utils/modals/receive/Receive.js deleted file mode 100644 index 4b72297f6b..0000000000 --- a/src/modules/utils/modals/receive/Receive.js +++ /dev/null @@ -1,167 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {typeof Base} Base - * @param {ng.IScope} $scope - * @param {GatewayService} gatewayService - * @param {User} user - * @param {Waves} waves - * @return {ReceiveCtrl} - */ - const controller = function (Base, $scope, gatewayService, user, waves) { - - class ReceiveCtrl extends Base { - - /** - * @type {string} - */ - activeTab = ''; - - /** - * @type { {[k: string]: boolean} } - */ - tabs = { - cryptocurrency: false, - invoice: false, - card: false, - bank: false - }; - - /** - * @type {boolean} - */ - isSingleAsset; - - /** - * @type {Array} - */ - cryptocurrencies; - - /** - * @type {Array} - */ - invoicables; - - /** - * @type {Array} - */ - purchasablesByCards; - - /** - * @type {Array} - */ - fiats; - - constructor({ asset }) { - super($scope); - - /** - * @type {Asset} - */ - this.asset = asset; - - if (this.asset) { - this.isSingleAsset = true; - this.initForSingleAsset(); - } else { - this.isSingleAsset = false; - this.initForAllAssets(); - } - } - - initForSingleAsset() { - if (gatewayService.hasSupportOf(this.asset, 'deposit')) { - this.enableTab('cryptocurrency'); - } - - this.enableTab('invoice'); - - if (gatewayService.hasSupportOf(this.asset, 'card')) { - this.purchasablesByCards = [this.asset]; - this.enableTab('card'); - } - - if (gatewayService.hasSupportOf(this.asset, 'sepa')) { - this.enableTab('bank'); - } - } - - initForAllAssets() { - const cryptocurrenciesRequests = this.getExtendedAssets(gatewayService.getCryptocurrencies()); - const cryptocurrenciesRequest = Promise.all(cryptocurrenciesRequests).then((results) => { - this.cryptocurrencies = results; - }); - - const invoicesRequest = waves.node.assets.userBalances().then((results) => { - this.invoicables = results - .filter((balance) => !user.scam[balance.asset.id]) - .map((balance) => balance.asset); - }); - - const cardsRequests = this.getExtendedAssets(gatewayService.getPurchasableWithCards()); - const cardsRequest = Promise.all(cardsRequests).then((results) => { - this.purchasablesByCards = results; - }); - - const fiatsRequests = this.getExtendedAssets(gatewayService.getFiats()); - const fiatsRequest = Promise.all(fiatsRequests).then((results) => { - this.fiats = results; - }); - - Promise.all([ - cryptocurrenciesRequest, - invoicesRequest, - cardsRequest, - fiatsRequest - ]).then(() => { - this.updateAssetBy(this.cryptocurrencies[0].id); - - this.enableTab('cryptocurrency'); - this.enableTab('invoice'); - this.enableTab('card'); - this.enableTab('bank'); - - this.initForSingleAsset(); - }); - } - - /** - * @param {Object} assetsIds - */ - getExtendedAssets(assetsIds) { - return ( - Object - .keys(assetsIds) - .map(waves.node.assets.getAsset) - ); - } - - /** - * @param {string} id - */ - updateAssetBy(id) { - this.asset = ( - this.cryptocurrencies.find((cryptocurrency) => cryptocurrency.id === id) || - this.invoicables.find((invoicable) => invoicable.id === id) || - this.purchasablesByCards.find((purchasableByCards) => purchasableByCards.id === id) || - this.fiats.find((fiat) => fiat.id === id) - ); - } - - /** - * @param {'cryptocurrency' | 'invoice' | 'card' | 'bank'} name - */ - enableTab(name) { - this.tabs[name] = true; - } - - } - - return new ReceiveCtrl(this.locals); - }; - - controller.$inject = ['Base', '$scope', 'gatewayService', 'user', 'waves']; - - angular.module('app.utils').controller('ReceiveCtrl', controller); -})(); diff --git a/src/modules/utils/modals/receive/Receive.less b/src/modules/utils/modals/receive/Receive.less deleted file mode 100644 index c5fbb2be5a..0000000000 --- a/src/modules/utils/modals/receive/Receive.less +++ /dev/null @@ -1,265 +0,0 @@ -@import (reference) 'config'; -@import (reference) '../../../app/less/typography'; - -md-dialog.modal-receive { - md-dialog-content { - - position: relative; - padding: 0; - overflow: hidden; - color: @color-disabled-900; - - .modal-content, - w-tab, - .step-list, - w-step-by-step, - w-step, - w-step > div { - height: 100%; - } - - .button-wrapper-height { - min-height: 54px; - - a { - position: absolute; - left: 0; - top: 0; - width: 100%; - display: block; - height: 54px; - } - } - - .tab-tem { - padding: 40px 40px 0; - display: block; - max-height: calc(90vh ~'- 60px'); - overflow: auto; - - &::after { - display: block; - content: ''; - width: 100%; - height: 40px; - } - } - - .modal-content { - overflow: auto; - position: relative; - - .plate-warning { - margin: 10px 0 20px; - &.server-error { - margin-bottom: 30px; - } - } - - .plate-warning.margin-1 { - margin-bottom: 10px; - } - - .plate-note { - margin: 10px 0 20px; - } - } - - &::after { - display: none; - } - - .flex-row { - display: flex; - flex-direction: row; - align-items: center; - } - - .amount-wrap { - display: flex; - flex-direction: row; - justify-content: space-between; - align-items: center; - width: 100%; - - w-input { - flex-basis: 48%; - } - - w-input.long { - flex-basis: 100%; - } - - w-input .w-input-wrap input[type="text"] { - padding-right: 50px; - } - } - - .amount-modal-icon { - background-image: url(/img/icons/double-arrow.svg); - background-size: 100% 100%; - width: 24px; - height: 20px; - margin: 7px; - } - - w-balance-input { - width: 204px; - } - - .asset { - &__name { - flex-direction: column; - align-items: flex-start; - @media screen and (max-width: 540px) { - font-size: 13px; - } - } - - &__id { - font-size: 11px; - line-height: 1em; - @media screen and (max-width: 540px) { - font-size: @font-size-caption-4; - } - } - } - - - .card-icons { - position: absolute; - width: 84px; - right: 0; - top: 0; - display: flex; - } - - .receive-confirm, - w-confirm-tran.saction { - display: block; - padding: 0 40px 0; - max-height: calc(90vh ~'- 60px'); - - &::after { - content: ''; - display: block; - height: 40px; - } - } - - .receive-confirm { - min-height: 220px; - max-height: auto; - } - - .receive-user-status { - position: relative; - min-height: 130px; - &.pending { - min-height: 60px; - } - } - - .verified-input { - align-items: center; - display: flex; - - i { - background: url(/img/icons/input-valid-icon.svg) center no-repeat rgba(129, 201, 38, 0.1); - display: block; - width: 30px; - height: 30px; - margin-right: 12px; - border-radius: 50%; - } - } - - .or { - margin: 33px 0 22px; - } - - .scan { - margin-bottom: 20px; - text-align: center; - } - - .center { - background-color: @color-white; - width: 100%; - height: 100%; - } - - .country-list-link { - text-align: right; - a { - display: inline-block; - } - } - - table.steps { - margin: 16px 0 20px 0; - border-collapse: collapse; - - td { - padding: 16px; - border: 1px solid @color-basic-200; - vertical-align: top; - - &.step { - min-width: 80px; - background: @color-basic-50; - } - } - } - } -} - -@media screen and (max-width: 540px) { - md-dialog.modal-receive { - md-dialog-content { - .modal-content { - - .receive-confirm, - w-confirm-transaction { - padding: 40px 20px 0; - max-height: calc(100% + 60px); - - &::after { - content: ''; - display: block; - height: 20px; - } - } - - .tab-tem { - padding: 40px 20px 0; - } - - .receive-confirm { - min-height: 220px; - padding-bottom: 50px; - } - - .icon-close { - right: 10px; - } - } - } - } -} - -@media screen and (max-width: 420px) { - w-balance-input w-input .w-input-wrap input[type="text"].big, - .select .select__wrap .select__title { - font-size: @font-size-caption-1; - } -} - -@media screen and (max-width: 420px) { - md-dialog.modal-receive { - .visa-icon, - .mastercard-icon { - margin-top: -12px; - } - } -} diff --git a/src/modules/utils/modals/receive/receiveBank/ReceiveBank.js b/src/modules/utils/modals/receive/receiveBank/ReceiveBank.js deleted file mode 100644 index 195806ed92..0000000000 --- a/src/modules/utils/modals/receive/receiveBank/ReceiveBank.js +++ /dev/null @@ -1,131 +0,0 @@ -(function () { - 'use strict'; - - const DEFAULT_LINK = '#'; - - /** - * @param {typeof Base} Base - * @param {ng.IScope} $scope - * @param {GatewayService} gatewayService - * @param {User} user - * @return {ReceiveBank} - */ - const controller = function (Base, $scope, gatewayService, user) { - - class ReceiveBank extends Base { - - /** - * @return {boolean} - */ - get isLira() { - return this.asset && this.asset.id === WavesApp.defaultAssets.TRY; - } - - /** - * @type {boolean} - */ - pending = false; - /** - * @type {boolean} - */ - isVerified = false; - /** - * @type {boolean} - */ - isTermsAccepted = false; - /** - * @type {boolean} - */ - isSingleAsset; - /** - * @type {Asset} - */ - asset = null; - /** - * @type {string} - */ - verifyLink = `https://go.idnow.de/coinomat/userdata/${user.address}`; - /** - * @type {Array} - */ - fiats = undefined; - /** - * @type {boolean} - */ - signInProgress = false; - /** - * @type {string} - */ - digiLiraUserLink = 'https://www.digilira.com/'; - - /** - * @type {string} - */ - listOfEligibleCountries = DEFAULT_LINK; - - /** - * @type {string} - */ - idNowSiteUrl = DEFAULT_LINK; - - /** - * @type {string} - */ - idNowUserLink = DEFAULT_LINK; - - /** - * @type {number} - */ - step = 0; - - constructor() { - super(); - - this.observe('asset', this._updateDetails); - } - - nextStep() { - this.step += 1; - } - - onSignStart() { - this.signInProgress = true; - } - - onSignEnd() { - this.signInProgress = false; - } - - /** - * @private - */ - _updateDetails() { - const sepaDetails = gatewayService.getSepaDetails(this.asset, user.address); - - if (sepaDetails) { - sepaDetails.then((details) => { - this.listOfEligibleCountries = details.listOfEligibleCountries; - this.idNowSiteUrl = details.idNowSiteUrl; - this.idNowUserLink = details.idNowUserLink; - $scope.$apply(); - }); - } - } - - } - - return new ReceiveBank(); - }; - - controller.$inject = ['Base', '$scope', 'gatewayService', 'user']; - - angular.module('app.utils').component('wReceiveBank', { - controller, - bindings: { - asset: '<', - fiats: '<', - isSingleAsset: '<' - }, - templateUrl: 'modules/utils/modals/receive/receiveBank/receive-bank.html' - }); -})(); diff --git a/src/modules/utils/modals/receive/receiveBank/receive-bank.html b/src/modules/utils/modals/receive/receiveBank/receive-bank.html deleted file mode 100644 index c87adb22df..0000000000 --- a/src/modules/utils/modals/receive/receiveBank/receive-bank.html +++ /dev/null @@ -1,146 +0,0 @@ -
    - - -
    -
    - -
    -
    - -
    {{::$ctrl.asset.name}}
    -
    -
    - - - -
    -
    - -
    {{::fiat.name}}
    -
    -
    -     -     -
    - -
    - - -
    - -
    -
    - -
    - -
    - -
    -
    -
    -
    - -
    - -
    - - - - - - - - - - -
    - - - -
    - - - - - -
    -
    - - -     - - -
    - -

    -
    -
    - -
    - -

    -
    -     -     -
    diff --git a/src/modules/utils/modals/receive/receiveCard/ReceiveCard.js b/src/modules/utils/modals/receive/receiveCard/ReceiveCard.js deleted file mode 100644 index 30f0573c4d..0000000000 --- a/src/modules/utils/modals/receive/receiveCard/ReceiveCard.js +++ /dev/null @@ -1,212 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {typeof Base} Base - * @param {ng.IScope} $scope - * @param {GatewayService} gatewayService - * @param {User} user - * @return {ReceiveCard} - */ - const controller = function (Base, $scope, gatewayService, user) { - - const { BigNumber } = require('@waves/bignumber'); - - class ReceiveCard extends Base { - - /** - * @type {Asset} - */ - asset = null; - - /** - * @type {Array} - */ - purchasablesByCards = undefined; - - /** - * @type {boolean} - */ - isSingleAsset; - - /** - * @type {Function} - */ - onAssetChange; - - /** - * @type {number} - */ - step = 0; - - /** - * @type {string} - */ - indacoinLink = '#'; - - /** - * @type {Array} - */ - cardFiatList = gatewayService.getDefaultCardFiatList(); - - /** - * @type {number} - */ - approximateAmount = 0; - - /** - * @type {number} - */ - chosenCurrencyIndex = 0; - - /** - * @type {string} - */ - chosenAssetId = null; - - /** - * @type {Object} - */ - cardPayment = null; - - /** - * @type {boolean} - */ - showIndacoinRedirectionDescription = false; - - constructor() { - super(); - - this.observe('chosenAssetId', ({ value: id }) => this.onAssetChange({ id })); - - this.observe(['chosenCurrencyIndex', 'cardPayment'], this._updateAmountAndLink); - - this.observe(['asset', 'purchasablesByCards'], this._updateDetails); - } - - confirmIndacoin() { - this.showIndacoinRedirectionDescription = true; - this.nextStep(); - } - - nextStep() { - this.step += 1; - } - - /** - * @private - */ - _updateAmountAndLink() { - if (!this.cardPayment) { - return null; - } - - this._updateApproximateAmount(); - this._updateIndacoinLink(); - } - - /** - * @private - */ - _updateDetails() { - if (!this.asset || !this.purchasablesByCards || !this._isPurchasableByCard(this.asset)) { - return; - } - - this._updateCardPayment().then(cardPayment => { - this.cardPayment = cardPayment; - }).then( - () => this._updateCardFiatList() - ).then(cardFiatList => { - this.cardFiatList = cardFiatList; - - this._updateAmountAndLink(); - $scope.$apply(); - }); - } - - /** - * @private - */ - _updateCardPayment() { - return ds.moneyFromTokens( - this.cardFiatList[0].min, - this.cardFiatList[0].assetId - ); - } - - /** - * @private - */ - _updateCardFiatList() { - return gatewayService.getCardFiatWithLimits( - this.asset, - user.address, - gatewayService.getDefaultCardFiatList() - ); - } - - /** - * @private - */ - _updateApproximateAmount() { - this.approximateAmount = new ds.wavesDataEntities.Money(0, this.asset); - - gatewayService.getCardApproximateCryptoAmount( - this.asset, - this.cardFiatList[this.chosenCurrencyIndex].fiatCode, - user.address, - this._tokenizeCardPayment() - ).then(approximateAmount => { - const coins = new BigNumber(approximateAmount).mul(Math.pow(10, this.asset.precision)); - - this.approximateAmount = new ds.wavesDataEntities.Money(coins.toFixed(0), this.asset); - $scope.$apply(); - }); - } - - /** - * @private - */ - _updateIndacoinLink() { - this.indacoinLink = gatewayService.getCardBuyLink( - this.asset, - this.cardFiatList[this.chosenCurrencyIndex].fiatCode, - user.address, - this._tokenizeCardPayment() - ); - } - - /** - * @param {Asset} asset - * @private - */ - _isPurchasableByCard(asset) { - return this.purchasablesByCards.find((purchasable) => purchasable.id === asset.id); - } - - /** - * @private - */ - _tokenizeCardPayment() { - return (this.cardPayment && this.cardPayment.toTokens()); - } - - } - - return new ReceiveCard(); - }; - - controller.$inject = ['Base', '$scope', 'gatewayService', 'user']; - - angular.module('app.utils').component('wReceiveCard', { - controller, - bindings: { - asset: '<', - purchasablesByCards: '<', - isSingleAsset: '<', - onAssetChange: '&' - }, - templateUrl: 'modules/utils/modals/receive/receiveCard/receive-card.html' - }); -})(); diff --git a/src/modules/utils/modals/receive/receiveCard/receive-card.html b/src/modules/utils/modals/receive/receiveCard/receive-card.html deleted file mode 100644 index a600b555c4..0000000000 --- a/src/modules/utils/modals/receive/receiveCard/receive-card.html +++ /dev/null @@ -1,128 +0,0 @@ -
    - - -
    -
    -
    - -
    -
    - -
    {{::$ctrl.asset.name}}
    -
    -
    - - - -
    -
    - -
    - {{::purchasableByCard.name}} -
    -
    -
    -     -     -
    - -
    -
    - -
    -  {{$ctrl.cardFiatList[$ctrl.chosenCurrencyIndex].min}} - {{$ctrl.cardFiatList[$ctrl.chosenCurrencyIndex].name}},  -  {{$ctrl.cardFiatList[$ctrl.chosenCurrencyIndex].max}} - {{$ctrl.cardFiatList[$ctrl.chosenCurrencyIndex].name}} -
    - -
    - - -
    -
    - -
    - -
    - - - - - {{::currency.name}} - - -
    - - - - - - - - - - -     -
    - -
    -
    - -
    - -
    - - -
    -
    -
    - - - - - - -     - - -
    - -

    -
    -
    -     -     -
    diff --git a/src/modules/utils/modals/receive/receiveCryptocurrency/ReceiveCryptocurrency.js b/src/modules/utils/modals/receive/receiveCryptocurrency/ReceiveCryptocurrency.js deleted file mode 100644 index edae99aeea..0000000000 --- a/src/modules/utils/modals/receive/receiveCryptocurrency/ReceiveCryptocurrency.js +++ /dev/null @@ -1,134 +0,0 @@ -(function () { - 'use strict'; - - const { Money } = require('@waves/data-entities'); - - /** - * @param {typeof Base} Base - * @param {ng.IScope} $scope - * @param {GatewayService} gatewayService - * @param {User} user - * @return {ReceiveCryptocurrency} - */ - const controller = function (Base, $scope, gatewayService, user) { - - /** - * @extends {ng.IController} - */ - class ReceiveCryptocurrency extends Base { - - /** - * @type {Asset} - */ - asset = null; - - /** - * @type {Array} - */ - cryptocurrencies; - - /** - * @type {boolean} - */ - isSingleAsset; - - /** - * @type {string} - */ - assetKeyName; - - /** - * @type {string} - */ - gatewayAddress; - - /** - * @type {boolean} - */ - gatewayServerError = false; - - /** - * @type {boolean} - */ - gatewayServerPending = false; - - /** - * @type {boolean} - */ - isWEST; - - /** - * @type {string} - */ - chosenAssetId = null; - - /** - * @type {Function} - */ - onAssetChange; - - /** - * @type {Money | null} - */ - minAmount = null; - - /** - * @type {Money | null} - */ - maxAmount = null; - - constructor() { - super(); - - this.observe('chosenAssetId', ({ value: id }) => this.onAssetChange({ id })); - - this.observe('asset', this.updateGatewayAddress); - } - - /** - * @public - */ - updateGatewayAddress() { - this.gatewayServerError = false; - this.gatewayServerPending = true; - - const depositDetails = gatewayService.getDepositDetails(this.asset, user.address); - - if (depositDetails) { - depositDetails.then((details) => { - this.gatewayAddress = details.address; - this.minAmount = Money.fromTokens(details.minimumAmount, this.asset); - this.maxAmount = Money.fromTokens(details.maximumAmount, this.asset); - this.gatewayServerPending = false; - $scope.$apply(); - }, () => { - this.minAmount = Money.fromTokens(0.001, this.asset); - this.gatewayAddress = null; - this.gatewayServerError = true; - this.gatewayServerPending = false; - $scope.$apply(); - }); - - this.assetKeyName = gatewayService.getAssetKeyName(this.asset, 'deposit'); - this.isWEST = this.asset.id === WavesApp.defaultAssets.WEST; - } - } - - } - - return new ReceiveCryptocurrency(); - }; - - controller.$inject = ['Base', '$scope', 'gatewayService', 'user']; - - angular.module('app.utils').component('wReceiveCryptocurrency', { - controller, - bindings: { - asset: '<', - cryptocurrencies: '<', - isSingleAsset: '<', - onAssetChange: '&' - }, - templateUrl: 'modules/utils/modals/receive/receiveCryptocurrency/receive-cryptocurrency.html' - }); -})(); diff --git a/src/modules/utils/modals/receive/receiveCryptocurrency/receive-cryptocurrency.html b/src/modules/utils/modals/receive/receiveCryptocurrency/receive-cryptocurrency.html deleted file mode 100644 index cb4e615781..0000000000 --- a/src/modules/utils/modals/receive/receiveCryptocurrency/receive-cryptocurrency.html +++ /dev/null @@ -1,108 +0,0 @@ -
    -
    -
    - -
    -
    - -
    - {{::$ctrl.asset.name}} -
    -
    -
    - - - -
    -
    - -
    - {{::cryptocurrency.name}} - {{::cryptocurrency.id}} -
    -
    -
    -     -     -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    - - -
    - -
    -
    - -
    -
    - -
    -     -
    - - - {{$ctrl.gatewayAddress}} - - - -
    - -
    - -
    -
    - - - -
    - -
    - -
    -
    -
    - - - - -
    diff --git a/src/modules/utils/modals/receive/receiveInvoice/ReceiveInvoice.js b/src/modules/utils/modals/receive/receiveInvoice/ReceiveInvoice.js deleted file mode 100644 index 9c6324571b..0000000000 --- a/src/modules/utils/modals/receive/receiveInvoice/ReceiveInvoice.js +++ /dev/null @@ -1,105 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {typeof Base} Base - * @param {Waves} waves - * @param {User} user - * @return {ReceiveInvoice} - */ - const controller = function (Base, waves, user) { - - class ReceiveInvoice extends Base { - - /** - * @type {Asset} - */ - asset = null; - - /** - * @type {Array} - */ - invoicables = undefined; - - /** - * @type {boolean} - */ - isSingleAsset; - - /** - * @type {Function} - */ - onAssetChange; - - /** - * @type {Array} - */ - addressAndAliases = [ - user.address, - ...waves.node.aliases.getAliasList() - ]; - - /** - * @type {string} - */ - chosenAssetId = null; - - /** - * @type {string} - */ - chosenAlias = null; - - /** - * @type {Object} - */ - invoiceAmount = null; - - /** - * @type {string} - */ - sendLink = ''; - - constructor() { - super(); - - this.observe('chosenAssetId', ({ value: id }) => this.onAssetChange({ id })); - - this.observe(['asset', 'chosenAlias', 'invoiceAmount', 'invoicables'], this._updateSendLink); - } - - /** - * @private - */ - _updateSendLink() { - const assetId = this.asset && this.asset.id; - - if (!assetId || !this.chosenAlias) { - this.sendLink = ''; - - return; - } - - const invoiceAmount = (this.invoiceAmount && this.invoiceAmount.toTokens()) || '0'; - const WAVES_URL = WavesApp.origin; - - this.sendLink = `${WAVES_URL}/#send/${assetId}?recipient=${this.chosenAlias}&amount=${invoiceAmount}`; - } - - } - - return new ReceiveInvoice(); - }; - - controller.$inject = ['Base', 'waves', 'user']; - - angular.module('app.utils').component('wReceiveInvoice', { - controller, - bindings: { - asset: '<', - invoicables: '<', - isSingleAsset: '<', - onAssetChange: '&' - }, - templateUrl: 'modules/utils/modals/receive/receiveInvoice/receive-invoice.html' - }); -})(); diff --git a/src/modules/utils/modals/receive/receiveInvoice/receive-invoice.html b/src/modules/utils/modals/receive/receiveInvoice/receive-invoice.html deleted file mode 100644 index ab9cfc201f..0000000000 --- a/src/modules/utils/modals/receive/receiveInvoice/receive-invoice.html +++ /dev/null @@ -1,91 +0,0 @@ -
    -
    -
    -
    - -
    -
    - -
    {{::$ctrl.asset.name}}
    -
    -
    - - - -
    -
    - -
    - {{::invoice.name}} - {{::invoice.id}} -
    -
    -
    -     -     -
    - -
    -
    - - - - {{::alias}} - - -
    - -
    - -
    - -
    - -
    -     -
    - -
    -
    - - - {{$ctrl.sendLink}} - -
    - -
    - -
    -
    - - - -
    -
    -
    -
    diff --git a/src/modules/utils/modals/script/ScriptModalCtrl.js b/src/modules/utils/modals/script/ScriptModalCtrl.js deleted file mode 100644 index b44dfa5275..0000000000 --- a/src/modules/utils/modals/script/ScriptModalCtrl.js +++ /dev/null @@ -1,51 +0,0 @@ -(function () { - 'use strict'; - - const controller = function (Base, $scope) { - - class ScriptModalCtrl extends Base { - - get activeState() { - return this.state[this.activeTab]; - } - - tx = null; - state = Object.create(null); - step = 0; - - - constructor() { - super($scope); - - this.observe('activeTab', this._onChangeActiveTab); - this._onChangeActiveTab(); - } - - onClickBack() { - this.step--; - } - - nextStep(signable) { - this.signable = signable; - this.step++; - } - - /** - * @private - */ - _onChangeActiveTab() { - const tab = this.activeTab; - if (!this.state[tab]) { - this.state[tab] = Object.create(null); - } - } - - } - - return new ScriptModalCtrl(); - }; - - controller.$inject = ['Base', '$scope']; - - angular.module('app.utils').controller('ScriptModalCtrl', controller); -})(); diff --git a/src/modules/utils/modals/script/script.html b/src/modules/utils/modals/script/script.html deleted file mode 100644 index 41b28b31dc..0000000000 --- a/src/modules/utils/modals/script/script.html +++ /dev/null @@ -1,20 +0,0 @@ - - -
    -
    -

    -
    - - - -
    -     - - - - - - -     diff --git a/src/modules/utils/modals/script/script.less b/src/modules/utils/modals/script/script.less deleted file mode 100644 index 8b13789179..0000000000 --- a/src/modules/utils/modals/script/script.less +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/modules/utils/modals/sendAsset/AssetSendCtrl.js b/src/modules/utils/modals/sendAsset/AssetSendCtrl.js deleted file mode 100644 index e8e72f5976..0000000000 --- a/src/modules/utils/modals/sendAsset/AssetSendCtrl.js +++ /dev/null @@ -1,364 +0,0 @@ -(function () { - 'use strict'; - - const { SIGN_TYPE } = require('@waves/signature-adapter'); - - /** - * @param $scope - * @param {Waves} waves - * @param {Base} Base - * @param {app.utils} utils - * @param {User} user - * @param {$mdDialog} $mdDialog - * @param {BalanceWatcher} balanceWatcher - * @param {IOuterBlockchains} outerBlockchains - * @param {GatewayService} gatewayService - * @return {AssetSendCtrl} - */ - const controller = function ($scope, waves, Base, utils, user, $mdDialog, balanceWatcher, outerBlockchains, - gatewayService) { - - class AssetSendCtrl extends Base { - - /** - * @return {Money} - */ - get balance() { - return this.state.moneyHash && this.state.moneyHash[this.state.assetId]; - } - - /** - * @return {IGatewayDetails} - */ - get gatewayDetails() { - return this.state.gatewayData.details; - } - - /** - * @type {ISendMode} - */ - sendMode; - - /** - * @param {IAssetSendCtrl.IOptions} options - */ - constructor(options) { - super($scope); - - /** - * @type {string} - */ - this.headerPath = 'modules/utils/modals/sendAsset/send-header.html'; - /** - * @type {Array} - */ - this.choosableMoneyList = []; - /** - * @type {number} - */ - this.step = 0; - /** - * @type {boolean} - */ - this.canChooseAsset = !options.assetId || options.canChooseAsset; - /** - * @type {Object.} - */ - this.moneyHash = null; - /** - * @type {ISendState} - */ - this.state = { - assetId: options.assetId || WavesApp.defaultAssets.WAVES, - mirrorId: user.getSetting('baseAssetId'), - gatewayData: { - details: null, - error: null - }, - paymentId: '', - moneyHash: null, - singleSend: utils.liteObject({ type: SIGN_TYPE.TRANSFER }), - massSend: utils.liteObject({ type: SIGN_TYPE.MASS_TRANSFER }) - }; - - this.receive(balanceWatcher.change, this._updateBalanceList, this); - this._updateBalanceList(); - - this.observe('sendMode', this._onChangeSendMode); - - this.receive(utils.observe(this.state, 'assetId'), this.checkSendMode, this); - this.receive(utils.observe(this.state.singleSend, 'recipient'), this.checkSendMode, this); - this.checkSendMode(); - - /** - * @type {string} - */ - this.tab = options.mode; - /** - * @type {boolean} - */ - this.strict = options.amount && options.recipient && options.strict; - /** - * @type {boolean} - */ - this.errorOccured = false; - - try { - this.referrer = new URL(options.referrer).href; - } catch (e) { - this.referrer = null; - } - - if (!(options.mode || options.recipient || options.amount)) { - this.syncSettings({ - tab: 'send.defaultTab' - }); - } else { - this.tab = 'singleSend'; - this.state.singleSend.recipient = options.recipient; - this.state.singleSend.attachment = options.attachment; - - const toGateway = this.sendMode === 'gateway' && this.gatewayDetails; - const attachment = toGateway ? this.gatewayDetails.attachment : options.attachment; - const attachmentString = attachment ? attachment.toString() : ''; - const bytesAttachment = utils.stringToBytes(attachmentString); - - Promise.all([ - ds.moneyFromTokens(options.amount || '0', this.state.assetId), - waves.node.getFee({ type: SIGN_TYPE.TRANSFER }) - ]).then(([money, fee]) => { - - this.state.singleSend.amount = money; - this.state.singleSend.fee = fee; - - const tx = waves.node.transactions.createTransaction({ - ...this.state.singleSend, - attachment: bytesAttachment - }); - const signable = ds.signature.getSignatureApi().makeSignable({ - type: SIGN_TYPE.TRANSFER, - data: tx - }); - - if (this.strict) { - this.nextStep(signable); - } - }) - .catch(() => { - this.errorOccured = true; - $scope.$digest(); - }); - } - - this.receive(utils.observe(this.state, 'moneyHash'), this._onChangeMoneyHash, this); - } - - back() { - this.step--; - } - - nextStep(signable) { - this.signable = signable; - this.step++; - } - - onTxSent(id) { - if (this.referrer) { - utils.redirect(`${this.referrer}?txId=${id}`); - $mdDialog.hide(); - } - } - - setMode(mode) { - this.sendMode = mode; - } - - checkSendMode() { - if (this._isOuterBlockchains()) { - this.setMode('gateway'); - } else { - this.setMode('waves'); - } - } - - updateGatewayData() { - if (gatewayService.hasSupportOf(this.balance.asset, 'deposit')) { - return gatewayService - .getWithdrawDetails(this.balance.asset, this.state.singleSend.recipient, this.state.paymentId) - .then(details => { - this.state.gatewayData = { - error: null, - details - }; - $scope.$apply(); - }, error => { - this.state.gatewayData = { - details: null, - error - }; - $scope.$apply(); - }); - } - } - - /** - * @private - */ - _onChangeMoneyHash() { - const hash = this.state.moneyHash; - const list = Object.values(hash) - .filter((money) => !money.getTokens().eq(0) && AssetSendCtrl._isNotScam(money)); - - - if (list.length) { - const availableBalancesHash = utils.toHash(list, 'asset.id'); - - if (!availableBalancesHash[this.state.assetId] && this.canChooseAsset) { - this.state.assetId = list[0].asset.id; - } - - this.choosableMoneyList = list; - } else { - this.choosableMoneyList = [this.state.moneyHash[this.state.assetId]]; - } - } - - /** - * @return {Promise} - * @private - */ - _updateBalanceList() { - const hash = balanceWatcher.getBalance(); - - const loadBalances = [this.state.assetId, this.state.mirrorId].reduce((acc, assetId) => { - return acc.then(hash => { - if (hash[assetId]) { - return Promise.resolve(hash); - } - return balanceWatcher.getBalanceByAssetId(assetId) - .then(money => { - hash[assetId] = money; - return hash; - }); - }); - }, Promise.resolve(hash)); - - loadBalances.then(hash => { - this.state.moneyHash = hash; - utils.safeApply($scope); - }); - } - - /** - * @return {boolean} - * @private - */ - _isOuterBlockchains() { - const outerChain = outerBlockchains[this.state.assetId]; - const isValidWavesAddress = user.isValidAddress(this.state.singleSend.recipient); - const isGatewayAddress = !isValidWavesAddress && - outerChain && outerChain.isValidAddress(this.state.singleSend.recipient); - return isGatewayAddress; - } - - /** - * @private - */ - _onChangeSendMode() { - if (this.sendMode === 'gateway') { - this.updateGatewayData(); - } else { - this.gatewayData = { - details: null, - error: null - }; - } - } - - /** - * @return {boolean} - * @private - */ - static _isNotScam(item) { - return !user.scam[item.asset.id]; - } - - } - - return new AssetSendCtrl(this.locals); - }; - - controller.$inject = [ - '$scope', - 'waves', - 'Base', - 'utils', - 'user', - '$mdDialog', - 'balanceWatcher', - 'outerBlockchains', - 'gatewayService' - ]; - - angular.module('app.utils') - .controller('AssetSendCtrl', controller); -})(); - -/** - * @typedef {function} AssetSendCtrl.IMoneyProcessor - * @param {Object.} hash - * @return {Object.} - */ - -/** - * @typedef {object} ISingleSendTx - * @property {number} type - * @property {string} recipient - * @property {Money} amount - * @property {Money} fee - * @property {string} attachment - * @property {string | null} assetId - */ - -/** - * @typedef {object} IMassSendTx - * @property {string} attachment - * @property {Array} transfers - * @property {Money} fee - */ - -/** - * @typedef {object} ITransferItem - * @property {string} recipient - * @property {Money} amount - */ - -/** - * @typedef {object} ISendState - * @property {string} assetId - * @property {string} mirrorId - * @property {IGatewayDetails} gatewayDetails - * @property {Object.} moneyHash - * @property {ISingleSendTx} singleSend - * @property {IMassSendTx} massSend - * @property {string} warning - */ - -/** - * @name IAssetSendCtrl - */ - -/** - * @typedef {object} IAssetSendCtrl#IOptions - * @property {string} [assetId] - * @property {boolean} [canChooseAsset] - * @property {'singleSend'|'massSend'} [mode] - * @property {string} [amount] - * @property {string} [recipient] - * @property {boolean} [strict] - * @property {string} [referrer] - */ - -/** - * @typedef {'waves' | 'bank' | 'gataway'} ISendMode - */ diff --git a/src/modules/utils/modals/sendAsset/components/massSend/MassSend.js b/src/modules/utils/modals/sendAsset/components/massSend/MassSend.js deleted file mode 100644 index 501ca91449..0000000000 --- a/src/modules/utils/modals/sendAsset/components/massSend/MassSend.js +++ /dev/null @@ -1,487 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {Base} Base - * @param {ReadFile} readFile - * @param {$rootScope.Scope} $scope - * @param {app.utils} utils - * @param {ValidateService} validateService - * @param {Waves} waves - * @param {User} user - * @param {app.utils.decorators} decorators - * @return {MassSend} - */ - const controller = function (Base, readFile, $scope, utils, validateService, waves, user, decorators) { - - const Papa = require('papaparse'); - const { BigNumber } = require('@waves/bignumber'); - const analytics = require('@waves/event-sender'); - - class MassSend extends Base { - - /** - * @return {IMassSendTx} - */ - get tx() { - return this.state.massSend; - } - - /** - * @type {number} - */ - get validTxCount() { - if (this.tx.transfers.length) { - const errors = utils.toHash(this.errors, 'recipient'); - return this.tx.transfers.filter((data) => !errors[data.recipient]).length; - } else { - return 0; - } - } - - /** - * @type {args} - */ - signPending = false; - /** - * @type {Array} - * @private - */ - _listeners = []; - - constructor() { - super(); - /** - * @type {ISendState} - */ - this.state = null; - /** - * @type {number} - */ - this.maxTransfersCount = 100; - /** - * @type {Function} - */ - this.onContinue = null; - /** - * @type {string} - */ - this.recipientCsv = ''; - /** - * @type {Money} - */ - this.totalAmount = null; - /** - * @type {Array<{recipient: string}>} - */ - this.errors = []; - /** - * @type {Array} - */ - this.transfers = []; - /** - * @type {MassSend.IView} - */ - this.view = utils.liteObject({ - errors: utils.liteObject({ showAll: false }) - }); - /** - * @type {boolean} - */ - this.isValidAmounts = true; - /** - * @type {form.FormController} - */ - this.massSend = null; - /** - * @type {boolean} - */ - this.importError = false; - /** - * @type {boolean} - */ - this.hasFee = false; - - const signPendingListener = $scope.$on('signPendingChange', (event, data) => { - this.signPending = data; - }); - - this._listeners.push(signPendingListener); - } - - $postLink() { - - /** - * @type {Array} - */ - const transfers = this.tx.transfers || []; - this.tx.attachment = this.tx.attachment || ''; - const assetId = this.state.assetId; - this.tx.assetId = assetId; - transfers.forEach((item) => { - item.amount = this.state.moneyHash[assetId].cloneWithTokens(item.amount.toTokens()); - }); - this.tx.transfers = transfers; - analytics.send({ name: 'Mass Transfer Click', target: 'ui' }); - const onHasMoneyHash = () => { - const changeTransfers = utils.observe(this.state.massSend, 'transfers'); - const changeAssetId = utils.observe(this.state, 'assetId'); - - this.receive(changeAssetId, this._onChangeAssetId, this); - - this.observe(['transfers', 'errors'], this._updateTxList); - this.observe('totalAmount', this._validate); - this.observe('transfers', this._updateTextAreaContent); - this.observe('recipientCsv', this._onChangeCSVText); - this.receive(changeTransfers, this._calculateTotalAmount, this); - this.receive(changeTransfers, this._validate, this); - this.receive(changeTransfers, this._calculateFee, this); - this.receive(changeAssetId, this._calculateFee, this); - this.receive(utils.observe(this.state.massSend, 'fee'), this._currentHasFee, this); - - this.transfers = this.tx.transfers.slice(); - changeTransfers.dispatch(); - }; - - if (this.state.moneyHash) { - onHasMoneyHash(); - } else { - utils.observe(this.state, 'moneyHash').once(() => { - onHasMoneyHash(); - $scope.$digest(); - }); - } - } - - $onDestroy() { - super.$onDestroy(); - this._listeners.forEach(listener => listener()); - } - - /** - * @param {ImportFile#IOnChangeOptions} data - */ - importFile(data) { - if (data.status === 'ok') { - this.importError = false; - return readFile.read(data.file) - .then((content) => { - this.massSend.recipientCsv.$touched = true; - this._processTextAreaContent(content); - $scope.$digest(); - }); - } else { - this.importError = true; - $scope.$digest(); - setTimeout(() => { - this.importError = false; - $scope.$digest(); - }, 3000); - } - } - - clear() { - this.transfers = []; - this.errors = []; - this.importError = false; - } - - nextStep() { - const tx = waves.node.transactions.createTransaction(this.tx); - const signable = ds.signature.getSignatureApi().makeSignable({ - type: tx.type, - data: { ...tx, attachment: utils.stringToBytes(tx.attachment) } - }); - - return signable; - } - - onTxSign(signable) { - analytics.send({ name: 'Mass Transfer Continue Click', target: 'ui' }); - this.onContinue({ signable }); - } - - /** - * @private - */ - _onChangeAssetId() { - const transfers = this.transfers; - if (transfers && transfers.length) { - const assetId = this.state.assetId; - this.clear(); - this.tx.assetId = assetId; - this.transfers = transfers.map((item) => { - return { - recipient: item.recipient, - amount: this.state.moneyHash[assetId].cloneWithTokens(item.amount.toTokens()) - }; - }); - } - } - - /** - * @private - */ - _currentHasFee() { - if (!this.state || !this.state.massSend || !this.state.massSend.fee) { - return null; - } - - const fee = this.state.massSend.fee; - const moneyHash = this.state.moneyHash; - this.hasFee = moneyHash[fee.asset.id] && moneyHash[fee.asset.id].gte(fee); - } - - /** - * @private - */ - _updateTxList() { - const list = this.transfers.slice(); - const errors = utils.toHash(this.errors, 'recipient'); - const validList = list.filter((item) => !errors[item.recipient]); - const endIndex = Math.min(validList.length, this.maxTransfersCount); - const transfers = validList.slice(0, endIndex); - - if (MassSend._isNotEqual(this.tx.transfers, transfers)) { - this.tx.transfers = transfers; - } - - if (this.tx.assetId !== this.state.assetId) { - this.tx.assetId = this.state.assetId; - } - - this._currentHasFee(); - } - - /** - * @private - */ - _calculateTotalAmount() { - const transfers = this.tx.transfers; - - if (transfers.length) { - this.totalAmount = transfers - .map(({ amount }) => amount.getTokens().gte(0) ? amount : amount.cloneWithTokens('0')) - .reduce((result, item) => result.add(item)); - - return null; - } - - this.totalAmount = this.state.moneyHash[this.state.assetId].cloneWithTokens('0'); - } - - /** - * @private - */ - @decorators.async() - _calculateFee() { - waves.node.getFee(this.tx).then((fee) => { - this.tx.fee = fee; - $scope.$digest(); - }); - } - - /** - * @param {string} content - * @private - */ - _processTextAreaContent(content) { - const { data } = Papa.parse(content || ''); - const recipientHash = MassSend._getRecipientHashByCSVParseResult(data); - const transfers = []; - - Object.keys(recipientHash).forEach((recipient) => { - const amountNum = recipientHash[recipient] - .map((amount) => { - try { - return MassSend._parseAmount(amount); - } catch (e) { - return new BigNumber(0); - } - }) - .reduce((result, item) => result.add(item)); - const amount = this.state.moneyHash[this.state.assetId].cloneWithTokens(amountNum); - transfers.push({ recipient, amount }); - }); - - if (MassSend._isNotEqual(this.transfers, transfers)) { - this.transfers = transfers; - } - } - - /** - * @private - */ - _validate() { - this._validateAmounts(); - this._validateRecipients(); - } - - /** - * @private - */ - @decorators.async() - _validateRecipients() { - - MassSend._isValidRecipients(this.transfers.map((item) => item.recipient)) - .then((list = []) => { - const errors = []; - - list.forEach((response, index) => { - const recipient = this.transfers[index].recipient; - - if (!response.state || this.transfers[index].amount.getTokens().lte(0)) { - errors.push({ recipient }); - } - }); - - this.errors = errors; - $scope.$digest(); - }) - } - - /** - * @private - */ - _validateAmounts() { - if (!this.totalAmount) { - this.isValidAmounts = true; - return null; - } - - const moneyHash = utils.groupMoney([this.totalAmount, this.tx.fee]); - const balance = moneyHash[this.state.assetId]; - this.isValidAmounts = this.state.moneyHash[this.state.assetId].gte(balance) && - this.totalAmount.getTokens().gt('0'); - } - - /** - * @private - */ - _onChangeCSVText() { - const text = this.recipientCsv; - this._processTextAreaContent(text); - this._updateTextAreaContent(); - this._validateRecipients(); - } - - /** - * @private - */ - @decorators.async() - _updateTextAreaContent() { - const transfers = this.transfers; - const text = Papa.unparse(transfers.map((item) => [item.recipient, item.amount.getTokens().toFixed()])); - if (text !== this.recipientCsv) { - this.recipientCsv = text; - $scope.$digest(); - } - } - - /** - * @param {Array>} data - * @return {Object.>} - * @private - */ - static _getRecipientHashByCSVParseResult(data) { - const recipientHash = Object.create(null); - data.forEach((item) => { - if (!item.length) { - return null; - } - - const [recipient, amountString] = item.map((text) => text.replace(/\s/g, '').replace(/"/g, '')); - if (!(recipient && amountString)) { - return null; - } - - if (!recipientHash[recipient]) { - recipientHash[recipient] = []; - } - - recipientHash[recipient].push(amountString); - }); - return recipientHash; - } - - /** - * @param {ITransferItem[]} a - * @param {ITransferItem[]} b - * @return {boolean} - * @private - */ - static _isNotEqual(a, b) { - return !MassSend._isEqual(a, b); - } - - /** - * @param {ITransferItem[]} a - * @param {ITransferItem[]} b - * @return {boolean} - * @private - */ - static _isEqual(a, b) { - return a.length === b.length && a.every((item, i) => { - return item.recipient === b[i].recipient && item.amount.eq(b[i].amount); - }); - } - - /** - * @param {string} recipient - * @return Promise - * @private - */ - @decorators.cachable(60) - static _isValidRecipient(recipient) { - return utils.resolve(validateService.wavesAddress(recipient)); - } - - static _isValidRecipients(recipientList) { - return validateService.wavesAddresses(recipientList) - } - - /** - * @param {string} amountString - * @return {BigNumber} - * @private - */ - static _parseAmount(amountString) { - const data = WavesApp.getLocaleData(); - const validate = /^([0-9]+\.)?[0-9]+$/; - const amount = amountString - .replace(new RegExp(`\\${data.separators.group}`, 'g'), '') - .replace(new RegExp(`\\${data.separators.decimal}`), '.') - .replace(',', '.'); - - if (!validate.test(amount)) { - return new BigNumber(0); - } - - return new BigNumber(amount); - } - - } - - return new MassSend(); - }; - - controller.$inject = ['Base', 'readFile', '$scope', 'utils', 'validateService', 'waves', 'user', 'decorators']; - - angular.module('app.ui').component('wMassSend', { - bindings: { - state: '<', - onContinue: '&' - }, - templateUrl: 'modules/utils/modals/sendAsset/components/massSend/mass-send.html', - transclude: true, - controller - }); -})(); - -/** - * @name MassSend - * - * @typedef {object} MassSend#IView - * @property {object} errors - * @property {boolean} errors.showAll - */ diff --git a/src/modules/utils/modals/sendAsset/components/massSend/mass-send.html b/src/modules/utils/modals/sendAsset/components/massSend/mass-send.html deleted file mode 100644 index 69ce41e8f1..0000000000 --- a/src/modules/utils/modals/sendAsset/components/massSend/mass-send.html +++ /dev/null @@ -1,123 +0,0 @@ -
    -
    - - -
    -
    -
    -
    - -
    -
    - -
    - - - - - - -
    - - - - -
    - - - - - - - - - {{::error.recipient}} - - - - -
    - - - - -     - -
    -
    -
    - -
    -
    -
    -
    - -
    - - - - - - - - -
    -
    - -
    - -
    -
    - -
    -
    - -
    -
    - -
    - - - -
    diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js deleted file mode 100644 index ee5898c865..0000000000 --- a/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js +++ /dev/null @@ -1,343 +0,0 @@ -(function () { - 'use strict'; - - const { SIGN_TYPE } = require('@waves/signature-adapter'); - const analytics = require('@waves/event-sender'); - - /** - * @param Base - * @param {app.utils} utils - * @param {Waves} waves - * @return {SingleSend} - */ - const factory = function (Base, utils, waves) { - - class SingleSend extends Base { - - /** - * @return {string} - */ - get assetId() { - return this.state.assetId; - } - - set assetId(id) { - this.state.assetId = id; - } - - /** - * @return {Object} - */ - get moneyHash() { - return this.state.moneyHash; - } - - /** - * @return {Money} - */ - get balance() { - return this.moneyHash[this.assetId]; - } - - /** - * @return {string} - */ - get mirrorId() { - return this.state.mirrorId; - } - - /** - * @return {ISingleSendTx} - */ - get tx() { - return this.state.singleSend; - } - - /** - * @type {Function} - */ - onSign = null; - /** - * @type {Money} - */ - minAmount = null; - /** - * @type {Money} - */ - maxAmount = null; - /** - * @type {Array} - */ - feeList = []; - /** - * @type {boolean} - */ - hasFee = true; - /** - * @type {Money} - */ - mirror = null; - /** - * @type {boolean} - */ - noMirror = false; - /** - * @type {string} - */ - focus = ''; - /** - * @type {ISingleSendTx} - */ - wavesTx = { - type: SIGN_TYPE.TRANSFER, - amount: null, - attachment: '', - fee: null, - recipient: '', - assetId: '' - }; - /** - * @type {args} - */ - signPending = false; - /** - * @type {$rootScope.Scope} - * @private - */ - __$scope = null; - /** - * @type {boolean} - * @private - */ - _noCurrentRate = false; - /** - * @type {Array} - * @private - */ - _listeners = []; - - constructor($scope) { - super($scope); - this.__$scope = $scope; - - const signPendingListener = this.__$scope.$on('signPendingChange', (event, data) => { - this.signPending = data; - }); - - this._listeners.push(signPendingListener); - } - - $onDestroy() { - super.$onDestroy(); - this._listeners.forEach(listener => listener()); - } - - onSignTx(signable) { - analytics.send({ name: 'Transfer Continue Click', target: 'ui' }); - this.onSign({ signable }); - } - - /** - * @param {string} url - * @return {null} - */ - onReadQrCode(url) { - if (!url.includes('https://')) { - this.tx.recipient = url; - this.__$scope.$apply(); - return null; - } - - const routerData = utils.getRouterParams(utils.getUrlForRoute(url)); - - if (!routerData || routerData.name !== 'SEND_ASSET') { - return null; - } - - const result = routerData.data; - - this.tx.recipient = result.recipient; - - if (result) { - - const applyAmount = () => { - if (result.amount) { - this.tx.amount = this.balance.cloneWithTokens(result.amount); - this._fillMirror(); - } - this.__$scope.$apply(); - }; - - result.assetId = result.asset || result.assetId; - - if (result.assetId) { - waves.node.assets.balance(result.assetId).then(({ available }) => { - this.moneyHash[available.asset.id] = available; - - if (this.assetId !== available.asset.id) { - const myAssetId = this.assetId; - this.assetId = available.asset.id; - this.canChooseAsset = true; - // TODO fix (hack for render asset avatar) - this.choosableMoneyList = [this.moneyHash[myAssetId], available]; - } - - applyAmount(); - }, applyAmount); - } else { - applyAmount(); - } - } - } - - fillMax() { - let amount = null; - const moneyHash = utils.groupMoney(this.feeList); - if (moneyHash[this.assetId]) { - amount = this.balance.sub(moneyHash[this.assetId]); - } else { - amount = this.balance; - } - - if (amount.getTokens().lt(0)) { - amount = this.balance.cloneWithTokens('0'); - } - - waves.utils.getRate(this.assetId, this.mirrorId).then(rate => { - this._noCurrentRate = true; - this.mirror = amount.convertTo(this.moneyHash[this.mirrorId].asset, rate); - this.tx.amount = amount; - this._noCurrentRate = false; - this.__$scope.$apply(); - }); - } - - onBlurMirror() { - if (!this.mirror) { - this._fillMirror(); - } - this.focus = ''; - } - - /** - * @private - */ - _onChangeBaseAssets() { - if (this.assetId === this.mirrorId) { - this.noMirror = true; - } else { - waves.utils.getRate(this.assetId, this.mirrorId).then(rate => { - this.noMirror = rate.eq(0); - }); - } - } - - /** - * @private - */ - _onChangeFee() { - this.feeList = [this.tx.fee]; - - const feeHash = utils.groupMoney(this.feeList); - const balanceHash = this.moneyHash; - - this.hasFee = Object.keys(feeHash).every((feeAssetId) => { - const fee = feeHash[feeAssetId]; - return balanceHash[fee.asset.id] && balanceHash[fee.asset.id].gte(fee); - }); - - } - - /** - * @private - */ - _onChangeAssetId() { - if (!this.assetId) { - throw new Error('Has no asset id!'); - } - - this._onChangeBaseAssets(); - - if (!this.balance) { - return null; - } - - this.tx.amount = this.balance.cloneWithTokens('0'); - this.mirror = this.moneyHash[this.mirrorId].cloneWithTokens('0'); - } - - /** - * @private - */ - _onChangeMirrorId() { - if (!this.mirrorId) { - throw new Error('Has no asset id!'); - } - - this._onChangeBaseAssets(); - - if (!this.moneyHash[this.mirrorId]) { - return null; - } - - this.mirror = this.moneyHash[this.mirrorId].cloneWithTokens('0'); - this._onChangeAmount(); - } - - /** - * @private - */ - _onChangeAmountMirror() { - if (!this._noCurrentRate && this.focus === 'mirror') { - this._fillAmount(); - } - } - - /** - * @private - */ - _onChangeAmount() { - if (!this._noCurrentRate && !this.noMirror && this.focus === 'amount') { - this._fillMirror(); - } - } - - /** - * @private - */ - _fillMirror() { - if (!this.tx.amount) { - this.mirror = null; - return; - } - - waves.utils.getRate(this.assetId, this.mirrorId).then(rate => { - this.mirror = this.tx.amount.convertTo(this.moneyHash[this.mirrorId].asset, rate); - this.__$scope.$digest(); - }); - } - - /** - * @private - */ - _fillAmount() { - if (!this.mirror) { - this.tx.amount = null; - return null; - } - - waves.utils.getRate(this.mirrorId, this.assetId).then(rate => { - this.tx.amount = this.mirror.convertTo(this.balance.asset, rate); - this.__$scope.$digest(); - }); - } - - } - - return SingleSend; - }; - - factory.$inject = ['Base', 'utils', 'waves']; - - angular.module('app.utils').factory('SingleSend', factory); -})(); diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js deleted file mode 100644 index 9d305aed8a..0000000000 --- a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js +++ /dev/null @@ -1,184 +0,0 @@ -(function () { - 'use strict'; - - const { Money } = require('@waves/data-entities'); - - const MIN_TOKEN_COUNT = 100; - const MAX_TOKEN_COUNT = 50000; - - /** - * @param {SingleSend} SingleSend - * @param {$rootScope.Scope} $scope - * @param {ConfigService} configService - * @param {Waves} waves - * @param {app.utils} utils - */ - const controller = function (SingleSend, $scope, configService, waves, utils) { - - class BankSend extends SingleSend { - - /** - * @return {boolean} - */ - get isBankAccepted() { - return !configService - .get('PERMISSIONS.CANT_TRANSFER_GATEWAY').includes(this.balance.asset.id); - } - - /** - * @return {boolean} - */ - get isBankPendingOrError() { - return this.termsLoadError || this.termsIsPending; - } - - /** - * @type {boolean} - */ - termsIsPending = true; - /** - * @type {boolean} - */ - termsLoadError = false; - /** - * @type {boolean} - */ - termsAccepted = false; - /** - * @type {Money | null} - */ - maxCoinomatAmount = null; - /** - * @type {Function} - */ - onChangeMode = null; - - constructor(props) { - super(props); - this.wavesTx.recipient = WavesApp.bankRecipient; - } - - $postLink() { - const onHasMoneyHash = () => { - this.receive(utils.observe(this.tx, 'fee'), this._onChangeFee, this); - this.receive(utils.observe(this.tx, 'amount'), this._onChangeAmount, this); - - this.receive(utils.observe(this.state, 'assetId'), this._onChangeAssetId, this); - this.receive(utils.observe(this.state, 'mirrorId'), this._onChangeMirrorId, this); - - this.observe('mirror', this._onChangeAmountMirror); - - this.receive(utils.observe(this.tx, 'amount'), this._updateWavesTxObject, this); - this.receive(utils.observe(this.tx, 'attachment'), this._updateWavesTxObject, this); - - this._onChangeBaseAssets(); - this._onChangeFee(); - this._updateWavesTxObject(); - this._setMinAndMaxAmount(); - this._validateForm(); - }; - - if (!this.state.moneyHash) { - this.receiveOnce(utils.observe(this.state, 'moneyHash'), onHasMoneyHash); - } else { - onHasMoneyHash(); - } - - this.receive(utils.observe(this.state, 'moneyHash'), () => { - this._onChangeBaseAssets(); - this._onChangeFee(); - this._setMinAndMaxAmount(); - this._validateForm(); - }); - - $scope.$watch('$ctrl.bankSend.amount', () => this._validateForm()); - } - - setSendMode(mode) { - this.onChangeMode({ mode }); - } - - createTx() { - const attachmentString = this.tx.attachment ? this.tx.attachment.toString() : ''; - const tx = waves.node.transactions.createTransaction({ - ...this.tx, - recipient: WavesApp.bankRecipient, - attachment: utils.stringToBytes(attachmentString), - amount: this.tx.amount - }); - - const signable = ds.signature.getSignatureApi().makeSignable({ - type: tx.type, - data: tx - }); - - return signable; - } - - /** - * @private - */ - _setMinAndMaxAmount() { - const maxCoinomatAmount = this.balance.cloneWithTokens(MAX_TOKEN_COUNT); - const minCoinomatAmount = this.balance.cloneWithTokens(MIN_TOKEN_COUNT); - - this.maxAmount = Money.min(maxCoinomatAmount, this.balance); - this.minAmount = minCoinomatAmount; - this.maxCoinomatAmount = maxCoinomatAmount; - } - - /** - * @private - */ - _validateForm() { - if (this.bankSend.amount && this.tx.amount.getTokens().gt(0)) { - this.bankSend.amount.$setTouched(true); - } - } - - /** - * @private - */ - _updateWavesTxObject() { - const attachmentString = this.tx.attachment ? this.tx.attachment.toString() : ''; - this.wavesTx = { - ...this.wavesTx, - attachment: utils.stringToBytes(attachmentString), - amount: this.tx.amount, - assetId: this.assetId - }; - } - - /** - * @private - */ - _onChangeAssetId() { - super._onChangeAssetId(); - this._setMinAndMaxAmount(); - this._validateForm(); - } - - } - - return new BankSend($scope); - }; - - controller.$inject = [ - 'SingleSend', - '$scope', - 'configService', - 'waves', - 'utils' - ]; - - angular.module('app.ui').component('wBankSend', { - bindings: { - state: '<', - onSign: '&', - onChangeMode: '&' - }, - templateUrl: 'modules/utils/modals/sendAsset/components/singleSend/bankSend/bank-send.html', - transclude: true, - controller - }); -})(); diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/bank-send.html b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/bank-send.html deleted file mode 100644 index bad12e12be..0000000000 --- a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/bank-send.html +++ /dev/null @@ -1,167 +0,0 @@ -
    -
    - - - -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    - -
    -
    - -
    - -
    - -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - - -
    -
    - - - -
    - - - -
    - - -     - - -
    - - -
    -
    -     -
    - - - - -     - -
    - -
    - -
    - -
    - -
    - -
    - -
    -
    - -
    - - - -
    diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js deleted file mode 100644 index 96661ca800..0000000000 --- a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js +++ /dev/null @@ -1,269 +0,0 @@ -(function () { - 'use strict'; - - const { Money } = require('@waves/data-entities'); - const { BigNumber } = require('@waves/bignumber'); - - /** - * @param {SingleSend} SingleSend - * @param {$rootScope.Scope} $scope - * @param {app.utils} utils - * @param {User} user - * @param {Waves} waves - * @param {GatewayService} gatewayService - * @param {ConfigService} configService - */ - const controller = function (SingleSend, $scope, utils, user, waves, gatewayService, configService) { - - class GatewaySend extends SingleSend { - - /** - * @return {IGatewayDetails|null} - */ - get gatewayDetails() { - return this.state.gatewayData.details; - } - - /** - * @return {string} - */ - get paymentId() { - return this.state.paymentId; - } - - /** - * @return {boolean} - */ - get isGatewayAccepted() { - return !configService - .get('PERMISSIONS.CANT_TRANSFER_GATEWAY').includes(this.balance.asset.id); - } - - /** - * @type {boolean} - */ - gatewayError = false; - /** - * @type {boolean} - */ - gatewayDetailsError = false; - /** - * @type {boolean} - */ - gatewayAddressError = false; - /** - * @type {boolean} - */ - gatewayWrongAddress = false; - /** - * @type {Money} - */ - maxGatewayAmount = null; - - $postLink() { - this.receive(utils.observe(this.tx, 'recipient'), this._onUpdateRecipient, this); - this.observe(['gatewayAddressError', 'gatewayDetailsError', 'gatewayWrongAddress'], - this._updateGatewayError); - - const onHasMoneyHash = () => { - - this.receive(utils.observe(this.tx, 'fee'), this._onChangeFee, this); - this.receive(utils.observe(this.tx, 'amount'), this._onChangeAmount, this); - - this.receive(utils.observe(this.state, 'assetId'), this._onChangeAssetId, this); - this.receive(utils.observe(this.state, 'mirrorId'), this._onChangeMirrorId, this); - this.receive(utils.observe(this.state, 'paymentId'), this.updateGatewayData, this); - this.receive(utils.observe(this.state, 'gatewayData'), this._onUpdateGatewayData, this); - - this.observe('mirror', this._onChangeAmountMirror); - - this.receive(utils.observe(this.tx, 'amount'), this._updateWavesTxObject, this); - this.receive(utils.observe(this.tx, 'recipient'), this._updateWavesTxObject, this); - - this._onChangeFee(); - this._fillMirror(); - }; - - if (!this.state.moneyHash) { - this.receiveOnce(utils.observe(this.state, 'moneyHash'), onHasMoneyHash); - } else { - onHasMoneyHash(); - } - - this.receive(utils.observe(this.state, 'moneyHash'), () => { - this._onChangeFee(); - }); - - $scope.$watch('$ctrl.gatewaySend.recipient', () => { - if (this.tx.recipient) { - this.gatewaySend.recipient.$$element.focus(); - } - }); - } - - /** - * @return {boolean} - */ - isMoneroNotIntegratedAddress() { - const moneroAddressLength = 95; - const assetIsMonero = this.assetId === WavesApp.defaultAssets.XMR; - return assetIsMonero && this.tx.recipient.length === moneroAddressLength; - } - - createTx() { - const fee = this.tx.amount.cloneWithTokens(this.gatewayDetails.gatewayFee); - const tx = waves.node.transactions.createTransaction({ - ...this.tx, - recipient: this.gatewayDetails.address, - attachment: utils.stringToBytes(this.gatewayDetails.attachment), - amount: this.tx.amount.add(fee) - }); - - const signable = ds.signature.getSignatureApi().makeSignable({ - type: tx.type, - data: tx - }); - - return signable; - } - - /** - * @private - */ - _onUpdateGatewayData() { - const { details, error } = this.state.gatewayData; - - if (details) { - this.gatewayDetailsError = false; - this.gatewayAddressError = false; - this.gatewayWrongAddress = false; - - const max = BigNumber.min( - details.maximumAmount.add(details.gatewayFee), - this.balance.getTokens() - ); - - this.minAmount = this.balance.cloneWithTokens(details.minimumAmount); - this.maxAmount = this.balance.cloneWithTokens(max); - this.maxGatewayAmount = Money.fromTokens(details.maximumAmount, this.balance.asset); - - this._onChangeGatewayDetails(); - } else if (error) { - if (error.message === gatewayService.getAddressErrorMessage(this.balance.asset, - this.tx.recipient, 'errorAddressMessage')) { - this.gatewayAddressError = true; - } else if (error.message === gatewayService.getWrongAddressMessage(this.balance.asset, - this.tx.recipient, 'wrongAddressMessage')) { - this.gatewayWrongAddress = true; - } else { - this.gatewayDetailsError = true; - } - } else { - this.gatewayDetailsError = true; - } - - $scope.$apply(); - } - - /** - * @private - */ - _onUpdateRecipient() { - this.onChangeRecipient(); - this.updateGatewayData(); - } - - /** - * @private - */ - _updateGatewayError() { - this.gatewayError = this.gatewayAddressError || this.gatewayDetailsError || this.gatewayWrongAddress; - } - - /** - * @private - */ - _onChangeFee() { - const details = this.gatewayDetails; - - const check = (feeList) => { - const feeHash = utils.groupMoney(feeList); - const balanceHash = this.moneyHash; - - this.hasFee = Object.keys(feeHash).every((feeAssetId) => { - const fee = feeHash[feeAssetId]; - return balanceHash[fee.asset.id] && balanceHash[fee.asset.id].gte(fee); - }); - }; - - if (details) { - const gatewayFee = this.balance.cloneWithTokens(details.gatewayFee); - this.feeList = [this.tx.fee, gatewayFee]; - check(this.feeList.concat(this.balance.cloneWithTokens(details.minimumAmount))); - } - } - - /** - * @private - */ - _updateWavesTxObject() { - const fee = this.tx.amount ? this.tx.amount.cloneWithTokens(this.gatewayDetails.gatewayFee) : null; - this.wavesTx = { - ...this.wavesTx, - recipient: this.gatewayDetails.address, - attachment: utils.stringToBytes(this.gatewayDetails.attachment), - amount: this.tx.amount.add(fee), - assetId: this.assetId - }; - } - - /** - * @private - */ - _onChangeGatewayDetails() { - this._updateWavesTxObject(); - this._onChangeFee(); - this._validateForm(); - } - - /** - * @private - */ - _validateForm() { - if (this.tx.amount && this.tx.amount.getTokens().gt(0)) { - this.gatewaySend.amount.$setTouched(true); - } - } - - _onChangeAssetId() { - super._onChangeAssetId(); - this.updateGatewayData(); - } - - } - - return new GatewaySend($scope); - }; - - controller.$inject = [ - 'SingleSend', - '$scope', - 'utils', - 'user', - 'waves', - 'gatewayService', - 'configService' - ]; - - angular.module('app.ui').component('wGatewaySend', { - bindings: { - state: '<', - onSign: '&', - onChangeRecipient: '&', - updateGatewayData: '&' - }, - templateUrl: 'modules/utils/modals/sendAsset/components/singleSend/gatewaySend/gateway-send.html', - transclude: true, - controller - }); -})(); diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/gateway-send.html b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/gateway-send.html deleted file mode 100644 index 0979b75337..0000000000 --- a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/gateway-send.html +++ /dev/null @@ -1,188 +0,0 @@ -
    -
    - - - -
    - -
    -
    -
    - - -
    - - - -
    -     -
    - -
    -
    -
    -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - -
    -
    - -
    - -
    - - - - - - - - - - - - - -     -
    - - -
    -
    - - - -
    - - - -
    - - -     - -
    - -
    - -
    - - -
    - -
    -
    - -
    - - - -
    diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js deleted file mode 100644 index 779e9b8d2c..0000000000 --- a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js +++ /dev/null @@ -1,166 +0,0 @@ -(function () { - 'use strict'; - - const FIAT_ASSETS = { - [WavesApp.defaultAssets.USD]: true, - [WavesApp.defaultAssets.EUR]: true - }; - - const ds = require('data-service'); - - /** - * @param {SingleSend} SingleSend - * @param {$rootScope.Scope} $scope - * @param {app.utils} utils - * @param {User} user - * @param {Waves} waves - */ - const controller = function (SingleSend, $scope, utils, waves, user) { - - class WavesSend extends SingleSend { - - /** - * @return {boolean} - */ - get canSendToBank() { - return FIAT_ASSETS[this.assetId] || false; - } - - /** - * @type {Function} - */ - onChangeMode = null; - - $postLink() { - this.receive(utils.observe(this.tx, 'recipient'), this.onChangeRecipient, this); - - const onHasMoneyHash = () => { - this.tx.amount = this.tx.amount || this.balance.cloneWithTokens('0'); - this.receive(utils.observe(this.tx, 'fee'), this._onChangeFee, this); - this.receive(utils.observe(this.tx, 'amount'), this._onChangeAmount, this); - - this.receive(utils.observe(this.state, 'assetId'), this._onChangeAssetId, this); - this.receive(utils.observe(this.state, 'mirrorId'), this._onChangeMirrorId, this); - - this.observe('mirror', this._onChangeAmountMirror); - - this.receive(utils.observe(this.tx, 'amount'), this._updateWavesTxObject, this); - this.receive(utils.observe(this.tx, 'recipient'), this._updateWavesTxObject, this); - this.receive(utils.observe(this.tx, 'attachment'), this._updateWavesTxObject, this); - - this.onChangeRecipient(); - this._onChangeFee(); - this._setMinAndMaxAmount(); - this._onChangeBaseAssets(); - this._updateWavesTxObject(); - this._fillMirror(); - }; - - if (!this.state.moneyHash) { - this.receiveOnce(utils.observe(this.state, 'moneyHash'), onHasMoneyHash); - } else { - onHasMoneyHash(); - } - - this.receive(utils.observe(this.state, 'moneyHash'), () => { - this._onChangeFee(); - this._setMinAndMaxAmount(); - this._onChangeBaseAssets(); - }); - - $scope.$watch('$ctrl.wavesSend.amount', () => this._validateForm()); - $scope.$watch('$ctrl.wavesSend.recipient', () => { - if (this.tx.recipient) { - this.wavesSend.recipient.$$element.focus(); - } - }); - } - - setSendMode(mode) { - this.onChangeMode({ mode }); - } - - /** - * @return {Signable} - */ - createTx() { - const attachmentString = this.tx.attachment ? this.tx.attachment.toString() : ''; - const tx = waves.node.transactions.createTransaction({ - ...this.tx, - attachment: utils.stringToBytes(attachmentString) - }); - - const signable = ds.signature.getSignatureApi().makeSignable({ - type: tx.type, - data: tx - }); - - return signable; - } - - /** - * @private - */ - _updateWavesTxObject() { - const attachmentString = this.tx.attachment ? this.tx.attachment.toString() : ''; - const isWavesAddress = user.isValidAddress(this.tx.recipient); - this.wavesTx = { - ...this.wavesTx, - recipient: isWavesAddress && this.tx.recipient || '', - attachment: utils.stringToBytes(attachmentString), - amount: this.tx.amount, - assetId: this.assetId - }; - } - - /** - * @private - */ - _validateForm() { - const amountGtZero = this.tx.amount && this.tx.amount.getTokens().gt(0); - if (this.wavesSend.amount && (amountGtZero || this.tx.recipient)) { - this.wavesSend.amount.$setTouched(true); - } - } - - /** - * @private - */ - _setMinAndMaxAmount() { - this.minAmount = this.balance.cloneWithTokens('0'); - this.maxAmount = this.balance; - } - - /** - * @private - */ - _onChangeAssetId() { - super._onChangeAssetId(); - this._setMinAndMaxAmount(); - } - - } - - return new WavesSend($scope); - }; - - controller.$inject = [ - 'SingleSend', - '$scope', - 'utils', - 'waves', - 'user' - ]; - - angular.module('app.ui').component('wWavesSend', { - bindings: { - state: '<', - onSign: '&', - onChangeMode: '&', - onChangeRecipient: '&' - }, - templateUrl: 'modules/utils/modals/sendAsset/components/singleSend/wavesSend/waves-send.html', - transclude: true, - controller - }); -})(); diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/waves-send.html b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/waves-send.html deleted file mode 100644 index 7d9386639e..0000000000 --- a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/waves-send.html +++ /dev/null @@ -1,127 +0,0 @@ -
    -
    - - - -
    -
    -
    -
    - -
    -
    - - -
    - - - -
    - - - - - - - -     -
    - - -
    -
    - - - -
    - - - -
    - - -     - -
    -
    - - - - - - - - -
    - -
    - - -
    - -
    - -
    -
    -
    - -
    - - - -
    diff --git a/src/modules/utils/modals/sendAsset/send-header.html b/src/modules/utils/modals/sendAsset/send-header.html deleted file mode 100644 index 5c72e2f846..0000000000 --- a/src/modules/utils/modals/sendAsset/send-header.html +++ /dev/null @@ -1,34 +0,0 @@ -
    -
    -
    -
    - -
    {{$ctrl.balance.asset.name}}
    -
    -
    - -  {{$ctrl.balance.asset.displayName}} -
    -
    - - -
    -
    - -
    {{::option.asset.name}}
    -
    -
    - -  {{::option.asset.displayName}} -
    -
    -     -     -
    diff --git a/src/modules/utils/modals/sendAsset/send.modal.html b/src/modules/utils/modals/sendAsset/send.modal.html deleted file mode 100644 index 1d47a5c734..0000000000 --- a/src/modules/utils/modals/sendAsset/send.modal.html +++ /dev/null @@ -1,126 +0,0 @@ - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - -
    - - Icon/80/error-80-error500 - - - - - -
    -

    -
    -     -     - - - - - - - - -
    - - Icon/80/error-80-error500 - - - - - -
    -

    -
    -     -     - -     -     - - - - - - - -     - -
    -
    - -
    - -
    - -

    - -

    - - - - -
    - -
    -     -     diff --git a/src/modules/utils/modals/sendAsset/send.modal.less b/src/modules/utils/modals/sendAsset/send.modal.less deleted file mode 100644 index 424fbd3f5d..0000000000 --- a/src/modules/utils/modals/sendAsset/send.modal.less +++ /dev/null @@ -1,462 +0,0 @@ -@import (reference) '../../../app/less/typography'; -@import (reference) '../../../app/less/app-icons'; -@import (reference) '../../../ui/directives/transactionInfo/transactionInfo'; -@import (reference) 'config'; -@import (reference) 'icons'; - -md-dialog.modal-send { - md-dialog-content { - - position: relative; - padding: 0; - overflow: hidden; - color: @color-disabled-900; - - .modal-content, - .step-list, - w-tab, - w-step-by-step, - w-step, - w-step > div { - height: 100%; - } - - .error-content, - w-mass-send, - w-single-send { - display: block; - max-height: calc(90vh ~'- 60px'); - } - - .error-content { - padding: 60px 40px 40px; - } - - w-step.send-form .tab-body-wrap { - display: block; - @media screen and (min-width: 541px) { - padding: 40px 40px 0; - } - } - - .icon-browser-warning { - margin-top: 60px; - } - - &::after { - display: none; - } - - .modal-content { - overflow: auto; - position: relative; - - .error-title { - position: fixed; - top: 0; - left: 0; - width: 100%; - padding: 0 40px; - z-index: 10; - height: 60px; - line-height: 60px; - border-bottom: 1px solid @color-disabled-200; - } - - .plate-note { - margin: 0 0 20px; - } - - .help-icon__content { - left: 40px; - width: calc(100% ~'- 80px'); - } - } - - w-transaction-info { - display: block; - } - - w-confirm-gateway-transaction, - w-confirm-transaction { - .buttons-wrapper w-button { - &::after { - display: block; - content: ''; - height: 40px; - } - } - } - - w-sign-button { - &::after { - display: block; - content: ''; - height: 40px; - } - } - - w-confirm-gateway-transaction, - w-confirm-transaction { - display: block; - padding: 0 40px; - max-height: calc(90vh ~'- 60px'); - } - - .total-amount { - background-color: @color-basic-50; - border: 1px solid @color-basic-200; - } - - .plate-warning { - &.server-error { - margin-bottom: 30px; - justify-content: center; - } - } - - w-qr-code { - display: block; - } - - w-qr-code-read { - position: absolute; - height: 34px; - width: 56px; - right: 0; - top: 50%; - margin-top: -17px; - margin-left: auto; - margin-right: auto; - border-left: 1px solid @color-basic-200; - - .btn { - &::before { - width: 38px; - height: 32px; - background-size: 38px; - cursor: pointer; - } - - &.active { - &::before { - background: @modal-qr-active-close no-repeat center; - } - - &::after { - width: 10px; - height: 10px; - content: ''; - display: block; - background: @color-basic-200; - left: -8px; - position: absolute; - top: 50%; - z-index: 1; - transform: rotate(45deg) translateY(-50%); - } - } - } - } - - .read-address-wrap w-input:not(.no-validate) .w-input-wrap::after { - right: 70px; - } - - .read-address-wrap { - position: relative; - - .w-input-wrap input { - padding-right: 54px; - } - } - - .asset__name { - max-width: 122px; - } - - .flex-row { - display: flex; - flex-direction: row; - align-items: center; - - &.split-half { - justify-content: space-between; - width: 100%; - - & > div.flex-row:last-child { - text-align: right; - justify-content: flex-end; - } - } - } - - .row { - margin-bottom: 20px; - position: relative; - - &:first-child { - margin-top: 10px; - } - - &:last-child { - margin-top: 10px; - } - - &.margin-1 { - margin-bottom: 10px; - } - } - - textarea { - resize: vertical; - min-height: 77px; - max-height: 300px; - } - - .select { - .asset { - &__name { - @media screen and (max-width: 540px) { - font-size: 13px; - } - } - - &__balance { - font-size: 15px; - display: flex; - @media screen and (max-width: 540px) { - font-size: 13px; - } - } - - &__amount { - max-width: 100px; - } - } - } - - .input-like { - position: relative; - padding: 0 20px; - border-radius: @border-radius; - width: 100%; - display: flex; - flex-direction: row; - align-items: center; - overflow-x: hidden; - } - - .amount-wrap { - display: flex; - flex-direction: row; - justify-content: space-between; - align-items: center; - } - - .amount-modal-icon { - background-image: @double-arrow; - background-size: 100% 100%; - width: 24px; - height: 20px; - margin: 7px; - } - - w-balance { - vertical-align: top; - white-space: nowrap; - - &.asset__amount { - max-width: 100px; - - .decimal { - font-family: @font-roboto-regular; - } - } - } - - w-balance-input { - width: 204px; - - .input-wrap .w-input-wrap input { - padding-right: 60px; - } - } - - .no-mirror { - .amount-modal-icon { - display: none; - } - w-balance-input { - width: 100%; - } - } - - .fee { - display: flex; - flex-direction: row; - - .decimal-muted { - display: none; - } - } - - .to-bank-account { - background: @color-basic-50; - border: 1px solid @color-basic-200; - height: 54px; - padding: 0 20px; - display: flex; - align-items: center; - position: relative; - border-radius: @border-radius; - - i { - position: absolute; - height: 34px; - width: 56px; - right: 0; - top: 50%; - transform: translateY(-50%); - border-left: 1px solid #dae1e9; - background: url(/img/icons/close.svg) center no-repeat; - background-size: 18px 18px; - cursor: pointer; - - &::before { - width: 38px; - height: 32px; - background-size: 38px; - cursor: pointer; - } - } - - span { - .body-2(); - } - } - - .flex-row-title { - display: flex; - align-items: center; - - div { - flex-grow: 1; - } - - w-import-file, - a { - flex-grow: 0; - margin: 4px 0; - } - - .toggle-mode-container { - display: block; - text-align: right; - } - } - } - -} - -@media screen and (max-width: 540px) { - md-dialog.modal-send { - md-dialog-content { - w-step.send-form{ - .tabs__body { - padding: 20px 20px 0; - display: block; - } - } - - .qr-code-wrap { - width: 100%; - height: auto; - } - - .modal-content { - overflow: auto; - - .icon-close { - right: 10px; - } - - .buttons-wrapper w-button, - w-sign-button { - &::after { - display: block; - content: ''; - height: 20px; - } - } - - table tr { - td { - font-size: @mobile-low-fsize; - } - td.headline-3 { - padding: 10px; - } - td:last-child { - padding: 10px; - font-size: @mobile-low-fsize; - } - } - - .confirm-block w-button { - width: 45%; - } - - .asset__name, - .flex-row.split-half { - white-space: nowrap; - font-size: 13px; - - span { - vertical-align: top; - } - } - - w-confirm-gateway-transaction, - w-confirm-transaction { - padding: 40px 20px 0; - max-height: calc(100% ~'+ 60px'); - - &::after { - content: ''; - display: block; - height: 20px; - } - } - } - } - } -} - -@media screen and (max-width: 480px) { - md-dialog.modal-send { - md-dialog-content { - - .read-address-wrap { - .w-input-wrap input { - padding-right: 50px; - font-size: @font-size-caption-2; - } - } - - .mobile-ellipsis { - display: inline-block; - max-width: 50px; - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; - vertical-align: top; - } - - w-balance-input w-input .w-input-wrap input[type="text"].big, - .select .select__wrap .select__title { - font-size: @font-size-caption-1; - } - } - } -} diff --git a/src/modules/utils/modals/setAssetScript/SetAssetScriptModalCtrl.js b/src/modules/utils/modals/setAssetScript/SetAssetScriptModalCtrl.js deleted file mode 100644 index 8d8e47801e..0000000000 --- a/src/modules/utils/modals/setAssetScript/SetAssetScriptModalCtrl.js +++ /dev/null @@ -1,51 +0,0 @@ -(function () { - 'use strict'; - - const controller = function (Base, $scope) { - - class SetAssetScriptModalCtrl extends Base { - - /** - * @param {object} - * @type {null} - */ - state; - /** - * @type {Signable} - */ - signable; - /** - * @type {number} - */ - step = 0; - - - constructor(assetId) { - super($scope); - - this.state = { assetId }; - } - - /** - * @param {Signable} signable - */ - onFillTxForm(signable) { - this.signable = signable; - const { assetId, script } = this.signable.getTxData(); - this.state = { assetId, script }; - this.step++; - } - - onConfirmBack() { - this.step--; - } - - } - - return new SetAssetScriptModalCtrl(this.locals); - }; - - controller.$inject = ['Base', '$scope']; - - angular.module('app.utils').controller('SetAssetScriptModalCtrl', controller); -})(); diff --git a/src/modules/utils/modals/setAssetScript/setAssetScript.html b/src/modules/utils/modals/setAssetScript/setAssetScript.html deleted file mode 100644 index 6140850846..0000000000 --- a/src/modules/utils/modals/setAssetScript/setAssetScript.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - -
    -
    -
    - -     diff --git a/src/modules/utils/modals/setAssetScript/setAssetScript.less b/src/modules/utils/modals/setAssetScript/setAssetScript.less deleted file mode 100644 index 0c008c5434..0000000000 --- a/src/modules/utils/modals/setAssetScript/setAssetScript.less +++ /dev/null @@ -1,108 +0,0 @@ -@import (reference) 'config'; -@import (reference) '../../../app/less/typography'; - -// do not forget add all the same changes to 'sponsored.less' - -.setAssetScript { - - md-dialog-content { - overflow: hidden; - overflow-y: auto; - } - - .setAssetScript__input { - height: 200px; - overflow: auto; - } - - @media screen and (max-width: 768px) { - .asset { - &-modal__name { - flex-direction: column; - align-items: flex-start; - font-size: 20px; - } - &__ticker { - margin-top: 5px; - } - } - .status-label-min { - margin: 5px 0 0; - } - } - - .line { - display: flex; - flex-direction: row; - justify-content: space-between; - border-bottom: 1px solid @color-basic-100; - border-top: 1px solid @color-basic-100; - padding: 5px 0; - align-items: center; - min-height: 44px; - - &-description { - width: 100%; - padding: 13px 16px; - border-radius: @border-radius; - background: @color-basic-50; - margin-top: 4px; - border: 1px solid @color-basic-100; - } - - &-no-border { - border-top: 0 none; - } - - &.chart-container { - .legend-item { - white-space: nowrap; - } - - & > div:first-child { - width: 140px; - flex-grow: 0; - } - - & > div:last-child { - width: calc(100% ~'- 140px'); - flex-grow: 1; - margin-left: 30px; - } - } - - &:last-child { - border-bottom: 0 none; - } - - } -} - -@media screen and (max-width: 420px) { - .setAssetScript { - .line.chart-container { - flex-direction: column; - - & > div:first-child { - width: 100%; - } - & > div:last-child { - margin: 0; - width: 100%; - } - } - } -} - -.warning { - &-plate { - text-align: center; - } - - &-text { - display: inline-block; - padding: 13px 12px; - border-radius: @border-radius; - border: 1px dashed @color-warning-400; - } -} diff --git a/src/modules/utils/modals/settings/SettingsCtrl.js b/src/modules/utils/modals/settings/SettingsCtrl.js index c77754f8c7..62b21019f8 100644 --- a/src/modules/utils/modals/settings/SettingsCtrl.js +++ b/src/modules/utils/modals/settings/SettingsCtrl.js @@ -3,7 +3,6 @@ const ds = require('data-service'); const { libs } = require('@waves/waves-transactions'); - const { path } = require('ramda'); const analytics = require('@waves/event-sender'); /** @@ -22,7 +21,6 @@ $scope, waves, user, - createPoll, $templateRequest, utils, storage, @@ -85,7 +83,6 @@ supportLinkName = WavesApp.network.support.replace(/^https?:\/\//, ''); blockHeight = 0; assetsOracleTmp = ''; - oracleWavesData = path(['oracle'], ds.dataManager.getOracleData('oracleWaves')); oracleError = false; oraclePending = false; oracleSuccess = false; @@ -101,21 +98,11 @@ this.isScript = user.hasScript(); this.syncSettings({ - node: 'network.node', - matcher: 'network.matcher', - api: 'network.api', logoutAfterMin: 'logoutAfterMin', - scamListUrl: 'scamListUrl', - tokensNameListUrl: 'tokensNameListUrl', - dontShowSpam: 'dontShowSpam', theme: 'theme', - candle: 'candle', - oracleWaves: 'oracleWaves' - + candle: 'candle' }); - this.assetsOracleTmp = this.oracleWaves; - storage.load('openClientMode').then(mode => { this.openClientMode = mode; }); @@ -131,68 +118,6 @@ ); }); - this.observe('oracleWaves', () => { - ds.config.set('oracleWaves', this.oracleWaves); - this.assetsOracleTmp = this.oracleWaves; - }); - - this.observe('assetsOracleTmp', () => { - const address = this.assetsOracleTmp; - this.oraclePending = true; - ds.api.data.getOracleData(address) - .then(data => { - if (data.oracle) { - this.oracleWavesData = data.oracle; - ds.config.set('oracleWaves', address); - this.oracleWaves = this.assetsOracleTmp; - this.oracleError = false; - this.oracleSuccess = true; - setTimeout(() => { - this.oracleSuccess = false; - $scope.$apply(); - }, 1500); - } - }) - .catch(() => { - this.oracleError = true; - }) - .then(() => { - this.oraclePending = false; - $scope.$apply(); - }); - }); - - // this.observe('candle', () => { - // user.changeCandle(this.candle); - // }); - - this.observe('dontShowSpam', () => { - const dontShowSpam = this.dontShowSpam; - user.setSetting('dontShowSpam', dontShowSpam); - }); - - this.observe('scamListUrl', () => { - ds.config.setConfig({ - scamListUrl: this.scamListUrl - }); - waves.node.assets.stopScam(); - }); - - this.observe('tokensNameListUrl', () => { - ds.config.setConfig({ - tokensNameListUrl: this.tokensNameListUrl - }); - waves.node.assets.tokensNameList(); - }); - - this.observe(['node', 'matcher', 'api'], () => { - ds.config.setConfig({ - node: this.node, - matcher: this.matcher, - api: this.api - }); - }); - this.observe('shownSeed', () => { // analytics.push('Settings', `Settings.ShowSeed.${WavesApp.type}`); }); @@ -201,11 +126,6 @@ // analytics.push('Settings', `Settings.ShowKeyPair.${WavesApp.type}`); }); - createPoll(this, waves.node.height, (height) => { - this.blockHeight = height; - $scope.$digest(); - }, 5000); - const catchProcessor = method => { try { return method().catch(() => null); @@ -242,21 +162,9 @@ } onChangeLanguage(language) { - user.setSetting('lng', language); // analytics.push('Settings', `Settings.ChangeLanguage.${WavesApp.type}`, language); } - setNetworkDefault() { - this.node = WavesApp.network.node; - this.matcher = WavesApp.network.matcher; - this.dontShowSpam = true; - this.scamListUrl = WavesApp.network.scamListUrl; - this.tokensNameListUrl = WavesApp.network.tokensNameListUrl; - this.oracleWaves = WavesApp.oracles.waves; - this.assetsOracleTmp = this.oracleWaves; - this.api = WavesApp.network.api; - } - showExportAccountModal() { return modalManager.showExportAccount(); } @@ -274,10 +182,6 @@ }, 4100); } - showScriptModal() { - modalManager.showScriptModal(); - } - showPasswordModal() { modalManager.showPasswordModal(); } @@ -300,7 +204,6 @@ '$scope', 'waves', 'user', - 'createPoll', '$templateRequest', 'utils', 'storage', diff --git a/src/modules/utils/modals/settings/settings.html b/src/modules/utils/modals/settings/settings.html index 43d0984827..72abf4b077 100644 --- a/src/modules/utils/modals/settings/settings.html +++ b/src/modules/utils/modals/settings/settings.html @@ -12,12 +12,6 @@ - -
    - - -
    -
    @@ -30,23 +24,6 @@ - - - - - - - -
    - - -
    - -
    -
    - -
    -
    @@ -90,11 +67,6 @@
    - -
    -
    -
    {{$ctrl.blockHeight}}
    -
    @@ -181,160 +153,6 @@
    -
    -
    -
    - - - -
    -
    - -
    -
    -
    - - - - -
    -
    - - - - -
    -
    - - -
    -
    - -
    -
    - -
    -
    - - -
    -
    - -
    -
    - -
    -
    - - -
    -
    - - -
    -
    -
    - {{$ctrl.oracleWavesData.name}} -
    -
    - {{$ctrl.oracleWaves}} -
    -
    -
    -
    - - {{$ctrl.oracleWavesData.description.en}} - -
    -
    - -
    -     - -
    - - -
    -
    - - - - - -
    -
    - - - -     -
    -
    -
    - -
    -
    - - -
    -
    - - -
    -     -
    -
    - -
    -
    - - -
    - -
    - - -
    -     -
    -
    - -
    -
    - - -
    - -
    - - -
    -     -
    -
    - -
    -
    - - -
    -
    - -
    - - - -
    diff --git a/src/modules/utils/modals/signByDevice/SignByDeviceCtrl.js b/src/modules/utils/modals/signByDevice/SignByDeviceCtrl.js deleted file mode 100644 index c3ab1116af..0000000000 --- a/src/modules/utils/modals/signByDevice/SignByDeviceCtrl.js +++ /dev/null @@ -1,153 +0,0 @@ -(function () { - 'use strict'; - - const { SIGN_TYPE } = require('@waves/signature-adapter'); - const $ = require('jquery'); - - /** - * @param Base - * @param {$rootScope.Scope} $scope - * @param {$mdDialog} $mdDialog - * @param {User} user - * @return {SignByDeviceCtrl} - */ - const controller = function (Base, $scope, $mdDialog, user) { - - class SignByDeviceCtrl extends Base { - - /** - * @type {*} - */ - anyData = null; - /** - * @type {JQuery.Deferred} - */ - deferred = $.Deferred(); - /** - * @type {string} - */ - mode = ''; - /** - * @type {boolean} - */ - loading = true; - /** - * @type {boolean} - */ - isLedger = false; - /** - * @type {boolean} - */ - isKeeper = false; - /** - * @type {*} - */ - txData = null; - /** - * @type {Money} - */ - total; - /** - * @type {{type: string, pair: string, amount: Money, type: string}} - */ - order = { - type: '', - pair: '', - amount: null - }; - - /** - * @param {Signable} signable - * @param anyData - */ - constructor(signable, anyData) { - super($scope); - this.anyData = anyData; - this.mode = SignByDeviceCtrl.getSignMode(signable.type); - - signable.getId().then(id => { - this.txId = id; - $scope.$apply(); - }); - - this.txData = signable.getTxData(); - - this.parseOrderData(); - - if (this.txData.price) { - this.total = this.txData.price.cloneWithTokens( - this.txData.price.getTokens().mul(this.txData.amount.getTokens()) - ); - } - - this.isLedger = user.userType === 'ledger'; - this.isKeeper = user.userType === 'wavesKeeper'; - - this.deferred.promise() - .then(signable => { - this.onLoad(signable); - }) - .catch(error => { - this.onError(error); - }); - - signable.getSignature() - .then(() => { - this.deferred.resolve(signable); - }) - .catch(error => { - this.deferred.reject(error); - }); - } - - /** - * @param {SIGN_TYPE} type - * @return string - */ - static getSignMode(type) { - switch (type) { - case SIGN_TYPE.CREATE_ORDER: - return 'create-order'; - case SIGN_TYPE.CANCEL_ORDER: - return 'cancel-order'; - case SIGN_TYPE.MATCHER_ORDERS: - return 'sign-matcher'; - default: - throw new Error('Wrong sign type!'); - } - } - - onClose() { - this.deferred.reject(); - } - - onLoad(signable) { - $mdDialog.hide(signable); - $scope.$destroy(); - } - - onError(error) { - $mdDialog.cancel(error); - $scope.$destroy(); - } - - parseOrderData() { - if (this.mode !== 'cancel-order') { - return null; - } - - this.order.type = (this.anyData && this.anyData.type) || ''; - this.order.pair = (this.anyData && this.anyData.pair) || ''; - this.order.amount = (this.anyData && this.anyData.amount) || ''; - } - - } - - return new SignByDeviceCtrl(this.signable, this.anyData); - }; - - controller.$inject = ['Base', '$scope', '$mdDialog', 'user']; - - angular.module('app.ui') - .controller('SignByDeviceCtrl', controller); -})(); diff --git a/src/modules/utils/modals/signByDevice/signByDevice.html b/src/modules/utils/modals/signByDevice/signByDevice.html deleted file mode 100644 index 78c0db892b..0000000000 --- a/src/modules/utils/modals/signByDevice/signByDevice.html +++ /dev/null @@ -1,144 +0,0 @@ -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    - -

    -
    -
    - -
    - -
    -
    -
    {{$ctrl.txId}}
    -
    - -
    - -
    - -
    - -
    -

    - - + - - - + - -

    - -
    - - — - - - — - -
    -
    - -
    -
    -
    - {{::$ctrl.txData.priceAsset.name}} -
    -
    -
    - -
    -
    -
    -
    {{::$ctrl.txId}}
    -
    - -
    -
    -
    -
    -
    -
    - -
    -
    -
    - -
    -
    - -
    -
    -
    -

    -
    - -
    -
    -
    -
    -
    {{::$ctrl.order.pair}}
    -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    {{::$ctrl.txId}}
    -
    -
    -
    -
    -
    {{ ::$ctrl.txData.timestamp | date:'dd-MM HH:mm:ss' }}
    -
    -
    -
    -
    -
    - -
    -
    - -
    diff --git a/src/modules/utils/modals/signByDevice/signByDevice.less b/src/modules/utils/modals/signByDevice/signByDevice.less deleted file mode 100644 index cd2bfd3dd9..0000000000 --- a/src/modules/utils/modals/signByDevice/signByDevice.less +++ /dev/null @@ -1,132 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; - -@tx-icon-size: 80px; - -.ledger-modal { - .icon-close { - right: 10px; - top: 10px; - position: absolute; - } - .device-img { - width: 278px; - height: 146px; - background: @ledger-step1; - position: relative; - display: block; - margin: 60px auto 20px calc(50% ~'- 193px'); - } - .ledger-icons { - height: @tx-icon-size; - width: @tx-icon-size; - margin: 0 auto 30px auto; - } - .create-order-amounts { - text-align: center; - padding: 0 0 30px 0; - border-bottom: 1px solid @color-basic-100; - margin-bottom: -1px; - position: relative; - z-index: 1; - } - .create-order-icon { - background: @transaction-icons; - background-repeat: no-repeat; - background-position-x: -160px; - background-size: auto @tx-icon-size * 2; - } - .create-order-cont { - border-bottom: 1px solid @color-basic-100; - } - .cancel-order-mode, - .create-order-mode { - padding-top: 60px; - } - .cancel-order-icon { - background: @cancelorder-icon; - } - .bottom-wrapper { - .loader { - position: relative; - } - } - - .matcher-mode { - .txinfo__row.one-line-border { - border-top: 1px solid @color-basic-100; - border-bottom: 1px solid @color-basic-100; - margin-top: 20px; - } - - .keeper { - .device-img { - width: 80px; - height: 80px; - display: block; - margin: 60px auto 30px auto; - background: url(/img/icons/keeper-icon.svg) center no-repeat; - } - } - - .display { - position: absolute; - width: 70px; - height: 26px; - margin: 0 auto; - text-align: center; - top: 99px; - left: 140px; - font-size: 7px; - font-family: @font-roboto-medium; - color: @color-submit-300; - - & > div { - height: 8px; - padding: 0 15px; - position: relative; - - &::before { - content: ''; - width: 7px; - height: 7px; - display: block; - position: absolute; - top: 50%; - } - - &:first-child { - &::before { - background: url(/img/icons/ledger-cancel.svg) center no-repeat; - left: 5px; - transform: translateY(60%); - } - } - - &:last-child { - &::before { - background: url(/img/icons/ledger-ok.svg) center no-repeat; - right: 7px; - transform: translateY(-50%); - } - } - } - } - - w-loader { - position: relative; - margin: 30px auto 0; - transform: translate(0) translate3d(0, 0, 0); - left: auto; - } - - .tx-id-wrapper { - padding-top: 10px; - } - - .tx-info { - display: inline-block; - padding-right: 40px; - } - } -} diff --git a/src/modules/utils/modals/signDeviceError/SignDeviceError.js b/src/modules/utils/modals/signDeviceError/SignDeviceError.js deleted file mode 100644 index cb2f7ab7c0..0000000000 --- a/src/modules/utils/modals/signDeviceError/SignDeviceError.js +++ /dev/null @@ -1,35 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param $scope - * @param {User} user - * @param {$mdDialog} $mdDialog - * @return {SignDeviceErrorCtrl} - */ - const controller = function (Base, $scope) { - - class SignDeviceErrorCtrl extends Base { - - constructor({ locals }) { - super($scope); - this.mode = locals.error; - this.userType = locals.userType; - this.userAddress = locals.address; - this.isLedger = this.userType === 'ledger'; - this.isKeeper = this.userType === 'wavesKeeper'; - this.isPrivateKey = this.userType === 'privateKey'; - this.loading = true; - } - - } - - return new SignDeviceErrorCtrl(this); - }; - - controller.$inject = ['Base', '$scope', '$mdDialog']; - - angular.module('app.ui') - .controller('SignDeviceError', controller); -})(); diff --git a/src/modules/utils/modals/signDeviceError/signDeviceError.html b/src/modules/utils/modals/signDeviceError/signDeviceError.html deleted file mode 100644 index c777481a6d..0000000000 --- a/src/modules/utils/modals/signDeviceError/signDeviceError.html +++ /dev/null @@ -1,91 +0,0 @@ -
    -
    - -
    -
    -

    -

    -
    - - - - - - -
    -
    - -
    -
    -

    -
    -
    - -
    -
    - - -
    -
    - - - -
    - -
    -
    -

    -
    -
    - -
    -
    - - - -
    - -
    -
    -

    -

    -
    - - - - - - -
    -
    - -
    -
    -

    -

    -
    - - - - - - -
    -
    - -
    -
    - -

    -
    -
    - -
    -
    - - - -
    - -
    diff --git a/src/modules/utils/modals/signDeviceError/signDeviceError.less b/src/modules/utils/modals/signDeviceError/signDeviceError.less deleted file mode 100644 index c9e267f96d..0000000000 --- a/src/modules/utils/modals/signDeviceError/signDeviceError.less +++ /dev/null @@ -1,30 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; - -.sign-error-modal { - max-width: 460px; - margin: 0 auto; - text-align: center; - - .icon-close { - right: 30px; - top: 10px; - position: absolute; - } - - .connect-mode { - margin-top: 60px; - } -} - -@media screen and (max-width: 480px) { - .sign-error-modal { - .buttons-wrapper { - flex-direction: column; - } - w-button { - margin-bottom: 20px; - width: 100%; - } - } -} diff --git a/src/modules/utils/modals/sponsored/SponsoredModalCtrl.js b/src/modules/utils/modals/sponsored/SponsoredModalCtrl.js deleted file mode 100644 index 2b8c71edab..0000000000 --- a/src/modules/utils/modals/sponsored/SponsoredModalCtrl.js +++ /dev/null @@ -1,207 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {typeof Base} Base - * @param {$rootScope.Scope} $scope - * @param {Waves} waves - * @param {BalanceWatcher} balanceWatcher - * @param {app.utils} utils - * @return {SponsoredModalCtrl} - */ - const controller = function (Base, $scope, waves, balanceWatcher, utils) { - - const { isEmpty } = require('ts-utils'); - const { SIGN_TYPE } = require('@waves/signature-adapter'); - const { Money } = require('@waves/data-entities'); - const ds = require('data-service'); - const analytics = require('@waves/event-sender'); - - class SponsoredModalCtrl extends Base { - - /** - * @type {number} - */ - step = 0; - /** - * @readonly - * @type {boolean} - */ - isCreateSponsored = null; - /** - * @type {string} - * @private - */ - assetId = null; - /** - * @type {Money} - */ - fee = null; - /** - * @type {Money} - */ - minSponsoredAssetFee = null; - /** - * @type {Money} - */ - assetBalance = null; - /** - * @type {Money} - * @private - */ - wavesBalance = null; - /** - * @type {args} - */ - signPending = false; - /** - * @type {Asset} - */ - asset = null; - /** - * @type {ISponsorshipTx} - * @private - */ - _tx = null; - /** - * @type {Array} - * @private - */ - _listeners = []; - - - constructor({ asset, isCreateSponsored }) { - super($scope); - this.assetId = asset.id; - this.asset = asset; - this.isCreateSponsored = isCreateSponsored; - - const { isVerified, isGateway, - isTokenomica, ticker, description } = utils.getDataFromOracles(asset.id); - this.isVerified = isVerified; - this.isGateway = isGateway; - this.isTokenomica = isTokenomica; - this.ticker = ticker || asset.ticker; - this.description = description || asset.description; - - if (isEmpty(this.assetId)) { - throw new Error('Wrong modal params!'); - } - - this.receive(balanceWatcher.change, this._updateBalances, this); - this._updateBalances(); - - this.observe(['fee', 'minSponsoredAssetFee'], this._createTx); - - this._updateFee(); - const signPendingListener = $scope.$on('signPendingChange', (event, data) => { - this.signPending = data; - }); - - this._listeners.push(signPendingListener); - } - - $onDestroy() { - super.$onDestroy(); - this._listeners.forEach(listener => listener()); - } - - getSignable() { - return this.signable; - } - - onConfirm() { - analytics.send({ name: 'Enable Sponsorship Continue Click', target: 'ui' }); - this.step++; - } - - onBack() { - this.step--; - } - - getSponsoredTx() { - return this._tx; - } - - /** - * @private - */ - _createTx() { - if (!this.fee || !this.minSponsoredAssetFee) { - this.signable = null; - return null; - } - - const { fee, minSponsoredAssetFee } = this; - const type = SIGN_TYPE.SPONSORSHIP; - const tx = waves.node.transactions.createTransaction({ - fee, - type, - minSponsoredAssetFee - }); - this.signable = ds.signature.getSignatureApi().makeSignable({ - type, - data: tx - }); - } - - _updateBalances() { - Promise.all([ - balanceWatcher.getBalanceByAssetId(WavesApp.defaultAssets.WAVES), - balanceWatcher.getBalanceByAssetId(this.assetId) - ]).then(([waves, asset]) => { - this.wavesBalance = waves; - this.assetBalance = asset; - this._updateAvailableFee(); - utils.safeApply($scope); - }); - } - - /** - * @private - */ - _updateFee() { - return this._getTxForFee() - .then(tx => waves.node.getFee(tx)) - .then(fee => { - this.fee = fee; - this._updateAvailableFee(); - }); - } - - /** - * @private - */ - _updateAvailableFee() { - if (this.fee && this.wavesBalance) { - this.canSendTransaction = this.wavesBalance.gte(this.fee); - } - } - - /** - * @private - */ - _getTxForFee() { - return Promise.resolve({ - type: SIGN_TYPE.SPONSORSHIP, - minSponsoredAssetFee: new Money(0, this.asset) - }); - } - - } - - return new SponsoredModalCtrl(this.locals); - }; - - controller.$inject = ['Base', '$scope', 'waves', 'balanceWatcher', 'utils']; - - angular.module('app.utils').controller('SponsoredModalCtrl', controller); -})(); - -/** - * @typedef {object} ISponsorshipTx - * @property {string} [id] - * @property {14} type - * @property {Money} fee - * @property {Money} minSponsoredAssetFee - */ diff --git a/src/modules/utils/modals/sponsored/sponsored.html b/src/modules/utils/modals/sponsored/sponsored.html deleted file mode 100644 index 9a607e3f50..0000000000 --- a/src/modules/utils/modals/sponsored/sponsored.html +++ /dev/null @@ -1,84 +0,0 @@ - - -
    - -
    - -
    -
    - -
    -
    -
    -
    {{::$ctrl.asset.id}}
    -
    - -
    -
    -
    {{::$ctrl.description}}
    -
    - -
    -
    -
    -
    - -
    - - - - -
    {{$ctrl.asset.displayName}} -
    - - - - - - - - - - -     - -
    - -
    - - -
    -
    - -
    -
    -
    - - - -
    -     - - - -     diff --git a/src/modules/utils/modals/sponsored/sponsored.less b/src/modules/utils/modals/sponsored/sponsored.less deleted file mode 100644 index 14ac96d47e..0000000000 --- a/src/modules/utils/modals/sponsored/sponsored.less +++ /dev/null @@ -1,54 +0,0 @@ -@import (reference) 'config'; - -.sponsorship { - - md-dialog-content { - padding: 0 40px; - } - - w-input-container { - position: relative; - - .w-input-wrap::after { - display: none; - } - - .currency { - max-width: 40px; - text-overflow: ellipsis; - text-transform: uppercase; - position: absolute; - top: 50%; - right: 15px; - transform: translateY(-50%); - overflow: hidden; - white-space: nowrap; - } - } - - &__line { - display: flex; - flex-direction: row; - justify-content: space-between; - border-bottom: 1px solid @color-basic-100; - border-top: 1px solid @color-basic-100; - padding: 5px 0; - align-items: center; - min-height: 38px; - - &.description { - padding: 13px 16px; - border: 1px dashed @color-basic-100; - border-radius: @border-radius; - background: @color-basic-50; - } - } -} - -@media screen and (max-width: 540px) { - html body md-dialog.sponsorship { - md-dialog-content { - padding: 0 20px; - } - } -} diff --git a/src/modules/utils/modals/startLeasing/StartLeasingCtrl.js b/src/modules/utils/modals/startLeasing/StartLeasingCtrl.js deleted file mode 100644 index aafd74097b..0000000000 --- a/src/modules/utils/modals/startLeasing/StartLeasingCtrl.js +++ /dev/null @@ -1,102 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param $scope - * @param {User} user - * @param {app.utils} utils - * @param {Waves} waves - * @param {app.i18n} i18n - * @return {StartLeasingCtrl} - */ - const controller = function (Base, $scope, user, utils, waves, i18n) { - - const { SIGN_TYPE } = require('@waves/signature-adapter'); - const ds = require('data-service'); - const analytics = require('@waves/event-sender'); - - class StartLeasingCtrl extends Base { - - /** - * @type {args} - */ - signPending = false; - /** - * @type {Array} - * @private - */ - _listeners = []; - - constructor() { - super($scope); - this.step = 0; - /** - * @type {string} - */ - this.title = i18n.translate('modal.startLease.title', 'app.utils'); - this.assetId = WavesApp.defaultAssets.WAVES; - this.recipient = ''; - this.amount = null; - - /** - * @type {string} - */ - this.nodeListLink = WavesApp.network.nodeList; - - waves.node.getFee({ type: SIGN_TYPE.LEASE }) - .then((money) => { - this.fee = money; - }); - - waves.node.assets.balance(this.assetId) - .then((balance) => { - this.balance = balance.available; - }); - - const signPendingListener = $scope.$on('signPendingChange', (event, data) => { - this.signPending = data; - }); - - this._listeners.push(signPendingListener); - } - - $onDestroy() { - super.$onDestroy(); - this._listeners.forEach(listener => listener()); - } - - back() { - this.step--; - } - - sign() { - analytics.send({ name: 'Leasing Popup Start Click', target: 'ui' }); - const tx = waves.node.transactions.createTransaction({ - recipient: this.recipient, - fee: this.fee, - amount: this.amount, - type: SIGN_TYPE.LEASE - }); - - return ds.signature.getSignatureApi().makeSignable({ - type: tx.type, - data: tx - }); - } - - next(signable) { - this.signable = signable; - this.step++; - } - - } - - return new StartLeasingCtrl(); - }; - - controller.$inject = ['Base', '$scope', 'user', 'utils', 'waves', 'i18n', 'modalManager', '$mdDialog']; - - angular.module('app.ui') - .controller('StartLeasingCtrl', controller); -})(); diff --git a/src/modules/utils/modals/startLeasing/startLeasing.html b/src/modules/utils/modals/startLeasing/startLeasing.html deleted file mode 100644 index 013c2d0401..0000000000 --- a/src/modules/utils/modals/startLeasing/startLeasing.html +++ /dev/null @@ -1,126 +0,0 @@ - - - -
    -
    -
    -
    -
    -
    -
    - -
    {{$ctrl.balance.asset.name}}
    -
    -
    - -  {{$ctrl.balance.asset.displayName}} -
    -
    -
    -
    -
    -
    - - - -
    - - - - - - - - - - - -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - -
    -
    - -
    -
    -
    - - - -
    -     - - - -     -     - -
    - - Icon/80/error-80-error500 - - - - - -
    -

    -
    - -
    -     diff --git a/src/modules/utils/modals/startLeasing/startLeasing.less b/src/modules/utils/modals/startLeasing/startLeasing.less deleted file mode 100644 index 6526dadbae..0000000000 --- a/src/modules/utils/modals/startLeasing/startLeasing.less +++ /dev/null @@ -1,115 +0,0 @@ -@import (reference) "../../../app/less/app-icons"; -@import (reference) 'config'; -@import (reference) 'icons'; - -md-dialog.start-leasing { - md-dialog-content { - //padding-top: 40px; - } - - .flex-row { - display: flex; - flex-direction: row; - align-items: center; - - &.split-half { - justify-content: space-between; - } - } - - .row { - margin-bottom: 20px; - position: relative; - } - - .flex-row-title { - display: flex; - align-items: center; - - div { - flex-grow: 1; - } - - a { - flex-grow: 0; - margin: 4px 0; - } - } - - .input-like { - position: relative; - padding: 0 20px; - border-radius: @border-radius; - width: 100%; - display: flex; - flex-direction: row; - align-items: center; - } - - .complete-icon { - width: 80px; - height: 80px; - margin: 30px auto 20px; - background-image: url(/img/icons/check.svg); - background-repeat: no-repeat; - background-position: center; - } - - .details { - display: block; - width: 224px; - margin: auto; - } - - .list { - border-top: 1px solid @color-basic-200; - border-bottom: 1px solid @color-basic-200; - - .split-half { - height: 44px; - display: flex; - align-items: center; - justify-content: space-between; - - &:first-child { - border-bottom: 1px solid @color-basic-200; - } - } - } - - .button-container { - display: flex; - flex-direction: row; - justify-content: space-between; - width: 100%; - - & > w-button { - width: calc(~'50% - 5px'); - } - } - - .icon { - width: 80px; - height: 80px; - margin: 10px auto 0; - background-size: 100%; - .icon-tx-lease(); - } -} - -@media screen and (max-width: 768px) { - md-dialog.start-leasing { - .flex-row.split-half { - white-space: nowrap; - font-size: 12px; - } - } -} - -@media screen and (max-width: 480px) { - md-dialog.start-leasing { - w-input .w-input-wrap input[type="text"].big { - font-size: 12px; - } - } -} diff --git a/src/modules/utils/modals/transactionInfo/TransactionInfoCtrl.js b/src/modules/utils/modals/transactionInfo/TransactionInfoCtrl.js deleted file mode 100644 index 767de300a0..0000000000 --- a/src/modules/utils/modals/transactionInfo/TransactionInfoCtrl.js +++ /dev/null @@ -1,140 +0,0 @@ -(function () { - 'use strict'; - - /** - * - * @param Base - * @param {$rootScope.Scope} $scope - * @param {ExplorerLinks} explorerLinks - * @param {Waves} waves - * @param {IPollCreate} createPoll - * @return {TransactionInfoCtrl} - */ - const controller = function (Base, $scope, explorerLinks, waves, createPoll) { - - class TransactionInfoCtrl extends Base { - - constructor({ transactionId }) { - super($scope); - this.timer = null; - this.id = transactionId; - this._getData(); - } - - $onDestroy() { - clearTimeout(this.timer); - super.$onDestroy(); - } - - /** - * @return Promise - * @private - */ - _getData() { - waves.node.transactions.getAlways(this.id) - .then(transaction => this._parseTransaction(transaction)) - .catch(() => this._onError()) - .then(tx => this._setData(tx)); - } - - /** - * @param transaction - * @return {{confirmations: number, transaction: *}|Promise<{confirmations: number, transaction: *}>} - * @private - */ - _parseTransaction(transaction) { - if (!transaction.isUTX) { - return waves.node.height().then((height) => ({ - confirmations: height - transaction.height, - transaction - })); - } else { - return { - confirmations: -1, - transaction - }; - } - } - - /** - * @private - */ - _onError() { - clearTimeout(this.timer); - - if (!this.wasDestroed) { - this.timer = setTimeout(() => this._getData(), 2000); - } - } - - /** - * @param tx - * @private - */ - _setData(tx) { - if (!this.wasDestroed && tx) { - - const { transaction, confirmations } = tx; - - this.transaction = transaction; - this.confirmations = confirmations; - this.confirmed = !transaction.isUTX; - this.explorerLink = explorerLinks.getTxLink(transaction.id); - - try { - this.signable = ds.signature.getSignatureApi().makeSignable({ - type: transaction.type, - data: transaction - }); - - createPoll(this, this._getHeight, this._setHeight, 1000); - } catch (e) { - this.signable = null; - } - - } - - $scope.$apply(); - } - - /** - * @return {Promise} - * @private - */ - _getHeight() { - const promiseList = [waves.node.height()]; - if (!this.confirmed) { - promiseList.push(waves.node.transactions.getAlways(this.id)); - } - return Promise.all(promiseList); - } - - /** - * @param {number} height - * @param tx - * @private - */ - _setHeight([height, tx]) { - if (tx) { - Object.assign(this.transaction, tx); - this.confirmed = !tx.isUTX; - if (!this.confirmed) { - this.confirmations = 0; - } else { - this.confirmations = height - tx.height; - } - } else { - this.confirmations = height - this.transaction.height; - } - $scope.$apply(); - } - - } - - return new TransactionInfoCtrl(this.locals); - }; - - controller.$inject = ['Base', '$scope', 'explorerLinks', 'waves', 'createPoll']; - - angular.module('app.utils').controller('TransactionInfoCtrl', controller); -})(); diff --git a/src/modules/utils/modals/transactionInfo/transaction-info.modal.html b/src/modules/utils/modals/transactionInfo/transaction-info.modal.html deleted file mode 100644 index 1cf18e9999..0000000000 --- a/src/modules/utils/modals/transactionInfo/transaction-info.modal.html +++ /dev/null @@ -1,37 +0,0 @@ - -
    - -
    -
    - -
    -
    - - - -
    -
    -
    {{$ctrl.confirmations}}
    -
    - -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    -     -     diff --git a/src/modules/utils/modals/tryDesktop/TryDesktopCtrl.js b/src/modules/utils/modals/tryDesktop/TryDesktopCtrl.js deleted file mode 100644 index c9316354e3..0000000000 --- a/src/modules/utils/modals/tryDesktop/TryDesktopCtrl.js +++ /dev/null @@ -1,50 +0,0 @@ -(function () { - 'use strict'; - - const locationHref = location.href; - const analytics = require('@waves/event-sender'); - - const controller = function (Base, $scope, storage, $element) { - - class TryDesktopCtrl extends Base { - - constructor() { - super($scope); - - /** - * @type {boolean} - */ - this.save = false; - const url = new URL(locationHref); - const href = `waves://${url.pathname}${url.search}${url.hash}`.replace('///', '//'); - - $element.find('a').attr('href', href); - } - - onOpenLink() { - analytics.send({ name: 'Onboarding Popup Official Site Click', target: 'ui' }); - } - - tryWeb() { - this._saveChoice('web'); - } - - tryDesktop() { - this._saveChoice('desktop'); - } - - _saveChoice(mode) { - if (this.save) { - storage.save('openClientMode', mode); - } - } - - } - - return new TryDesktopCtrl(); - }; - - controller.$inject = ['Base', '$scope', 'storage', '$element']; - - angular.module('app.utils').controller('TryDesktopCtrl', controller); -})(); diff --git a/src/modules/utils/modals/tryDesktop/tryDesktop.html b/src/modules/utils/modals/tryDesktop/tryDesktop.html deleted file mode 100644 index 19c4c0b936..0000000000 --- a/src/modules/utils/modals/tryDesktop/tryDesktop.html +++ /dev/null @@ -1,29 +0,0 @@ -
    - -

    - - -
    -     - -
    - - - - - - -
    - -
    - - -
    diff --git a/src/modules/utils/modals/tryDesktop/tryDesktopModal.less b/src/modules/utils/modals/tryDesktop/tryDesktopModal.less deleted file mode 100644 index fda192d185..0000000000 --- a/src/modules/utils/modals/tryDesktop/tryDesktopModal.less +++ /dev/null @@ -1,46 +0,0 @@ -@import (reference) 'icons'; -@import (reference) 'config'; - -.try-desktop-modal { - padding-top: 40px; - - &__icon { - width: 100%; - height: 80px; - background: @modal-try-desktop-icon no-repeat center bottom; - } - - &__title { - font-weight: normal; - } - - &__center { - text-align: center; - } - - &__label { - display: inline-block; - vertical-align: top; - margin: 0; - } - - &__flex { - display: flex; - label { - flex-grow: 1; - } - } -} - -@media screen and (max-width: 480px) { - .try-desktop-modal { - .buttons-wrapper { - flex-direction: column; - } - - &__button { - min-width: 100%; - margin-bottom: 10px; - } - } -} diff --git a/src/modules/utils/modals/tutorialModals/TutorialModalsCtrl.js b/src/modules/utils/modals/tutorialModals/TutorialModalsCtrl.js deleted file mode 100644 index 579961018e..0000000000 --- a/src/modules/utils/modals/tutorialModals/TutorialModalsCtrl.js +++ /dev/null @@ -1,29 +0,0 @@ -(function () { - 'use strict'; - - const controller = function (Base, $scope, modalManager) { - - const analytics = require('@waves/event-sender'); - - class TutorialModalsCtrl extends Base { - - constructor() { - super($scope); - this.isDesktop = WavesApp.isDesktop(); - this.isWeb = WavesApp.isWeb(); - analytics.send({ name: 'Onboarding SEED Popup Show', target: 'ui' }); - } - - showSeedBackupModal() { - modalManager.showSeedBackupModal(); - } - - } - - return new TutorialModalsCtrl(); - }; - - controller.$inject = ['Base', '$scope', 'modalManager']; - - angular.module('app.utils').controller('TutorialModalsCtrl', controller); -})(); diff --git a/src/modules/utils/modals/tutorialModals/tutorialModals.html b/src/modules/utils/modals/tutorialModals/tutorialModals.html deleted file mode 100644 index 72fdf7e10f..0000000000 --- a/src/modules/utils/modals/tutorialModals/tutorialModals.html +++ /dev/null @@ -1,133 +0,0 @@ - -
    - - - - -
    -

    - -

    - -
    -
    - -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    - - - - - - - - -     -     - - - -
    -

    - -

    - -
    - -
    - -
    -
    -
    -
    - -
    -
    -
    - -
    -
    -
    - -
    -
    -
    -
    -
    - -
    - - - - - - -
    - -     -     - - - - -
    -

    - -

    - -
    - -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    - - - - - - -
    - -     -     -     -     diff --git a/src/modules/utils/modals/tutorialModals/tutorialModals.less b/src/modules/utils/modals/tutorialModals/tutorialModals.less deleted file mode 100644 index 12c66a354c..0000000000 --- a/src/modules/utils/modals/tutorialModals/tutorialModals.less +++ /dev/null @@ -1,183 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; -@import (reference) '../../../app/less/typography'; - -.important-information { - position: absolute; - right: 0; - min-width: 170px; - top: 43px; -} - -@media screen and (max-width: 480px) { - w-info-tooltip { - .important-information { - left: 20px; - right: auto; - .tooltip { - transform: translate(-10px, -6px); - &::before { - left: 13px; - } - } - } - } -} - -.flex-cols { - display: flex; - flex-wrap: wrap; - justify-content: space-between; -} - -.tutorial-modals { - .cell { - background-repeat: no-repeat; - flex-basis: calc(50% ~'- 10px'); - max-width: calc(50% ~'- 10px'); - min-height: 40px; - white-space: pre-wrap; - } - .cell-001 { - background: @modal-anonymus-icon no-repeat; - } - .cell-002 { - background: @modal-password-icon no-repeat; - } - .cell-003 { - background: @modal-backup-icon no-repeat; - } - .cell-004 { - background: @modal-paper-icon no-repeat; - } - .cell-005 { - background: @modal-url-icon no-repeat; - } - .cell-006 { - background: @modal-plugin-icon no-repeat; - } - .cell-007 { - background: @modal-mail-icon no-repeat; - } - .cell-008 { - background: @modal-refresh-icon no-repeat; - } - .cell-009 { - background: @modal-os-icon no-repeat; - } - .cell-010 { - background: @modal-wifi-icon no-repeat; - } -} - -body md-dialog.tutorial-modals { - .mobile-only { - display: none; - } - - h1 { - padding: 40px 0; - margin-top: 0; - text-align: center; - width: 100%; - font-size: 34px; - color: @color-black; - } - - .cell { - padding-left: 60px; - position: relative; - } - - img.computer { - margin-right: 40px; - } -} - -@media screen and (min-width: 800px) { - body md-dialog.tutorial-modals { - width: 780px; - min-width: 780px; - max-height: 96vh; - top: auto; - - md-dialog-content { - padding: 20px 60px 0px; - - &::after { - height: 60px; - } - } - - .content-wrapper { - min-height: 550px; - } - } -} - -@media screen and (max-width: 800px) { - - body md-dialog.tutorial-modals { - - md-dialog-content { - padding: 50px 30px 0px; - - &::after { - height: 30px; - } - } - - .flex-cols { - flex-direction: column; - } - - .buttons-wrapper { - flex-direction: column; - - w-button { - &:last-child { - margin-top: 20px; - } - } - - .fake-button.long, - w-button.long { - min-width: 100%; - } - } - - h1 { - padding: 0 0 10px 0; - } - - .desktop-only { - display: none; - } - - .mobile-only { - display: block; - } - - img.computer { - margin: 20px auto; - display: block; - } - - .flex { - flex-direction: column; - } - } -} - -@media screen and (max-width: 480px) { - body md-dialog.tutorial-modals { - img.computer { - transform: scale(.75); - margin: 0 auto 20px auto; - } - } - - body w-button.mobile-mid-fsize > *.big { - font-size: 14px; - } -} diff --git a/src/modules/utils/services/BaseAssetService.js b/src/modules/utils/services/BaseAssetService.js deleted file mode 100644 index e1c6c0e232..0000000000 --- a/src/modules/utils/services/BaseAssetService.js +++ /dev/null @@ -1,49 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {User} user - * @param {app.utils.decorators} decorators - * @param {Waves} waves - * @return {BaseAssetService} - */ - const factory = function (user, decorators, waves) { - - class BaseAssetService { - - /** - * @return {string} - */ - getBaseAssetId() { - return user.getSetting('baseAssetId'); - } - - /** - * @return {Promise} - */ - getBaseAsset() { - return waves.node.assets.getAsset(user.getSetting('baseAssetId')); - } - - /** - * @param {Money} money - * @return {Promise} - */ - convertToBaseAsset(money) { - return this.getBaseAsset().then((baseAsset) => { - // TODO : change to getRateByDate() - return waves.utils.getRateApi(money.asset.id, baseAsset.id) - .then((api) => api.exchange(money.getTokens())) - .then((balance) => ds.moneyFromTokens(balance, baseAsset)); - }); - } - - } - - return new BaseAssetService(); - }; - - factory.$inject = ['user', 'decorators', 'waves']; - - angular.module('app.utils').factory('baseAssetService', factory); -})(); diff --git a/src/modules/utils/services/DevDecorator.js b/src/modules/utils/services/DevDecorator.js deleted file mode 100644 index 257cdf807e..0000000000 --- a/src/modules/utils/services/DevDecorator.js +++ /dev/null @@ -1,64 +0,0 @@ -// (function () { -// 'use strict'; -// -// -// /** -// * @param {app.utils} utils -// */ -// const factory = function (utils) { -// -// class DevDecorator { -// -// constructor() { -// window.devDecorators = this; -// this._cache = Object.create(null); -// this._cache.median = Object.create(null); -// } -// -// time(target, key, descriptor) { -// const origin = descriptor.value; -// descriptor.value = function (...args) { -// console.time(`${target.constructor.name}.${key}`); -// const result = origin.call(this, ...args); -// console.timeEnd(`${target.constructor.name}.${key}`); -// return result; -// }; -// } -// -// median(target, key, descriptor) { -// const cache = this._cache.median; -// if (!cache[target.constructor.name]) { -// cache[target.constructor.name] = Object.create(null); -// } -// if (!cache[target.constructor.name][key]) { -// cache[target.constructor.name][key] = []; -// } -// const origin = descriptor.value; -// descriptor.value = function (...args) { -// const time = Date.now(); -// const result = origin.call(this, ...args); -// cache[target.constructor.name][key].push(Date.now() - time); -// return result; -// }; -// } -// -// logMedian() { -// const cache = this._cache.median; -// Object.keys(cache).forEach((className) => { -// Object.keys(cache[className]).forEach((method) => { -// cache[className][method].sort((a, b) => a - b); -// const index = Math.round(cache[className][method].length / 2); -// console.log(`${className}.${method}: ${cache[className][method][index]}`); -// }); -// }); -// } -// -// } -// -// const item = new DevDecorator(); -// return utils.bind(item); -// }; -// -// angular.module('app.utils') -// .factory('devDecorators', factory); -// })(); diff --git a/src/modules/utils/services/Ease.js b/src/modules/utils/services/Ease.js deleted file mode 100644 index 6359f0e0a8..0000000000 --- a/src/modules/utils/services/Ease.js +++ /dev/null @@ -1,320 +0,0 @@ -/* eslint-disable */ -(function () { - 'use strict'; - - const factory = function () { - - /** - * @name Ease - */ - - const Ease = { - - /** - * @name Ease#linear - * @param {number} t - * @return {number} - */ - linear: function (t) { - return t; - }, - - get: function (amount) { - if (amount < -1) { - amount = -1; - } - if (amount > 1) { - amount = 1; - } - return function (t) { - if (amount === 0) { - return t; - } - if (amount < 0) { - return t * (t * -amount + 1 + amount); - } - return t * ((2 - t) * amount + (1 - amount)); - }; - }, - - getPowIn: function (pow) { - return function (t) { - return Math.pow(t, pow); - }; - }, - - - /** - * Configurable exponential ease. - * @name Ease#getPowOut - * @param pow The exponent to use (ex. 3 would return a cubic ease). - **/ - getPowOut: function (pow) { - return function (t) { - return 1 - Math.pow(1 - t, pow); - }; - }, - - - /** - * Configurable exponential ease. - * @name Ease#getPowInOut - * @param pow The exponent to use (ex. 3 would return a cubic ease). - **/ - getPowInOut: function (pow) { - return function (t) { - if ((t *= 2) < 1) return 0.5 * Math.pow(t, pow); - return 1 - 0.5 * Math.abs(Math.pow(2 - t, pow)); - }; - }, - - - /** - * @name Ease#sineIn - **/ - sineIn: function (t) { - return 1 - Math.cos(t * Math.PI / 2); - }, - - /** - * @name Ease#sineOut - **/ - sineOut: function (t) { - return Math.sin(t * Math.PI / 2); - }, - - /** - * @name Ease#sineInOut - **/ - sineInOut: function (t) { - return -0.5 * (Math.cos(Math.PI * t) - 1); - }, - - /** - * Configurable "back in" ease. - * @name Ease#getBackIn - * @param amount The strength of the ease. - **/ - getBackIn: function (amount) { - return function (t) { - return t * t * ((amount + 1) * t - amount); - }; - }, - - /** - * Configurable "back out" ease. - * @name Ease#getBackOut - * @param amount The strength of the ease. - **/ - getBackOut: function (amount) { - return function (t) { - return (--t * t * ((amount + 1) * t + amount) + 1); - }; - }, - - /** - * Configurable "back in out" ease. - * @name Ease#getBackInOut - * @param amount The strength of the ease. - **/ - getBackInOut: function (amount) { - amount *= 1.525; - return function (t) { - if ((t *= 2) < 1) return 0.5 * (t * t * ((amount + 1) * t - amount)); - return 0.5 * ((t -= 2) * t * ((amount + 1) * t + amount) + 2); - }; - }, - - - /** - * @name Ease#circIn - **/ - circIn: function (t) { - return -(Math.sqrt(1 - t * t) - 1); - }, - - /** - * @name Ease#circOut - **/ - circOut: function (t) { - return Math.sqrt(1 - (--t) * t); - }, - - /** - * @name Ease#circInOut - **/ - circInOut: function (t) { - if ((t *= 2) < 1) return -0.5 * (Math.sqrt(1 - t * t) - 1); - return 0.5 * (Math.sqrt(1 - (t -= 2) * t) + 1); - }, - - /** - * @name Ease#bounceIn - **/ - bounceIn: function (t) { - return 1 - Ease.bounceOut(1 - t); - }, - - /** - * @name Ease#bounceOut - **/ - bounceOut: function (t) { - if (t < 1 / 2.75) { - return (7.5625 * t * t); - } else if (t < 2 / 2.75) { - return (7.5625 * (t -= 1.5 / 2.75) * t + 0.75); - } else if (t < 2.5 / 2.75) { - return (7.5625 * (t -= 2.25 / 2.75) * t + 0.9375); - } else { - return (7.5625 * (t -= 2.625 / 2.75) * t + 0.984375); - } - }, - - /** - * @name Ease#bounceInOut - **/ - bounceInOut: function (t) { - if (t < 0.5) return Ease.bounceIn(t * 2) * .5; - return Ease.bounceOut(t * 2 - 1) * 0.5 + 0.5; - }, - - - /** - * Configurable elastic ease. - * @name Ease#getElasticIn - * @param amplitude - * @param period - **/ - getElasticIn: function (amplitude, period) { - const pi2 = Math.PI * 2; - return function (t) { - if (t == 0 || t == 1) return t; - const s = period / pi2 * Math.asin(1 / amplitude); - return -(amplitude * Math.pow(2, 10 * (t -= 1)) * Math.sin((t - s) * pi2 / period)); - }; - }, - - /** - * Configurable elastic ease. - * @name Ease#getElasticOut - * @param amplitude - * @param period - **/ - getElasticOut: function (amplitude, period) { - const pi2 = Math.PI * 2; - return function (t) { - if (t == 0 || t == 1) return t; - const s = period / pi2 * Math.asin(1 / amplitude); - return (amplitude * Math.pow(2, -10 * t) * Math.sin((t - s) * pi2 / period) + 1); - }; - }, - /** - * Configurable elastic ease. - * @name Ease#getElasticInOut - * @param amplitude - * @param period - **/ - getElasticInOut: function (amplitude, period) { - const pi2 = Math.PI * 2; - return function (t) { - const s = period / pi2 * Math.asin(1 / amplitude); - if ((t *= 2) < 1) return -0.5 * (amplitude * Math.pow(2, 10 * (t -= 1)) * Math.sin((t - s) * pi2 / period)); - return amplitude * Math.pow(2, -10 * (t -= 1)) * Math.sin((t - s) * pi2 / period) * 0.5 + 1; - }; - } - }; - - - /** - * @name Ease#backOut - **/ - Ease.backOut = Ease.getBackOut(1.7); - - /** - * @name Ease#backIn - **/ - Ease.backIn = Ease.getBackIn(1.7); - - /** - * @name Ease#backInOut - **/ - Ease.backInOut = Ease.getBackInOut(1.7); - - /** - * @name Ease#elasticIn - **/ - Ease.elasticIn = Ease.getElasticIn(1, 0.3); - - /** - * @name Ease#elasticInOut - **/ - Ease.elasticInOut = Ease.getElasticInOut(1, 0.3 * 1.5); - - /** - * @name Ease#elasticOut - **/ - Ease.elasticOut = Ease.getElasticOut(1, 0.3); - - /** - * @name Ease#quadIn - **/ - Ease.quadIn = Ease.getPowIn(2); - - /** - * @name Ease#quadOut - **/ - Ease.quadOut = Ease.getPowOut(2); - /** - * @name Ease#quadInOut - **/ - Ease.quadInOut = Ease.getPowInOut(2); - - - /** - * @name Ease#cubicIn - **/ - Ease.cubicIn = Ease.getPowIn(3); - /** - * @name Ease#cubicOut - **/ - Ease.cubicOut = Ease.getPowOut(3); - /** - * @name Ease#cubicInOut - **/ - Ease.cubicInOut = Ease.getPowInOut(3); - - /** - * @name Ease#quartIn - **/ - Ease.quartIn = Ease.getPowIn(4); - /** - * @name Ease#quartOut - **/ - Ease.quartOut = Ease.getPowOut(4); - /** - * @name Ease#quartInOut - **/ - Ease.quartInOut = Ease.getPowInOut(4); - - - /** - * @name Ease#quintIn - **/ - Ease.quintIn = Ease.getPowIn(5); - /** - * @name Ease#quintOut - **/ - Ease.quintOut = Ease.getPowOut(5); - /** - * @name Ease#quintInOut - **/ - Ease.quintInOut = Ease.getPowInOut(5); - - return Ease; - }; - - factory.$inject = []; - - angular.module('app.utils').factory('ease', factory); -})(); -/* eslint-enable */ diff --git a/src/modules/utils/services/ExplorerLinks.js b/src/modules/utils/services/ExplorerLinks.js deleted file mode 100644 index ae36f42ad8..0000000000 --- a/src/modules/utils/services/ExplorerLinks.js +++ /dev/null @@ -1,23 +0,0 @@ -(function () { - 'use strict'; - - const BASE_URL = WavesApp.network.explorer; - const TX_PREFIX = 'tx'; - - /** - * @return {ExplorerLinks} - */ - const factory = function () { - class ExplorerLinks { - - getTxLink(transactionId) { - return `${BASE_URL}/${TX_PREFIX}/${transactionId}`; - } - - } - - return new ExplorerLinks(); - }; - - angular.module('app.utils').factory('explorerLinks', factory); -})(); diff --git a/src/modules/utils/services/MediaStream.js b/src/modules/utils/services/MediaStream.js deleted file mode 100644 index 3b9056c44f..0000000000 --- a/src/modules/utils/services/MediaStream.js +++ /dev/null @@ -1,107 +0,0 @@ -(function () { - 'use strict'; - - const RESOLUTIONS = { - FULL_HD: { width: 1920, height: 1080 }, - HD: { width: 1280, height: 720 }, - VGA: { width: 640, height: 480 }, - QVGA: { width: 320, height: 240 } - }; - - /** - * @name app.utils.mediaStream - */ - - /** - * @param $q - * @return {app.utils.mediaStream} - */ - const factory = function ($q) { - - class MediaStream { - - constructor(stream) { - this.stream = stream; - } - - stop() { - this.stream.getTracks()[0].stop(); - } - - } - - function getFacingBackCamera(devices) { - let facingBackCamera = devices.find((device) => device.label.includes('back')); - - if (!facingBackCamera) { - const videoInputDevices = devices.filter((device) => device.kind === 'videoinput'); - // Android devices facing back camera is usually placed later in array of devices. - facingBackCamera = videoInputDevices[videoInputDevices.length - 1]; - } - - return facingBackCamera || null; - } - - function getConstraints(deviceList, resolution) { - const constraints = { - video: { - width: { exact: resolution.width }, - height: { exact: resolution.height } - } - }; - - if (navigator.mediaDevices.getSupportedConstraints().facingMode) { - constraints.video.facingMode = 'environment'; - } else { - const deviceInfo = getFacingBackCamera(deviceList); - constraints.video.deviceId = { exact: deviceInfo.deviceId }; - } - - - return constraints; - } - - return { - /** - * @name app.utils.mediaStream#create - * @return {Promise} - */ - create() { - return $q((resolve, reject) => { - const handler = function (stream) { - resolve(new MediaStream(stream)); - }; - - const getUserMedia = deviceList => { - const mediaDevices = navigator.mediaDevices; - - const reverse = resolution => ({ width: resolution.height, height: resolution.width }); - - const checkResolution = res => { - return mediaDevices.getUserMedia(getConstraints(deviceList, res)) - .catch(() => mediaDevices.getUserMedia(getConstraints(deviceList, reverse(res)))); - }; - - return checkResolution(RESOLUTIONS.FULL_HD) - .catch(() => checkResolution(RESOLUTIONS.HD)) - .catch(() => checkResolution(RESOLUTIONS.VGA)) - .catch(() => checkResolution(RESOLUTIONS.QVGA)); - }; - - if (!navigator.mediaDevices) { - return reject(new Error('navigator.mediaDevices is undefined')); - } - - navigator.mediaDevices.enumerateDevices() - .then(getUserMedia) - .then(handler, reject); - }); - } - }; - }; - - factory.$inject = ['$q']; - - angular.module('app.utils') - .factory('mediaStream', factory); -})(); diff --git a/src/modules/utils/services/Storage.js b/src/modules/utils/services/Storage.js index f589bf567a..a6da492fa5 100644 --- a/src/modules/utils/services/Storage.js +++ b/src/modules/utils/services/Storage.js @@ -9,7 +9,6 @@ * @param {storageSelect} storageSelect * @param {DefaultSettings} defaultSettings * @param {StorageDataConverter} storageDataConverter - * @param {$injector} $injector */ const factory = function ( $q, @@ -18,8 +17,7 @@ state, storageSelect, defaultSettings, - storageDataConverter, - $injector + storageDataConverter ) { const usedStorage = storageSelect(); @@ -266,18 +264,11 @@ constructor() { usedStorage.init(); + this._memStore = {}; this._isNewDefer = $q.defer(); this._canWrite = $q.defer(); this._activeWrite = Promise.resolve(); - if (WavesApp.isDesktop() && utils.isVersionLte('1.4.0')) { - setTimeout(() => { - $injector.get('$state').go('desktopUpdate'); - }, 1000); - this._activeWrite = $q.defer(); - return this; - } - this.load('lastVersion') .then((version) => { this._canWrite.resolve(); @@ -305,7 +296,10 @@ save(key, value) { return this._canWrite.promise.then(() => { this._activeWrite = this._activeWrite - .then(() => utils.when(usedStorage.write(key, value))) + .then(() => { + this._memStore[key] = value; + return value; + }) .then((data) => { this.change.dispatch(); return data; @@ -315,11 +309,18 @@ } load(key) { - return utils.when(usedStorage.read(key)); + return utils.when((() => { + if (this._memStore[key]) { + return Promise.resolve(this._memStore[key]); + } + return usedStorage.read(key); + })()); } clear() { - return this._canWrite.promise.then(() => utils.when(usedStorage.clear())); + return this._canWrite.promise.then(() => utils.when(() => { + this._memStore = {}; + })); } } @@ -330,7 +331,7 @@ factory.$inject = [ '$q', 'utils', 'migration', 'state', 'storageSelect', 'defaultSettings', - 'storageDataConverter', '$injector' + 'storageDataConverter' ]; angular.module('app.utils') diff --git a/src/modules/utils/services/gateways/CoinomatCardService.js b/src/modules/utils/services/gateways/CoinomatCardService.js deleted file mode 100644 index 1aba614f80..0000000000 --- a/src/modules/utils/services/gateways/CoinomatCardService.js +++ /dev/null @@ -1,117 +0,0 @@ -(function () { - 'use strict'; - - const CARD_GATEWAYS = { - [WavesApp.defaultAssets.WAVES]: 'WAVES' - }; - - const PATH = `${WavesApp.network.coinomat}/api/v2/indacoin`; - - // That is used to access values from `**/locales/*.json` files - const KEY_NAME_PREFIX = 'coinomat'; - - /** - * @returns {CoinomatCardService} - */ - const factory = function () { - - class CoinomatCardService { - - getAll() { - return CARD_GATEWAYS; - } - - /** - * @param {Asset} crypto - * @param {string} wavesAddress - * @param {Array} fiatList - * @return {*} - */ - getFiatWithLimits(crypto, wavesAddress, fiatList) { - CoinomatCardService._assertAsset(crypto); - const to = CARD_GATEWAYS[crypto.id]; - return Promise.all(fiatList.map((fiat) => { - return this._loadBuyLimits(to, fiat.fiatCode, wavesAddress).then((limits) => { - return { ...fiat, ...limits }; - }); - })); - } - - /** - * @param {Asset} crypto - * @param {string} fiat - * @param {string} wavesAddress - * @param {number} fiatAmount - * @return {Promise} - */ - getApproximateCryptoAmount(crypto, fiat, wavesAddress, fiatAmount) { - CoinomatCardService._assertAsset(crypto); - return $.get(`${PATH}/rate.php`, { - crypto: CARD_GATEWAYS[crypto.id], - fiat: fiat, - address: wavesAddress, - amount: fiatAmount - }); - } - - /** - * @param {Asset} crypto - * @param {string} fiat - * @param {string} wavesAddress - * @param {number} fiatAmount - * @return {string} - */ - getCardBuyLink(crypto, fiat, wavesAddress, fiatAmount) { - CoinomatCardService._assertAsset(crypto); - const to = CARD_GATEWAYS[crypto.id]; - return `${PATH}/buy.php?crypto=${to}&fiat=${fiat}&address=${wavesAddress}&amount=${fiatAmount}`; - } - - /** - * @param {Asset} asset - * @return {IGatewaySupportMap} - */ - getSupportMap(asset) { - if (CARD_GATEWAYS[asset.id]) { - return { card: true }; - } - } - - getAssetKeyName(asset) { - return `${KEY_NAME_PREFIX}${CARD_GATEWAYS[asset.id].gateway}`; - } - - /** - * @param {string} to - * @param {string} from - * @param {string} recipientAddress - * @return {Promise} - * @private - */ - _loadBuyLimits(to, from, recipientAddress) { - return $.get(`${PATH}/limits.php`, { // TODO Refactor ro ds.fetch - crypto: to, - fiat: from, - address: recipientAddress - }).then((res) => { - try { - return JSON.parse(res); - } catch (e) { - return {}; - } - }); - } - - static _assertAsset(assetId) { - if (!CARD_GATEWAYS[assetId]) { - throw new Error('Asset is not supported by Coinomat'); - } - } - - } - - return new CoinomatCardService(); - }; - - angular.module('app.utils').factory('coinomatCardService', factory); -})(); diff --git a/src/modules/utils/services/gateways/CoinomatSepaService.js b/src/modules/utils/services/gateways/CoinomatSepaService.js deleted file mode 100644 index 738d7e3b2f..0000000000 --- a/src/modules/utils/services/gateways/CoinomatSepaService.js +++ /dev/null @@ -1,70 +0,0 @@ -(function () { - 'use strict'; - - const SEPA_GATEWAYS = { - [WavesApp.defaultAssets.USD]: 'USD', - [WavesApp.defaultAssets.EUR]: 'EUR', - [WavesApp.defaultAssets.TRY]: 'TRY' - }; - - const KNOWLEDGE_BASE = `${WavesApp.network.support}/forums/2-knowledge-base/topics`; - const SEPA_COUNTRIES_URL = `${KNOWLEDGE_BASE}/1304-list-of-accepted-countries-and-documents-for-verification`; - - const ID_NOW_SITE_URL = 'https://idnow.eu'; - const ID_NOW_PATH = 'https://go.idnow.de/coinomat/userdata'; - - // That is used to access values from `**/locales/*.json` files - const KEY_NAME_PREFIX = 'coinomatSepa'; - - /** - * @returns {CoinomatSepaService} - */ - const factory = function () { - - class CoinomatSepaService { - - getAll() { - return SEPA_GATEWAYS; - } - - /** - * @param {Asset} asset - * @param {string} wavesAddress - * @return {Promise} - */ - getSepaDetails(asset, wavesAddress) { - CoinomatSepaService._assertAsset(asset.id); - return Promise.resolve({ - listOfEligibleCountries: SEPA_COUNTRIES_URL, - idNowSiteUrl: ID_NOW_SITE_URL, - idNowUserLink: `${ID_NOW_PATH}/${wavesAddress}` - }); - } - - /** - * @param {Asset} asset - * @return {IGatewaySupportMap} - */ - getSupportMap(asset) { - if (SEPA_GATEWAYS[asset.id]) { - return { sepa: true }; - } - } - - getAssetKeyName(asset) { - return `${KEY_NAME_PREFIX}${SEPA_GATEWAYS[asset.id]}`; - } - - static _assertAsset(assetId) { - if (!SEPA_GATEWAYS[assetId]) { - throw new Error('Asset is not supported by Coinomat SEPA'); - } - } - - } - - return new CoinomatSepaService(); - }; - - angular.module('app.utils').factory('coinomatSepaService', factory); -})(); diff --git a/src/modules/utils/services/gateways/CoinomatService.js b/src/modules/utils/services/gateways/CoinomatService.js deleted file mode 100644 index 30c850b49f..0000000000 --- a/src/modules/utils/services/gateways/CoinomatService.js +++ /dev/null @@ -1,217 +0,0 @@ -(function () { - 'use strict'; - - const GATEWAYS = { - [WavesApp.defaultAssets.BTC]: { waves: 'WBTC', gateway: 'BTC' }, - [WavesApp.defaultAssets.BSV]: { waves: 'WBSV', gateway: 'BSV' }, - [WavesApp.defaultAssets.LTC]: { waves: 'WLTC', gateway: 'LTC' }, - [WavesApp.defaultAssets.ZEC]: { waves: 'WZEC', gateway: 'ZEC' }, - [WavesApp.defaultAssets.BCH]: { waves: 'WBCH', gateway: 'BCH' }, - [WavesApp.defaultAssets.DASH]: { waves: 'WDASH', gateway: 'DASH' }, - [WavesApp.defaultAssets.XMR]: { waves: 'WXMR', gateway: 'XMR' } - }; - - const PATH_V1 = `${WavesApp.network.coinomat}/api/v1`; - const PATH_V2 = `${WavesApp.network.coinomat}/api/v2`; - const LANGUAGE = 'ru_RU'; - - // That is used to access values from `**/locales/*.json` files - const KEY_NAME_PREFIX = 'coinomat'; - const ds = require('data-service'); - const { prop } = require('ramda'); - const { BigNumber } = require('@waves/bignumber'); - - /** - * @returns {CoinomatService} - */ - const factory = function () { - - class CoinomatService { - - getAll() { - return GATEWAYS; - } - - /** - * From Coinomat to Waves - * @param {Asset} asset - * @param {string} wavesAddress - * @return {Promise} - */ - getDepositDetails(asset, wavesAddress) { - CoinomatService._assertAsset(asset.id); - const from = GATEWAYS[asset.id].gateway; - const to = GATEWAYS[asset.id].waves; - return this._loadPaymentDetails(from, to, wavesAddress).then((details) => { - return { - address: details.tunnel.wallet_from, - attachment: details.tunnel.attachment, - minimumAmount: new BigNumber(details.tunnel.in_min), - maximumAmount: new BigNumber(details.tunnel.in_max), - exchangeRate: new BigNumber(details.tunnel.xrate), - gatewayFee: new BigNumber(details.tunnel.fee_out) - }; - }); - } - - /** - * From Waves to Coinomat - * @param {Asset} asset - * @param {string} targetAddress - * @param {string} [paymentId] - * @return {Promise} - */ - getWithdrawDetails(asset, targetAddress, paymentId) { - CoinomatService._assertAsset(asset.id); - const from = GATEWAYS[asset.id].waves; - const to = GATEWAYS[asset.id].gateway; - return Promise.all([ - this._loadPaymentDetails(from, to, targetAddress, paymentId), - this._loadWithdrawRate(from, to) - ]).then(([details, rate]) => { - if (paymentId && details.tunnel.monero_payment_id !== paymentId) { - throw new Error('Monero Payment ID is invalid or missing'); - } - - return { - address: details.tunnel.wallet_from, - attachment: details.tunnel.attachment, - minimumAmount: new BigNumber(rate.in_min), - maximumAmount: new BigNumber(rate.in_max), - exchangeRate: new BigNumber(rate.xrate), - gatewayFee: new BigNumber(rate.fee_out) - }; - }); - } - - /** - * @param {Asset} asset - * @return {IGatewaySupportMap} - */ - getSupportMap(asset) { - if (GATEWAYS[asset.id]) { - return { - deposit: asset.id !== WavesApp.defaultAssets.BTC, - withdraw: true, - errorAddressMessage: true - }; - } - } - - getAssetKeyName(asset) { - return `${KEY_NAME_PREFIX}${GATEWAYS[asset.id].gateway}`; - } - - /** - * @param {string} address - * @return {Promise} - */ - hasConfirmation(address) { - return ds.fetch(`${PATH_V2}/get_confirmation.php?address=${address}`) - .then(({ status, is_confirmed }) => !(status === 'not found' || !is_confirmed)); - } - - /** - * @param {string} address - * @return {Promise} - */ - isVerified(address) { - return ds.fetch(`${PATH_V2}/get_verification_status.php?address=${address}`) - .then(prop('verified')); - } - - /** - * @return {Promise} - */ - getCoinomatTimestamp() { - return ds.fetch(`${PATH_V2}/get_ts.php`) - .then(prop('ts')); - } - - /** - * @return {string} - */ - getAddressErrorMessage() { - return 'Invalid wallet_to'; - } - - /** - * @param {string} signature - * @param {number} timestamp - * @param {boolean} status - * @return {Promise} - */ - setCoinomatTermsAccepted(signature, timestamp, status) { - const confirmed = status ? 1 : 0; - - return ds.signature.getSignatureApi().getPublicKey().then(publicKey => { - - const params = { - signature, - public_key: publicKey, - ts: timestamp, - is_confirmed: confirmed - }; - - const toGetParams = params => Object.keys(params).reduce((acc, item) => { - const start = acc ? '&' : ''; - return `${acc}${start}${item}=${params[item]}`; - }, ''); - - return ds.fetch(`${PATH_V2}/set_confirmation.php?${toGetParams(params)}`, { method: 'POST' }) - .then(response => { - if (response.status === 'error') { - return Promise.reject('Error!'); - } - }); - }); - } - - _loadPaymentDetails(from, to, recipientAddress, paymentId) { - return $.get(`${PATH_V1}/create_tunnel.php`, { - currency_from: from, - currency_to: to, - wallet_to: recipientAddress, - ...(paymentId ? { monero_payment_id: paymentId } : {}) - }).then((res) => { - CoinomatService._assertResponse(res, 'ok'); - return $.get(`${PATH_V1}/get_tunnel.php`, { - xt_id: res.tunnel_id, - k1: res.k1, - k2: res.k2, - history: 0, - lang: LANGUAGE - }); - }).then((res) => { - CoinomatService._assertResponse(res, 'tunnel'); - return res; - }); - } - - _loadWithdrawRate(from, to) { - return $.get(`${PATH_V1}/get_xrate.php`, { - f: from, - t: to, - lang: LANGUAGE - }); - } - - static _assertResponse(response, fieldName) { - if (!response[fieldName]) { - throw new Error(response.error); - } - } - - static _assertAsset(assetId) { - if (!GATEWAYS[assetId]) { - throw new Error('Asset is not supported by Coinomat'); - } - } - - } - - return new CoinomatService(); - }; - - angular.module('app.utils').factory('coinomatService', factory); -})(); diff --git a/src/modules/utils/services/gateways/GatewayService.js b/src/modules/utils/services/gateways/GatewayService.js deleted file mode 100644 index 2604f98295..0000000000 --- a/src/modules/utils/services/gateways/GatewayService.js +++ /dev/null @@ -1,275 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {CoinomatService} coinomatService - * @param {CoinomatCardService} coinomatCardService - * @param {CoinomatSepaService} coinomatSepaService - * @param {WavesGatewayService} wavesGatewayService - * @param {ConfigService} configService - * @return {GatewayService} - */ - const factory = function (coinomatService, coinomatCardService, - coinomatSepaService, wavesGatewayService, configService) { - - class GatewayService { - - constructor() { - this.gateways = [ - coinomatService, - coinomatCardService, - coinomatSepaService, - wavesGatewayService - ]; - } - - getCryptocurrencies() { - return { - ...coinomatService.getAll(), - ...wavesGatewayService.getAll() - }; - } - - getPurchasableWithCards() { - return coinomatCardService.getAll(); - } - - getFiats() { - return coinomatSepaService.getAll(); - } - - /** - * @param {Asset} asset - * @param {string} wavesAddress - * @return {Promise} - */ - getDepositDetails(asset, wavesAddress) { - const gateway = this._findGatewayFor(asset, 'deposit'); - - if (gateway) { - return gateway.getDepositDetails(asset, wavesAddress); - } - - return null; - } - - /** - * @param {Asset} asset - * @param {string} targetAddress - * @param {string} [paymentId] - * @return {Promise} - */ - getWithdrawDetails(asset, targetAddress, paymentId) { - const gateway = this._findGatewayFor(asset, 'withdraw'); - - if (!this.canUseGateway(asset)) { - return Promise.reject({ code: 1001, message: 'Gateway is blocked' }); - } - - return gateway.getWithdrawDetails(asset, targetAddress, paymentId); - } - - canUseGateway(asset) { - const permissions = configService.get('PERMISSIONS.CANT_TRANSFER_GATEWAY'); - return !permissions || !permissions - .includes(asset.id); - } - - /** - * @param {Asset} crypto - * @param {string} wavesAddress - * @return {Promise} - */ - getCardFiatWithLimits(crypto, wavesAddress, fiatList) { - const gateway = this._findGatewayFor(crypto, 'card'); - return gateway.getFiatWithLimits(crypto, wavesAddress, fiatList); - } - - /** - * @param {Asset} crypto - * @param {string} fiat - * @param {string} recipientAddress - * @param {number} fiatAmount - * @return {Promise} - */ - getCardApproximateCryptoAmount(crypto, fiat, recipientAddress, fiatAmount) { - const gateway = this._findGatewayFor(crypto, 'card'); - if (!gateway) { - return Promise.resolve(0); - } else { - return gateway.getApproximateCryptoAmount(crypto, fiat, recipientAddress, fiatAmount); - } - } - - /** - * @param {Asset} crypto - * @param {string} fiat - * @param {string} recipientAddress - * @param {number} fiatAmount - * @return {string} - */ - getCardBuyLink(crypto, fiat, recipientAddress, fiatAmount) { - const gateway = this._findGatewayFor(crypto, 'card'); - if (!gateway) { - return ''; - } else { - return gateway.getCardBuyLink(crypto, fiat, recipientAddress, fiatAmount); - } - } - - /** - * @param {Asset} asset - * @param {string} wavesAddress - * @return {Promise} - */ - getSepaDetails(asset, wavesAddress) { - const gateway = this._findGatewayFor(asset, 'sepa'); - - if (gateway) { - return gateway.getSepaDetails(asset, wavesAddress); - } - - return null; - } - - /** - * @param {Asset} asset - * @param {IGatewayType} type - * @return {boolean} - */ - hasSupportOf(asset, type) { - const gateway = this._findGatewayFor(asset, type); - return !!gateway; - } - - /** - * @param {Asset} asset - * @param {IGatewayType} type - * @return {string} - */ - getAssetKeyName(asset, type) { - // TODO : find a way to not use it and remove this method - const gateway = this._findGatewayFor(asset, type); - return gateway.getAssetKeyName(asset); - } - - /** - * @param {Asset} asset - * @param {IGatewayType} type - * @return {string} - */ - getAddressErrorMessage(asset, address, type) { - const gateway = this._findGatewayFor(asset, type); - return gateway.getAddressErrorMessage(address); - } - - /** - * @param {Asset} asset - * @param {IGatewayType} type - * @return {string | null} - */ - getWrongAddressMessage(asset, address, type) { - const gateway = this._findGatewayFor(asset, type); - - if (!gateway) { - return null; - } - - return gateway.getWrongAddressMessage(address, asset); - } - - /** - * @param {string} address - * @return {Promise} - */ - hasConfirmation(address) { - return coinomatService.hasConfirmation(address); - } - - getDefaultCardFiatList() { - const FIAT_CODES = { - [WavesApp.defaultAssets.USD]: 'USD', - [WavesApp.defaultAssets.EUR]: 'EURO' - }; - - return [ - { - name: 'USD', - assetId: WavesApp.defaultAssets.USD, - fiatCode: FIAT_CODES[WavesApp.defaultAssets.USD], - min: '30', - max: '50' - }, - { - name: 'EUR', - assetId: WavesApp.defaultAssets.EUR, - fiatCode: FIAT_CODES[WavesApp.defaultAssets.EUR], - min: '30', - max: '50' - } - ]; - } - - /** - * @param {Asset} asset - * @param {string} type - * @return {IGateway} - */ - _findGatewayFor(asset, type) { - // TODO : right now it returns only the first entry - // TODO : make it return a list of all available gateways - for (const gateway of this.gateways) { - const supportMap = gateway.getSupportMap(asset); - if (supportMap && supportMap[type]) { - return gateway; - } - } - } - - } - - return new GatewayService(); - }; - - factory.$inject = [ - 'coinomatService', - 'coinomatCardService', - 'coinomatSepaService', - 'wavesGatewayService', - 'configService' - ]; - - angular.module('app.utils').factory('gatewayService', factory); -})(); - -/** - * @typedef {('deposit'|'withdraw'|'sepa'|'card')} IGatewayType - */ - -/** - * @typedef {object} IGateway - * @property {Function} getSupportMap - * @property {Function} getAssetKeyName - * @property {Function} [getDepositDetails] - * @property {Function} [getWithdrawDetails] - * @property {Function} [getSepaDetails] - * @property {Function} [getCardDetails] - */ - -/** - * @typedef {object} IGatewaySupportMap - * @property {boolean} [deposit] - * @property {boolean} [withdraw] - * @property {boolean} [sepa] - * @property {boolean} [card] - */ - -/** - * @typedef {object} IGatewayDetails - * @property {string} address - * @property {string} attachment - * @property {BigNumber} exchangeRate - * @property {BigNumber} gatewayFee - * @property {BigNumber} maximumAmount - * @property {BigNumber} minimumAmount - */ diff --git a/src/modules/utils/services/gateways/WavesGatewayService.js b/src/modules/utils/services/gateways/WavesGatewayService.js deleted file mode 100644 index 0fd39bff4e..0000000000 --- a/src/modules/utils/services/gateways/WavesGatewayService.js +++ /dev/null @@ -1,146 +0,0 @@ -(function () { - 'use strict'; - - const GATEWAYS = { - [WavesApp.defaultAssets.WEST]: { waves: 'WWEST', gateway: 'WEST' }, - [WavesApp.defaultAssets.ERGO]: { waves: 'WERGO', gateway: 'ERGO' }, - [WavesApp.defaultAssets.BNT]: { waves: 'WBNT', gateway: 'BNT' }, - [WavesApp.defaultAssets.ETH]: { waves: 'ETH', gateway: 'ETH' }, - [WavesApp.defaultAssets.BTC]: { waves: 'WBTC', gateway: 'BTC' } - }; - - const PATH = `${WavesApp.network.wavesGateway}/api/v1`; - - const KEY_NAME_PREFIX = 'wavesGateway'; - - /** - * @returns {WavesGatewayService} - */ - - const factory = function () { - - const { BigNumber } = require('@waves/bignumber'); - - class WavesGatewayService { - - /** - * @param {Asset} asset - * @return {IGatewaySupportMap} - */ - getSupportMap(asset) { - if (GATEWAYS[asset.id]) { - return { - deposit: true, - withdraw: asset.id !== WavesApp.defaultAssets.BTC, - errorAddressMessage: true, - wrongAddressMessage: true - }; - } - } - - /** - * From VST to Waves - * @param {Asset} asset - * @param {string} wavesAddress - * @return {Promise} - */ - getDepositDetails(asset, wavesAddress) { - WavesGatewayService._assertAsset(asset.id); - - const body = JSON.stringify({ - userAddress: wavesAddress, - assetId: asset.id - }); - - return ds.fetch(`${PATH}/external/deposit`, { method: 'POST', body }) - .then(details => { - const [minAmount, maxAmount, fee] = [details.minAmount, details.maxAmount, details.fee] - .map(value => this._normalaizeValue(value, -asset.precision)); - return ({ - address: details.address, - minimumAmount: new BigNumber(minAmount), - maximumAmount: new BigNumber(maxAmount), - gatewayFee: new BigNumber(fee) - }); - }); - } - - /** - * From Waves to VST - * @param {Asset} asset - * @param {string} targetAddress - * @param {string} [paymentId] - * @return {Promise} - */ - getWithdrawDetails(asset, targetAddress) { - WavesGatewayService._assertAsset(asset.id); - - const body = JSON.stringify({ - userAddress: targetAddress, - assetId: asset.id - }); - - return ds.fetch(`${PATH}/external/withdraw`, { method: 'POST', body }) - .then(details => { - const [minAmount, maxAmount, fee] = [details.minAmount, details.maxAmount, details.fee] - .map(value => this._normalaizeValue(value, -asset.precision)); - return ({ - address: details.recipientAddress, - minimumAmount: new BigNumber(minAmount), - maximumAmount: new BigNumber(maxAmount), - gatewayFee: new BigNumber(fee), - attachment: details.processId - }); - }); - } - - /** - * @param {Asset} asset - * @return {string} - */ - getAssetKeyName(asset) { - return `${KEY_NAME_PREFIX}${GATEWAYS[asset.id].gateway}`; - } - - /** - * @return {Object} - */ - getAll() { - return GATEWAYS; - } - - /** - * @return {string} - */ - getAddressErrorMessage(address) { - return `can't withdraw to address ${address}`; - } - - getWrongAddressMessage(address) { - return `wrong address ${address}`; - } - - /** - * - * @param {number} value - * @param {number} pow - * @returns {number} - * @private - */ - _normalaizeValue(value, pow) { - return value * Math.pow(10, pow); - } - - static _assertAsset(assetId) { - if (!GATEWAYS[assetId]) { - throw new Error('Asset is not supported by VST'); - } - } - - } - - return new WavesGatewayService(); - }; - - angular.module('app.utils').factory('wavesGatewayService', factory); -})(); diff --git a/src/modules/utils/services/outerBlockchains.js b/src/modules/utils/services/outerBlockchains.js deleted file mode 100644 index 02517dba90..0000000000 --- a/src/modules/utils/services/outerBlockchains.js +++ /dev/null @@ -1,53 +0,0 @@ -(function () { - 'use strict'; - - const factory = function (waves) { - - const VALIDATOR = { - [WavesApp.defaultAssets.BTC]: WavesApp.network.code === 'W' ? - /^([13][a-km-zA-HJ-NP-Z1-9]{25,34}|(bc1)[a-z0-9]{25,90})$/ : - /^[2mn][1-9A-HJ-NP-Za-km-z]{26,35}/, - [WavesApp.defaultAssets.ETH]: /^0x[0-9a-f]{40}$/i, - [WavesApp.defaultAssets.LTC]: /^[LM3][a-km-zA-HJ-NP-Z1-9]{26,33}$/, - [WavesApp.defaultAssets.ZEC]: /^t[0-9a-z]{34}$/i, - [WavesApp.defaultAssets.BCH]: /^([13][a-km-zA-HJ-NP-Z1-9]{25,34}|[qp][a-zA-Z0-9]{41})$/, - [WavesApp.defaultAssets.BSV]: /^([13][a-km-zA-HJ-NP-Z1-9]{25,34}|[qp][a-zA-Z0-9]{41})$/, - [WavesApp.defaultAssets.DASH]: /^X[a-km-zA-HJ-NP-Z1-9]{25,34}$/, - [WavesApp.defaultAssets.XMR]: /^([a-km-zA-HJ-NP-Z1-9]{95}|[a-km-zA-HJ-NP-Z1-9]{106})$/, - [WavesApp.defaultAssets.WEST]: address => { - return waves.node.isValidAddressWithNetworkByte(address, WavesApp.network.WESTNetworkByte); - }, - [WavesApp.defaultAssets.ERGO]: /^9[a-km-zA-HJ-NP-Z1-9]{5,}$/, - [WavesApp.defaultAssets.BNT]: /^0x[0-9a-f]{40}$/i - }; - - return Object.keys(VALIDATOR).reduce((result, key) => { - result[key] = { - isValidAddress(string) { - if (typeof VALIDATOR[key] === 'function') { - return VALIDATOR[key](string); - } else { - return VALIDATOR[key].test(string); - } - } - }; - return result; - }, Object.create(null)); - }; - - factory.$inject = [ - 'waves' - ]; - - angular.module('app.utils').factory('outerBlockchains', factory); -})(); - -/** - * @typedef {function} IIsValidAddress - * @param {string} address - * @return {boolean} - */ - -/** - * @typedef {Object.} IOuterBlockchains - */ diff --git a/src/modules/utils/services/utils.js b/src/modules/utils/services/utils.js index d8982898ad..edb912d238 100644 --- a/src/modules/utils/services/utils.js +++ b/src/modules/utils/services/utils.js @@ -211,12 +211,11 @@ /** * @param {$q} $q - * @param {Moment} Moment * @param {$injector} $injector * @param {*} migration * @return {app.utils} */ - const factory = function ($q, Moment, $injector, migration) { + const factory = function ($q, $injector, migration) { const base58ToBytes = base58Decode; const bytesToBase58 = base58Encode; @@ -820,19 +819,6 @@ }); }, - /** - * @name app.utils#moment - * @param {Date | number | string | Moment} [date] - * @param {string} [pattern] - * @return {Moment} - */ - moment(date, pattern) { - if (date instanceof Moment) { - return date.clone(pattern); - } - return new Moment(date, pattern); - }, - /** * @name app.utils#loadImage * @param {string} url @@ -1750,90 +1736,6 @@ return (error >> 8 & 0xFFF) === 7; }, - /** - * @name app.utils#createOrder - * @param {app.utils.IOrderData} data - * @return {Promise} - */ - createOrder(data) { - const timestamp = ds.utils.normalizeTime(Date.now()); - /** - * @type {INotification} - */ - const notification = $injector.get('notification'); - /** - * @type {ModalManager} - */ - const modalManager = $injector.get('modalManager'); - /** - * @type {User} - */ - const user = $injector.get('user'); - /** - * @type {boolean} - */ - const isAdvancedMode = user.getSetting('advancedMode'); - - const hasCustomFee = data.matcherFee.asset.id && data.matcherFee.asset.id !== 'WAVES'; - - /** - * @type {number | undefined} - */ - const version = (hasCustomFee && 3) || 2; - - const signableData = { - type: SIGN_TYPE.CREATE_ORDER, - data: { ...data, version, timestamp } - }; - - const onError = data => { - if (data && data.error && data.isScriptError) { - notification.error({ - ns: 'app.dex', - title: { - literal: 'directives.createOrder.notifications.error.title' - }, - body: { - literal: `directives.createOrder.notifications.error.${data.error}`, - params: data.params ? data.params : {} - } - }, -1); - } else { - notification.error({ - ns: 'app.dex', - title: { - literal: 'directives.createOrder.notifications.error.title' - }, - body: { - literal: data && data.message || data - } - }, -1); - } - - - return Promise.reject(data); - }; - - return utils.createSignable(signableData) - .then(signable => { - return utils.signMatcher(signable) - .then(signable => signable.getDataForApi()) - .then(ds.createOrder) - .catch(data => { - const isScriptError = this.checkIsScriptError(data.error); - - if (!isAdvancedMode || !isScriptError) { - return Promise.reject({ ...data, isScriptError }); - } - - return modalManager.showConfirmTx(signable, false) - .then(ds.createOrder, () => null); - }); - }) - .catch(onError); - - }, - /** * @name app.utils#createSignable * @param {*} data @@ -1847,39 +1749,6 @@ } }, - /** - * @name app.utils#signUserOrders - * @param {{[matcherSign]: {[timestamp]: number, [timestamp]: number}}} data - * @return {Promise<{signature: string, timestamp: number}>} - */ - signUserOrders(data) { - try { - const dayForwardTime = ds.app.getTimeStamp(1, 'day'); - const lastSignedTs = path(['matcherSign', 'timestamp'], data); - const isNeedSign = !lastSignedTs || lastSignedTs - dayForwardTime < 0; - - if (!isNeedSign) { - return Promise.resolve(data.matcherSign); - } - - const timestamp = ds.app.getTimeStamp( - WavesApp.matcherSignInterval.count, - WavesApp.matcherSignInterval.timeType - ); - - const signable = ds.signature.getSignatureApi().makeSignable({ - type: SIGN_TYPE.MATCHER_ORDERS, - data: { timestamp } - }); - - return utils.signMatcher(signable) - .then(signable => signable.getSignature()) - .then(signature => ({ signature, timestamp })); - } catch (e) { - return Promise.reject(e); - } - }, - /** * @param {String} name * @return {Promise} @@ -1911,44 +1780,6 @@ .catch(() => false); }, - /** - * @name app.utils#sign - * @param {Signable} signable - * @param {any} anyData - * @return {Promise} - */ - signMatcher(signable, anyData = null) { - /** - * @type {User} - */ - const user = $injector.get('user'); - /** - * @type {ModalManager} - */ - const modalManager = $injector.get('modalManager'); - - if (user.userType === 'seed' || user.userType === 'privateKey') { - return signable.addMyProof() - .then(() => signable); - } - - const getError = (user, error) => { - if (user.userType === 'wavesKeeper' && error && - error.code === 5 && error.msg.includes('another active account')) { - return { error: 'sign-user-error', userType: user.userType }; - } - - return { error: 'sign-error', userType: user.userType }; - }; - - const signByDeviceLoop = () => modalManager.showSignByDevice(signable, anyData) - .catch((e) => modalManager.showSignDeviceError(getError(user, e)) - .then(signByDeviceLoop)) - .catch(() => Promise.reject({ message: 'Your sign is not confirmed!' })); - - return signByDeviceLoop(); - }, - /** * @name app.utils#isLockedInDex * @param assetId1 @@ -2246,7 +2077,7 @@ return utils; }; - factory.$inject = ['$q', 'Moment', '$injector', 'migration']; + factory.$inject = ['$q', '$injector', 'migration']; angular.module('app.utils') .factory('utils', factory); diff --git a/src/modules/utils/services/whatsNew.js b/src/modules/utils/services/whatsNew.js deleted file mode 100644 index 2d8e3aec02..0000000000 --- a/src/modules/utils/services/whatsNew.js +++ /dev/null @@ -1,129 +0,0 @@ -(function () { - 'use strict'; - - /** - * - * @param {INotification} notification - * @param {User} user - * @param {Migration} migration - */ - const factory = function (notification, user, migration, utils) { - - const MIGRATION_LIST = [ - '1.0.0', - '1.0.3', - '1.0.5', - '1.0.6', - '1.0.7', - '1.0.8', - '1.0.10', - '1.0.14', - '1.0.15', - '1.0.18', - '1.0.21', - '1.0.22', - '1.0.25', - '1.0.27', - '1.0.28', - '1.0.29', - '1.0.30', - '1.0.32', - '1.0.33', - '1.0.36', - '1.0.37', - '1.0.40', - '1.0.41', - '1.0.42', - '1.1.0', - '1.2.0', - '1.2.1', - '1.2.2', - '1.2.3', - '1.2.6', - '1.2.8', - '1.3.0', - '1.3.2', - '1.3.5', - '1.3.7', - '1.3.9', - '1.3.18', - '1.3.19', - '1.3.20', - '1.4.0', - '1.4.4' - ]; - - /** - * @param {string|Array} version - */ - function addVersions(version) { - const versions = user.getSetting('whatsNewList').slice(); - utils.toArray(version).forEach((version) => { - versions.push(version); - }); - user.setSetting('whatsNewList', versions); - } - - function removeVersion(version) { - const versions = user.getSetting('whatsNewList').slice(); - const index = versions.indexOf(version); - if (index !== -1) { - versions.splice(index, 1); - user.setSetting('whatsNewList', versions); - } - } - - function unique(list1, list2) { - const hash = Object.create(null); - list1.concat(list2).forEach((version) => { - hash[version] = true; - }); - return Object.keys(hash); - } - - function handleLogin() { - notification.destroyAll(); - - const notShownUpdates = user.getSetting('whatsNewList') - .filter(version => { - if (migration.gt(version, WavesApp.version)) { - removeVersion(version); - return false; - } - return true; - }); - const lastOpenVersion = user.getSetting('lastOpenVersion'); - const newVersionList = migration.migrateFrom(lastOpenVersion || WavesApp.version, MIGRATION_LIST); - - migration.sort(unique(newVersionList, notShownUpdates)).forEach((version) => { - notification.info({ - ns: 'app.utils', - title: { - literal: 'utils.whatsNew.title', - params: { version } - }, - body: { - literal: `utils.whatsNew.body.${version.replace(/\./g, '_')}` - }, - onClose() { - removeVersion(version); - } - }, -1); - }); - addVersions(newVersionList); - - user.setSetting('lastOpenVersion', WavesApp.version); - } - - user.onLogin().then(() => { - handleLogin(); - user.loginSignal.on(handleLogin); - }); - - return Object.create(null); - }; - - factory.$inject = ['notification', 'user', 'migration', 'utils']; - - angular.module('app.utils').factory('whatsNew', factory); -})(); diff --git a/src/modules/wallet/controllers/WalletHeaderCtrl.js b/src/modules/wallet/controllers/WalletHeaderCtrl.js deleted file mode 100644 index c2989e08af..0000000000 --- a/src/modules/wallet/controllers/WalletHeaderCtrl.js +++ /dev/null @@ -1,9 +0,0 @@ -(function () { - 'use strict'; - - const controller = function () { - // TODO - }; - - angular.module('app.wallet').controller('WalletHeaderCtrl', controller); -})(); diff --git a/src/modules/wallet/modules/assets/assets.js b/src/modules/wallet/modules/assets/assets.js deleted file mode 100644 index 0fe1914fc0..0000000000 --- a/src/modules/wallet/modules/assets/assets.js +++ /dev/null @@ -1,5 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.wallet.assets', []); -})(); diff --git a/src/modules/wallet/modules/assets/controllers/AssetsCtrl.js b/src/modules/wallet/modules/assets/controllers/AssetsCtrl.js deleted file mode 100644 index 89da48dd26..0000000000 --- a/src/modules/wallet/modules/assets/controllers/AssetsCtrl.js +++ /dev/null @@ -1,448 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {Waves} waves - * @param {AssetsData} assetsData - * @param {$rootScope.Scope} $scope - * @param {app.utils} utils - * @param {Base} Base - * @param {User} user - * @param {ModalManager} modalManager - * @param {IPollCreate} createPoll - * @param {BalanceWatcher} balanceWatcher - * @return {Assets} - */ - const controller = function ( - waves, - assetsData, - $scope, - utils, - Base, - user, - modalManager, - createPoll, - balanceWatcher, - storage - ) { - - const { date } = require('ts-utils'); - const ds = require('data-service'); - const analytics = require('@waves/event-sender'); - - - /** - * @class Assets - * @extends Base - */ - class Assets extends Base { - - - /** - * @type {string[]} - */ - pinnedAssetIdList = null; - /** - * @type {Money[]} - */ - pinnedAssetBalances = null; - - chartMode = null; - total = null; - - interval = null; - intervalCount = null; - - data = null; - options = assetsData.getGraphOptions(); - mirrorId = null; - - /** - * @type {boolean} - */ - invalid = true; - /** - * @type {Moment} - * @private - */ - _startDate = null; - /** - * @type {string} - */ - activeChartAssetId = null; - /** - * @type {Money} - */ - activeChartBalance = null; - /** - * @type {string[]} - */ - chartAssetIdList = null; - /** - * @type {Asset[]} - */ - chartAssetList = null; - /** - * @type {string} - */ - change = '0.00'; - /** - * @type {string} - */ - changePercent = '0.00'; - /** - * @type {boolean} - */ - advancedMode = false; - /** - * @type {string} - */ - theme = 'default'; - - dateToHours = date('hh:mm'); - dateToDates = date('DD/MM'); - - constructor() { - super($scope); - - storage.load('hideTokenomicaToast').then(() => { - // this.toastTokenomikaVisible = !flag; - this.toastTokenomikaVisible = false; // выключено на вермя миграции - }); - - this.options.axes.x.tickFormat = (date) => { - if (this.chartMode === 'hour' || this.chartMode === 'day') { - return this.dateToHours(date); - } else { - return this.dateToDates(date); - } - }; - - this.observe('activeChartAssetId', this._onChangeChartAssetId); - - this.syncSettings({ - activeChartAssetId: 'wallet.assets.activeChartAssetId', - chartAssetIdList: 'wallet.assets.chartAssetIdList', - chartMode: 'wallet.assets.chartMode', - pinnedAssetIdList: 'pinnedAssetIdList', - advancedMode: 'advancedMode', - theme: 'theme' - }); - - this.mirrorId = user.getSetting('baseAssetId'); - this._onChangeMode(); - - this.updateGraph = createPoll(this, this._getGraphData, 'data', 15000, { $scope }); - - this.theme = user.getSetting('theme'); - this._setChartOptions(); - - ds.api.assets.get(this.chartAssetIdList).then(assets => { - this.chartAssetList = assets; - utils.safeApply($scope); - }); - - balanceWatcher.ready.then(() => { - this.receive(balanceWatcher.change, this._updateBalances, this); - this._updateBalances(); - }); - - this.observe('chartMode', this._onChangeMode); - this.observe('_startDate', this._onChangeInterval); - this.observe('pinnedAssetIdList', this._updateBalances); - - this.observe(['interval', 'intervalCount', 'activeChartAssetId'], this._onChangeInterval); - this.observe('theme', this._onThemeChange); - } - - openScriptModal() { - return modalManager.showScriptModal(); - } - - openAnyTxModal() { - return modalManager.showAnyTx(null); - } - - abs(num) { - return Math.abs(num); - } - - onAssetActionClick(event, asset, action) { - event.preventDefault(); - if (action === 'send') { - return this.showSend(asset); - } - - if (action === 'info') { - return this.showAsset(asset); - } - - if (action === 'receive') { - return this.showReceivePopup(asset); - } - - throw new Error('Wrong action'); - } - - /** - * @param {Asset} asset - */ - unpin(asset) { - analytics.send({ name: 'Wallet Assets Unpin', params: { Currency: asset.id }, target: 'ui' }); - this.pinnedAssetIdList = this.pinnedAssetIdList.filter((fAsset) => fAsset !== asset.id); - } - - newAssetOnClick() { - modalManager.showPinAsset().then(({ selected }) => { - if (selected) { - $scope.$digest(); - } - }); - } - - showReceivePopup(asset) { - analytics.send({ - name: 'Wallet Assets Receive Click', - params: { Currency: asset ? asset.id : 'All' }, - target: 'ui' - }); - return modalManager.showReceiveModal(asset); - } - - showSeedBackupModals() { - return modalManager.showSeedBackupModal(); - } - - /** - * @param {Asset} asset - */ - showAsset(asset) { - return modalManager.showAssetInfo(asset); - } - - /** - * @param {Asset} asset - */ - showSend(asset) { - analytics.send({ - name: 'Wallet Assets Send Click', - params: { Currency: asset ? asset.id : 'All' }, - target: 'ui' - }); - return modalManager.showSendAsset({ assetId: asset && asset.id || null }); - } - - /** - * @param {Asset} asset - */ - showDeposit(asset) { - return modalManager.showDepositAsset(user, asset); - } - - /** - * @param {Asset} asset - */ - showSepa(asset) { - return modalManager.showSepaAsset(user, asset); - } - - onMouse(chartData) { - const id = chartData.id; - const { xValue, yValue } = chartData.point; - - const date = new Date(xValue.toNumber()); - this.chartEvent = { - ...chartData, - id, - price: yValue.toFormat(2), - date: Assets._localDate(date, true), - time: this.dateToHours(date) - }; - utils.safeApply($scope); - } - - /** - * @param value - * @private - */ - _onChangeChartAssetId({ value }) { - waves.node.assets.balance(value) - .then((asset) => { - this.activeChartBalance = asset; - }); - } - - /** - * @private - */ - _updateBalances() { - const hash = utils.toHash(balanceWatcher.getFullBalanceList(), 'asset.id'); - const balances = this.pinnedAssetIdList.reduce((acc, assetId) => { - return acc.then(list => { - if (hash[assetId]) { - list.push(hash[assetId]); - return list; - } - return balanceWatcher.getFullBalanceByAssetId(assetId).then(balance => { - list.push(balance); - return list; - }); - }); - }, Promise.resolve([])); - - balances.then(list => { - this.pinnedAssetBalances = list; - utils.safeApply($scope); - }); - } - - /** - * @private - */ - _onChangeInterval() { - this.updateGraph.restart(); - } - - /** - * @return {Promise} - * @private - */ - _getGraphData() { - const from = this.activeChartAssetId; - const to = this.mirrorId; - const precisionPromise = waves.node.assets.getAsset(this.mirrorId) - .then(({ precision }) => precision); - const valuesPromise = waves.utils.getRateHistory(from, to, this._startDate); - - return Promise.all([precisionPromise, valuesPromise]) - .then(([precision, values]) => { - const first = values[0].rate; - const last = values[values.length - 1].rate; - this.change = (last - first).toFixed(precision); - this.changePercent = ((last - first) / first * 100).toFixed(precision); - return ({ - rate: values - }); - }); - } - - /** - * @private - */ - _onChangeMode() { - switch (this.chartMode) { - case 'hour': - this._startDate = utils.moment() - .add() - .hour(-1); - break; - case 'day': - this._startDate = utils.moment() - .add() - .day(-1); - break; - case 'week': - this._startDate = utils.moment() - .add() - .day(-7); - break; - case 'month': - this._startDate = utils.moment() - .add() - .month(-1); - break; - case 'year': - this._startDate = utils.moment() - .add() - .year(-1); - break; - default: - throw new Error('Wrong chart mode!'); - } - } - - /** - * @private - */ - _onThemeChange() { - utils.wait(1000).then(() => this._setChartOptions()); - } - - /** - * @private - */ - _setChartOptions() { - this.chartOptions = - { - axisX: 'timestamp', - axisY: 'rate', - marginBottom: 46, - hasDates: true, - checkWidth: 2000, - heightFactor: 0.7, - view: { - rate: this._getViewOptions() - } - }; - } - - /** - * @return {{fillColor: string, gradientColor: string[], lineColor: string}} - * @private - */ - _getViewOptions() { - switch (this.theme) { - case 'black': - return ({ - lineColor: '#5a81ea', - fillColor: '#2d2d2d', - gradientColor: ['#334375', '#2d2d2d'], - lineWidth: 4 - }); - default: - return ({ - lineColor: '#1f5af6', - fillColor: '#fff', - gradientColor: ['#eaf0fe', '#fff'], - lineWidth: 4 - }); - } - } - - /** - * @param date @type {Date} - * @param hasYear @type {boolean} - * @return {string} - * @private - */ - static _localDate(date, hasYear = false) { - return hasYear ? tsUtils.date('DD.MM.YYYY')(date) : tsUtils.date('DD.MM')(date); - } - - hideTokenomicaToast() { - storage.save('hideTokenomicaToast', true).then(() => { - this.toastTokenomikaVisible = false; - }); - } - - } - - return new Assets(); - }; - - controller.$inject = [ - 'waves', - 'assetsData', - '$scope', - 'utils', - 'Base', - 'user', - 'modalManager', - 'createPoll', - 'balanceWatcher', - 'storage' - ]; - - angular.module('app.wallet.assets') - .controller('AssetsCtrl', controller); -})(); diff --git a/src/modules/wallet/modules/assets/directives/asset/Asset.js b/src/modules/wallet/modules/assets/directives/asset/Asset.js deleted file mode 100644 index c203fb941a..0000000000 --- a/src/modules/wallet/modules/assets/directives/asset/Asset.js +++ /dev/null @@ -1,68 +0,0 @@ -(function () { - 'use strict'; - - /** - * @return {Asset} - */ - const controller = function (Base, utils, createPoll, $scope) { - - class Asset extends Base { - - constructor() { - super($scope); - /** - * @type {IBalanceDetails} - */ - this.balance = null; - /** - * @type {number} - */ - this.rating = null; - } - - $postLink() { - const { isVerified, isGateway, isTokenomica } = utils.getDataFromOracles(this.balance.asset.id); - this.isVerified = isVerified; - this.isGateway = isGateway; - this.isTokenomica = isTokenomica; - if (!this.isGateway) { - createPoll(this, this._getTokenRating, this._setTokenRating, 60 * 1000); - } - } - - isUnpinned() { - return !WavesApp.ALWAYS_PINNED_ASSETS.includes(this.balance.asset.id); - } - - _getTokenRating() { - return ds.api.rating.getAssetsRating(this.balance.asset.id) - .then(assetList => assetList) - .catch(() => null); - } - - _setTokenRating(assetList) { - if (!assetList || assetList.length === 0) { - return null; - } - - this.rating = assetList[0].rating; - $scope.$apply(); - } - - } - - return new Asset(); - }; - - controller.$inject = ['Base', 'utils', 'createPoll', '$scope']; - - angular.module('app.wallet.assets').component('wAsset', { - bindings: { - balance: '<', - onClick: '&', - onUnpinClick: '&' - }, - templateUrl: 'modules/wallet/modules/assets/directives/asset/asset.html', - controller - }); -})(); diff --git a/src/modules/wallet/modules/assets/directives/asset/asset.html b/src/modules/wallet/modules/assets/directives/asset/asset.html deleted file mode 100644 index 3c4a893bd1..0000000000 --- a/src/modules/wallet/modules/assets/directives/asset/asset.html +++ /dev/null @@ -1,67 +0,0 @@ -
    -
    -
    -
    - -
    -
    - {{::$ctrl.balance.asset.name}} - -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    - -
    - -
    -
    -
    -
    -
    -
    - - - - - -
    -
    - - - - - -
    -
    -
    diff --git a/src/modules/wallet/modules/assets/directives/asset/asset.less b/src/modules/wallet/modules/assets/directives/asset/asset.less deleted file mode 100644 index 25c53045ca..0000000000 --- a/src/modules/wallet/modules/assets/directives/asset/asset.less +++ /dev/null @@ -1,232 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; - -@asset-block-narrow: calc(~"25% - " @padding-main-layout); -@asset-block-wide: calc(~"33.3% - " @padding-main-layout); -@asset-block-wide50: calc(~"50% - " @padding-main-layout); -@asset-block-full: calc(~"100% - " @padding-main-layout); - -.asset { - &__wrapper { - display: flex; - align-items: center; - - @media screen and (max-width: 768px) { - flex-direction: row; - } - } -} - -.new-asset, -w-asset { - box-sizing: border-box; - min-height: 182px; - transition: all 0.3s; - box-shadow: @shadow-type-1; - flex-basis: @asset-block-narrow; - max-width: @asset-block-narrow; - @media screen and (max-width: 1300px) { - flex-basis: @asset-block-wide; - max-width: @asset-block-wide; - } - @media screen and (max-width: 1024px) { - flex-basis: @asset-block-wide50; - max-width: @asset-block-wide50; - } - @media screen and (max-width: 560px) { - flex-basis: @asset-block-full; - max-width: @asset-block-full; - } - - border-radius: @border-radius; - background-color: @color-white; - position: relative; - display: flex; - flex-direction: column; - padding: 20px; - margin: @padding-main-layout /2; - - &:hover { - transform: translate3d(0,-3px,0); - box-shadow: @shadow-main-hover; - z-index: 3; - } - - & > div { - display: flex; - flex-direction: column; - height: 100%; - } - - &:hover .settings { - display: flex; - } - - .hr { - border: none; - width: 100%; - margin: 0 0 8px 0; - border-bottom: 1px dashed @color-disabled-200; - } -} - -.new-asset { - cursor: pointer; - display: flex; - align-items: center; - justify-content: center; - - span { - display: inline-block; - width: 30px; - height: 30px; - background-image: @add-asset-icon; - background-position: left top; - background-repeat: no-repeat; - background-color: @color-white; - } - - &:hover { - span { - background-position: right top; - } - } -} - -.asset { - display: flex; - flex-direction: column; - width: 100%; - height: 108px; - - &__wrapper { - .rating-stars-wrapper { - margin-top: 8px; - } - } - - &__balance { - &-leasing { - cursor: pointer; - } - - w-balance > span { - word-wrap: break-word; - } - .decimal { - font-family: @font-roboto-light; - } - } - - &__name { - flex-grow: 0; - display: flex; - font-size: 15px; - } - - &__top { - display: flex; - align-items: center; - justify-content: space-between; - - .asset { - &__name { - font-weight: 500; - font-size: 17px; - flex-direction: row; - align-items: center; - cursor: pointer; - - span { - word-break: break-all; - } - } - } - } - - &__middle { - min-height: 82px; - - .asset__balance { - cursor: pointer; - padding-top: 15px; - font-size: 24px; - line-height: 28px; - } - } - - &__footer { - color: @color-basic-500; - display: flex; - white-space: nowrap; - flex-wrap: nowrap; - - .btn-icon { - display: inline-block; - margin-top: 10px; - margin-right: 20px; - cursor: pointer; - font-size: 15px; - transition: .3s; - - &:last-child { - svg { - transform: rotate(180deg); - } - } - - svg { - transition: .3s; - vertical-align: middle; - margin-right: 6px; - margin-top: -3px; - fill: @color-basic-500; - } - - &:hover { - color: @color-basic-700; - svg { - fill: @color-basic-700; - } - } - } - } -} - -.unpin { - width: 18px; - height: 30px; - cursor: pointer; - margin-left: 7px; - - &__icon { - display: inline-block; - width: 18px; - height: 18px; - background-image: @unpin-asset-icon; - background-repeat: no-repeat; - background-position: 0 0; - } - - &:hover & { - &__icon { - background-position: 100% 0; - } - } - - &__wrapper { - position: relative; - width: 100%; - height: 30px; - display: flex; - justify-content: center; - align-items: center; - - &:hover { - .tooltip_unpin { - visibility: visible; - } - } - } -} - diff --git a/src/modules/wallet/modules/assets/less/assets.less b/src/modules/wallet/modules/assets/less/assets.less deleted file mode 100644 index 78431d2645..0000000000 --- a/src/modules/wallet/modules/assets/less/assets.less +++ /dev/null @@ -1,220 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; - -.main.wallet.assets { - .content { - overflow-x: hidden; - height: auto; - - .toolbar { - width: 100%; - position: relative; - height: 42px; - margin-bottom: 10px; - - .select__title-content { - height: 36px; - } - } - - .btn-json { - position: absolute; - right: 0; - width: 140px; - @media screen and (max-width: 480px) { - width: 60px; - font-size: 0; - } - } - - .assets-list { - width: calc(~"100% + " @padding-main-layout); - position: relative; - left: @padding-main-layout * -1 / 2; - margin: @padding-main-layout / 2 0 -@padding-main-layout / 2; - - .asset-logo__logo { - margin-right: 6px; - } - } - - .chart-rate { - box-sizing: border-box; - background-color: @color-white; - position: relative; - border-radius: 4px; - box-shadow: @shadow-type-1; - - .toggler { - display: none; - } - - .toolbar { - position: relative; - display: flex; - flex-direction: row; - justify-content: space-between; - margin: 0; - padding: 0 20px; - height: @assets-toolbar-height; - - &::after { - content: ''; - position: absolute; - margin: auto; - left: 20px; - right: 20px; - bottom: 0; - height: 1px; - background-color: @color-disabled-100; - } - } - - .chart-info { - min-height: 95px; - display: flex; - flex-direction: row; - align-items: center; - justify-content: center; - - & > div:not(:last-child) { - text-align: center; - margin-right: 42px; - padding-right: 42px; - border-right: 1px solid @color-disabled-100; - } - - h1 { - margin: 0 0 5px; - text-align: center; - font-weight: normal; - } - } - - .chart-wrapper { - height: 279px; - //padding: 0 10px; - } - .chart-tooltip { - background: @white-btn-bg; - box-shadow: @shadow-type-2; - } - } - - .assets-list { - display: flex; - flex-direction: row; - flex-wrap: wrap; - } - } - - .show-fader + .main-header__header { - padding-right: 24px; - } -} - -.chart-prices-toggle { - display: none; -} - -.toolbar-balance-select { - margin-top: 10px; - display: none; -} - -i.toggler { - width: 100%; - height: 28px; - background: @dropdown-icon center center no-repeat; - position: absolute; - bottom: 0; - left: 0; - display: block; - cursor: pointer; -} - -.assets-wrapper { - height: 100%; - min-height: 210px; -} - -@media screen and (max-width: 768px) { - .toolbar-balance-radio { - display: none; - } - - .toolbar-balance-select { - display: block; - } - - .main.wallet.assets { - .content .assets-list { - margin-bottom: 0; - } - - .content .toolbar { - width: 100%; - } - - .content .chart-rate { - height: auto; - padding-bottom: 28px; - - .toggler { - display: block; - } - - .chart-info, - .chart-wrapper { - display: none; - } - - &.active { - - .chart-info { - display: flex; - } - - .chart-wrapper { - display: block; - } - - .toggler { - transform: rotate(180deg); - } - } - - .chart-info { - - & > div:not(:last-child) { - margin-right: 10px; - padding-right: 10px; - border-right: 0 none; - } - - .tag-1 { - font-size: 11px; - } - - h1 { - white-space: nowrap; - font-size: 24px; - } - - .rate { - position: relative; - } - - .change { - display: none; - } - } - - } - } - - .assets-wrapper { - max-height: 100%; - overflow: visible; - } -} diff --git a/src/modules/wallet/modules/assets/less/toaster-tokenomica.less b/src/modules/wallet/modules/assets/less/toaster-tokenomica.less deleted file mode 100644 index 7be7854bf3..0000000000 --- a/src/modules/wallet/modules/assets/less/toaster-tokenomica.less +++ /dev/null @@ -1,129 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; - -.toaster-tokenomica { - display: none; - position: fixed; - bottom: 0; - left: 0; - justify-content: space-between; - background: @color-black; - padding: 25px 32px; - width: 100%; - z-index: 5; - transform: translateY(0); - transition: transform 0.2s; - - &__link { - display: flex; - flex: 1 0; - justify-content: space-between; - align-items: center; - } - - &__logo { - background: @logo-tokenomica-icon center no-repeat; - background-size: 100%; - width: 184px; - height: 40px; - flex-shrink: 0; - margin-right: 16px; - } - - &__text { - font-size: 20px; - color: @color-white; - line-height: 18px; - } - - &__text-wrapper { - display: flex; - flex: 1 0; - justify-content: space-between; - align-items: center; - margin-left: 80px; - } - - &__button { - button { - border-radius: 0; - } - - .button__content { - font-size: 20px; - font-weight: bold; - } - } - - &__close { - display: flex; - align-items: center; - margin-left: 36px; - - &-icon { - background: @close-tokenomica-icon center no-repeat; - border: 0; - width: 16px; - height: 16px; - - &:hover { - opacity: .5; - } - } - } - - &.hidden-toaster { - transform: translateY(100%); - } - - @media screen and (max-width: 768px) { - padding: 24px; - border-radius: 16px 16px 0 0; - align-items: flex-start; - - &__link { - flex-direction: column; - align-items: flex-start; - } - - &__logo { - margin: 0 0 16px 0; - width: 109px; - height: 24px; - } - - &__text-wrapper { - flex-direction: column; - align-items: flex-start; - width: 100%; - margin-left: 0; - } - - &__text { - font-size: 14px; - margin: 0 0 16px 0; - line-height: 20px; - width: 100%; - } - - &__button { - width: 100%; - - .button { - width: 100%; - } - - .button__content { - font-size: 16px; - } - } - - &__close { - margin: -6px; - } - } -} - -.toaster_tokenomica_visible { - display: flex; -} \ No newline at end of file diff --git a/src/modules/wallet/modules/assets/services/AssetsData.js b/src/modules/wallet/modules/assets/services/AssetsData.js deleted file mode 100644 index e33e76c622..0000000000 --- a/src/modules/wallet/modules/assets/services/AssetsData.js +++ /dev/null @@ -1,60 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {User} user - * @param {app.utils.decorators} decorators - * @return {AssetsData} - */ - const factory = function (user, decorators) { - - class AssetsData { - - getGraphOptions() { - return { - grid: { - x: false, - y: false - }, - series: [ - { - dataset: 'values', - key: 'rate', - label: 'Rate', - color: '#5a81ea', - type: ['line', 'area'] - } - ], - axes: { - x: { - key: 'timestamp', - type: 'date', - ticks: 4 - }, - y: { - ticks: 4, - padding: { - max: 4 - } - } - } - }; - } - - @decorators.cachable(2) - _loadData() { - return ds.fetch('/api/assets-total/balance.json') - .then((r) => r.json()) - .then((data) => data.map((item) => ({ x: new Date(item.x), y: item.y }))); - } - - } - - return new AssetsData(); - }; - - factory.$inject = ['user', 'decorators', 'waves', 'utils']; - - angular.module('app.wallet.assets') - .factory('assetsData', factory); -})(); diff --git a/src/modules/wallet/modules/assets/templates/assets.html b/src/modules/wallet/modules/assets/templates/assets.html deleted file mode 100644 index d302b1a291..0000000000 --- a/src/modules/wallet/modules/assets/templates/assets.html +++ /dev/null @@ -1,129 +0,0 @@ -
    - - - - - - - - - - - - - - - - -
    - -
    -
    - -
    -
    - - - {{::asset.name}}• - $ - - - - - - - {{::asset.name}} - - -
    - -
    - - - - - - - - - - - -
    -
    - - - -
    -
    -

    - $  -

    -
    - -
    -
    -
    -

    {{$ctrl.change > 0 ? '+' : '-'}}$ {{$ctrl.abs($ctrl.change)}}

    -
    -  (USD) -
    -
    -
    -

    {{$ctrl.change > 0 ? '+' : '-'}}{{$ctrl.abs($ctrl.changePercent)}}%

    -
    -  (%) -
    -
    -
    - -
    - - -
    -
    $ {{$ctrl.chartEvent.price}}
    -
    - {{$ctrl.chartEvent.date}} - {{$ctrl.chartEvent.time}} -
    -
    -     -     - -
    -
    - -
    - - -
    - -
    -
    - -
    - - -
    -
    -
    - - - -
    -
    -     -
    - -
    -
    - -
    diff --git a/src/modules/wallet/modules/leasing/controllers/LeasingCtrl.js b/src/modules/wallet/modules/leasing/controllers/LeasingCtrl.js deleted file mode 100644 index 78cc7a6698..0000000000 --- a/src/modules/wallet/modules/leasing/controllers/LeasingCtrl.js +++ /dev/null @@ -1,191 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param {$rootScope.Scope} $scope - * @param {app.utils} utils - * @param {Waves} waves - * @param {ModalManager} modalManager - * @param {IPollCreate} createPoll - * @param {BalanceWatcher} balanceWatcher - * @return {LeasingCtrl} - */ - const controller = function (Base, $scope, utils, waves, modalManager, createPoll, balanceWatcher) { - - const { pathEq } = require('ramda'); - - class LeasingCtrl extends Base { - - get pendingAllLeasing() { - return !this.pending && this.allActiveLeasing == null; - } - - /** - * @type {string} - */ - filter; - /** - * @type {ITransaction[]} - * @private - */ - _txList = null; - /** - * @type {ITransaction[]} - */ - allActiveLeasing = null; - /** - * @type {ITransaction[]} - */ - transactions = []; - /** - * @type {string} - */ - nodeListLink = ''; - - - constructor() { - super($scope); - - this.syncSettings({ filter: 'wallet.leasing.filter' }); - this.pending = true; - this.chartOptions = { - items: { - available: { - color: '#66bf00', - radius: 80 - }, - leased: { - color: '#ffebc0', - radius: 64 - }, - leasedIn: { - color: '#bacaf5', - radius: 75 - } - }, - center: 34, - direction: true, - startFrom: Math.PI / 2 - }; - - this.nodeListLink = WavesApp.network.nodeList; - - waves.node.transactions.getActiveLeasingTx().then((txList) => { - this.allActiveLeasing = txList; - $scope.$apply(); - }); - - createPoll(this, this._getTransactions, this._setTxList, 3000, { isBalance: true }); - - this.receive(balanceWatcher.change, this._updateLeasingData, this); - this.observe(['_txList', 'allActiveLeasing', 'filter'], this._currentLeasingList); - - this._updateLeasingData(); - } - - /** - * @return {object} - * @public - */ - startLeasing() { - return modalManager.showStartLeasing(); - } - - /** - * @private - */ - _getTransactions() { - return waves.node.transactions.list(500); - } - - /** - * @private - */ - _updateLeasingData() { - const waves = balanceWatcher.getFullBalanceList().find(pathEq(['asset', 'id'], 'WAVES')); - - if (!waves) { - return null; - } - - const { available, leasedOut, leasedIn } = waves; - - this.available = available; - this.leased = leasedOut; - this.leasedIn = leasedIn; - this.total = available.add(leasedOut); - - this.chartData = [ - { id: 'available', value: available }, - { id: 'leased', value: leasedOut }, - { id: 'leasedIn', value: leasedIn } - ]; - utils.safeApply($scope); - } - - /** - * @param {ITransaction[]} txList - * @private - */ - _setTxList(txList) { - const AVAILABLE_TYPES_HASH = { - [waves.node.transactions.TYPES.LEASE_IN]: true, - [waves.node.transactions.TYPES.LEASE_OUT]: true, - [waves.node.transactions.TYPES.CANCEL_LEASING]: true - }; - - this._txList = txList.filter(({ typeName }) => AVAILABLE_TYPES_HASH[typeName]); - $scope.$apply(); - } - - /** - * @private - */ - _currentLeasingList() { - const txList = this._txList; - const allActiveLeasing = this.allActiveLeasing; - - if (!txList) { - return null; - } - - this.pending = !txList.length && !allActiveLeasing; - - const idHash = utils.toHash(txList, 'id'); - const result = txList.slice(); - - if (allActiveLeasing && allActiveLeasing.length) { - allActiveLeasing.forEach((tx) => { - if (!idHash[tx.id]) { - result.push(tx); - } - }); - } - - this.transactions = result; - this._filterLeasingList(); - } - - /* - * @private - */ - _filterLeasingList() { - const filter = this.filter; - if (filter === 'active') { - this.transactions = this.transactions.filter(tx => tx.status === 'active'); - } else if (filter === 'canceled') { - this.transactions = this.transactions - .filter(tx => tx.status !== 'active' || tx.typeName === 'cancel-leasing'); - } - } - - } - - return new LeasingCtrl(); - }; - - controller.$inject = ['Base', '$scope', 'utils', 'waves', 'modalManager', 'createPoll', 'balanceWatcher']; - - angular.module('app.wallet.leasing').controller('LeasingCtrl', controller); -})(); diff --git a/src/modules/wallet/modules/leasing/directives/leasingBlock/LeasingBlock.js b/src/modules/wallet/modules/leasing/directives/leasingBlock/LeasingBlock.js deleted file mode 100644 index ae97a51118..0000000000 --- a/src/modules/wallet/modules/leasing/directives/leasingBlock/LeasingBlock.js +++ /dev/null @@ -1,35 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param Base - * @param {app.i18n} i18n - * @param $attrs - * @return {LeasingBlock} - */ - const controller = function (Base, i18n, $attrs, $element) { - - class LeasingBlock extends Base { - - constructor() { - super(); - this.titleLiteral = $attrs.titleLocale; - i18n.translateField(this, 'titleLiteral', 'title', i18n.getNs($element)); - } - - } - - return new LeasingBlock(); - }; - - controller.$inject = ['Base', 'i18n', '$attrs', '$element']; - - angular.module('app.wallet.leasing').component('wLeasingBlock', { - bindings: { - titleLocale: '@' - }, - templateUrl: 'modules/wallet/modules/leasing/directives/leasingBlock/leasingBlock.html', - transclude: true, - controller - }); -})(); diff --git a/src/modules/wallet/modules/leasing/directives/leasingBlock/leasingBlock.html b/src/modules/wallet/modules/leasing/directives/leasingBlock/leasingBlock.html deleted file mode 100644 index f2c54b7d0c..0000000000 --- a/src/modules/wallet/modules/leasing/directives/leasingBlock/leasingBlock.html +++ /dev/null @@ -1,4 +0,0 @@ -
    -
    {{::$ctrl.title}}
    -
    -
    diff --git a/src/modules/wallet/modules/leasing/directives/leasingBlock/leasingBlock.less b/src/modules/wallet/modules/leasing/directives/leasingBlock/leasingBlock.less deleted file mode 100644 index 754141d35f..0000000000 --- a/src/modules/wallet/modules/leasing/directives/leasingBlock/leasingBlock.less +++ /dev/null @@ -1,43 +0,0 @@ -@import (reference) '../../../../../app/less/typography'; -@import (reference) 'config'; - -w-leasing-block { - display: block; - - .leasing-block { - display: block; - width: 100%; - border-radius: @border-radius; - background-color: @color-white; - box-shadow: @shadow-type-1; - - &__title { - height: 20px; - display: flex; - align-items: center; - padding: 0 20px; - z-index: 2; - position: relative; - color: @color-basic-900; - font-family: @font-roboto-medium; - } - - &__content { - padding: 0 20px 20px; - - .balance-container { - font-size: 28px; - line-height: 34px; - font-weight: normal; - - .int { - font-family: @font-roboto-regular; - } - - .decimal { - font-family: @font-roboto-light; - } - } - } - } -} diff --git a/src/modules/wallet/modules/leasing/leasing.js b/src/modules/wallet/modules/leasing/leasing.js deleted file mode 100644 index 3539133e60..0000000000 --- a/src/modules/wallet/modules/leasing/leasing.js +++ /dev/null @@ -1,5 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.wallet.leasing', []); -})(); diff --git a/src/modules/wallet/modules/leasing/less/leasing.less b/src/modules/wallet/modules/leasing/less/leasing.less deleted file mode 100644 index cd9ca30052..0000000000 --- a/src/modules/wallet/modules/leasing/less/leasing.less +++ /dev/null @@ -1,170 +0,0 @@ -@import (reference) "../../../../app/less/app-icons"; -@import (reference) 'config'; -@import (reference) 'icons'; - -@leftPanelWidth: 330px; -@leftPanelRightMargin: 10px; - -.leasing-page { - display: flex; - flex-direction: row; - width: 100%; - height: 100%; - max-height: calc(~'100vh - 90px'); - - w-transaction { - .transaction { - padding-left: 10px; - } - } - - .left-panel { - height: 100%; - max-height: calc(~'100vh - 90px'); - overflow-y: auto; - width: @leftPanelWidth; - margin-right: @leftPanelRightMargin; - } - - .btn-wrap.btn-group { - justify-content: flex-start; - padding: 0; - align-items: center; - height: 42px; - } - - w-scroll-box { - border-radius: 0 0 @border-radius @border-radius; - height: calc(~'100vh - ' 130px); - display: flex; - flex-direction: column; - overflow: auto; - - .scroll-list { - height: 100%; - } - } - - .transaction-item > .date { - display: none; - } - - .transactions-container { - width: calc(~'100% - '@leftPanelWidth + @leftPanelRightMargin); - position: relative; - } - - .chart-wrapper { - display: flex; - width: 100%; - justify-content: center; - } - - .legend-container { - .legend-item { - position: relative; - display: flex; - flex-direction: row; - align-items: center; - justify-content: space-between; - padding-bottom: 10px; - - &:not(:first-child) { - margin-top: 10px; - } - - .part { - display: flex; - align-items: center; - - .legend-color { - width: 12px; - height: 12px; - border-radius: 100%; - } - } - - &::after { - content: ''; - position: absolute; - width: 100%; - bottom: 0; - height: 0; - border-bottom: 1px dashed @color-basic-200; - } - } - } - - .description-split { - margin: 30px 0; - height: 0; - border-bottom: 1px dashed @color-basic-100; - } - - .icon-description { - position: relative; - padding-left: 60px; - - &::before { - content: ''; - position: absolute; - left: 0; - top: 0; - width: 50px; - height: 48px; - background-image: @leasing-note-icon; - } - } -} - -@media screen and (max-width: @width-media-normal) { - .transaction-item .locale-address { - display: none; - } -} - -@media screen and (max-width: 768px) { - .leasing-page { - height: auto; - display: block; - overflow: visible; - - w-scroll-box { - margin-bottom: 10px; - min-height: 300px; - } - - .left-panel { - width: 100%; - max-height: 100%; - overflow-y: visible; - } - - .transactions-container { - width: 100%; - } - - w-transaction .transaction { - height: auto; - min-height: 74px; - } - } - - .expandable-block { - margin-bottom: 10px; - } -} - -@media screen and (max-height: 355px) { - .leasing-page { - max-height: 100%; - - .left-panel { - min-height: 263px; - } - - w-scroll-box { - min-height: 223px; - } - } -} diff --git a/src/modules/wallet/modules/leasing/templates/leasing.html b/src/modules/wallet/modules/leasing/templates/leasing.html deleted file mode 100644 index 145146abd2..0000000000 --- a/src/modules/wallet/modules/leasing/templates/leasing.html +++ /dev/null @@ -1,77 +0,0 @@ -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    -
    - -
    -
    - -
    -
    -
    - - - - - -
    -     - - -
    -
    -
    -
    -
    - - - -     - -
    -
    -
    - - - - - - - - - - - -
    - -
    - -
    - -
    -
    -     -
    -
    diff --git a/src/modules/wallet/modules/portfolio/controllers/PortfolioCtrl.js b/src/modules/wallet/modules/portfolio/controllers/PortfolioCtrl.js deleted file mode 100644 index 3eda1d13d0..0000000000 --- a/src/modules/wallet/modules/portfolio/controllers/PortfolioCtrl.js +++ /dev/null @@ -1,452 +0,0 @@ -(function () { - 'use strict'; - - const { get } = require('ts-utils'); - - const { splitEvery, flatten } = require('ramda'); - - const searchByNameAndId = ($scope, key, list) => { - const query = $scope[key]; - if (!query) { - return list; - } - - return list.filter((item) => { - const name = get({ item }, 'item.asset.name'); - const id = get({ item }, 'item.asset.id'); - return String(name).toLowerCase().indexOf(query.toLowerCase()) !== -1 || String(id) === query; - }); - }; - - const ds = require('data-service'); - - /** - * @param {Base} Base - * @param {$rootScope.Scope} $scope - * @param {Waves} waves - * @param {app.utils} utils - * @param {ModalManager} modalManager - * @param {User} user - * @param {GatewayService} gatewayService - * @param {$state} $state - * @param {STService} stService - * @param {VisibleService} visibleService - * @param {BalanceWatcher} balanceWatcher - * @param {INotification} notification - * @return {PortfolioCtrl} - */ - const controller = function (Base, $scope, waves, utils, modalManager, user, - gatewayService, $state, - stService, visibleService, balanceWatcher, notification) { - - class PortfolioCtrl extends Base { - - constructor() { - super($scope); - /** - * @type {string} - */ - this.mirrorId = user.getSetting('baseAssetId'); - /** - * @type {Asset} - */ - this.mirror = null; - /** - * @type {string[]} - */ - this.pinned = []; - /** - * @type {string} - */ - this.address = user.address; - /** - * @type {Array} - */ - this.spam = []; - /** - * @type {PortfolioCtrl.IBalances} - */ - this.details = null; - /** - * @type {Array} - */ - this.balanceList = []; - /** - * @type {string} - */ - this.filter = null; - /** - * @type {Moment} - */ - this.chartStartDate = utils.moment().add().day(-7); - /** - * @type {boolean} - */ - this.pending = true; - /** - * @type {boolean} - */ - this.dontShowSpam = user.getSetting('dontShowSpam'); - - waves.node.assets.getAsset(this.mirrorId) - .then((mirror) => { - this.mirror = mirror; - /** - * @type {Array} - */ - this.tableHeaders = [ - { - id: 'name', - title: { literal: 'list.name' }, - valuePath: 'item.asset.name', - sort: true, - search: searchByNameAndId, - placeholder: 'portfolio.filter' - }, - { - id: 'balance', - title: { literal: 'list.balance' }, - valuePath: 'item.available', - sort: true - }, - { - id: 'inOrders', - title: { literal: 'list.inOrders' }, - valuePath: 'item.inOrders', - sort: true - }, - { - id: 'mirror', - title: { literal: 'list.mirror', params: { currency: mirror.displayName } } - }, - { - id: 'rate', - title: { literal: 'list.rate', params: { currency: mirror.displayName } } - }, - { - id: 'change24', - title: { literal: 'list.change' } - }, - { - id: 'controls' - } - ]; - - $scope.$digest(); - }); - - this.syncSettings({ - pinned: 'pinnedAssetIdList', - spam: 'wallet.portfolio.spam', - filter: 'wallet.portfolio.filter', - dontShowSpam: 'dontShowSpam' - }); - - balanceWatcher.ready - .then(() => { - const onChange = () => { - this._updateBalances(); - visibleService.updateSort(); - }; - - this.receive(balanceWatcher.change, onChange); - this.receive(utils.observe(user, 'scam'), onChange); - this.observe(['pinned', 'spam', 'dontShowSpam'], onChange); - - this._updateBalances(); - }); - - balanceWatcher.ready.then(() => { - this.pending = false; - this.observe('details', this._onChangeDetails); - this.observe('filter', this._onChangeDetails); - - // this._onChangeDetails(); - utils.safeApply($scope); - }); - - this.receive(stService.sort, () => { - visibleService.updateSort(); - }); - - waves.node.assets.getNft(1).then(list => { - if (list.length) { - const id = `n-${Date.now()}`; - notification.info({ - id, - ns: 'app.wallet.portfolio', - title: { - literal: 'hasNftToken', - params: { address: user.address } - } - }, -1); - this.signals.destroy.once(() => { - notification.remove(id); - }); - } - }); - } - - /** - * @param {Asset} asset - */ - showAsset(asset) { - modalManager.showAssetInfo(asset); - } - - /** - * @param {Asset} asset - */ - showSend(asset) { - return modalManager.showSendAsset({ assetId: asset && asset.id }); - } - - /** - * @param {Asset} asset - */ - showReceivePopup(asset) { - return modalManager.showReceiveModal(asset); - } - - /** - * @param {Asset} asset - */ - showDeposit(asset) { - return modalManager.showDepositAsset(user, asset); - } - - /** - * @param {Asset} asset - */ - showSepa(asset) { - return modalManager.showSepaAsset(user, asset); - } - - showBurn(assetId) { - return modalManager.showBurnModal(assetId); - } - - showReissue(assetId) { - return modalManager.showReissueModal(assetId); - } - - canShowDex(balance) { - return balance.isPinned || - balance.asset.isMyAsset || - balance.asset.id === WavesApp.defaultAssets.WAVES || - gatewayService.getPurchasableWithCards()[balance.asset.id] || - gatewayService.getCryptocurrencies()[balance.asset.id] || - gatewayService.getFiats()[balance.asset.id]; - } - - /** - * @param {Asset} asset - */ - openDex(asset) { - $state.go('main.dex', this.getSrefParams(asset)); - } - - /** - * @param {Asset} asset - */ - getSrefParams(asset) { - utils.openDex(asset.id); - } - - /** - * @param {Asset} asset - * @param {boolean} [state] - */ - togglePin(asset, state) { - user.togglePinAsset(asset.id, state); - this.poll.restart(); - } - - /** - * @param {Asset} asset - * @param {boolean} [state] - */ - toggleSpam(asset, state) { - user.toggleSpamAsset(asset.id, state); - this.poll.restart(); - } - - isDepositSupported(asset) { - const isWaves = asset.id === WavesApp.defaultAssets.WAVES; - - return gatewayService.hasSupportOf(asset, 'deposit') || isWaves; - } - - isSepaSupported(asset) { - return gatewayService.hasSupportOf(asset, 'sepa'); - } - - /** - * @private - */ - _onChangeDetails() { - const details = this.details; - let balanceList; - - switch (this.filter) { - case 'active': - balanceList = details.active.slice(); - break; - case 'pinned': - balanceList = details.pinned.slice(); - break; - case 'spam': - balanceList = details.spam.slice(); - break; - case 'my': - balanceList = details.my.slice(); - break; - case 'verified': - balanceList = details.verified.slice(); - break; - default: - throw new Error('Wrong filter name!'); - } - - this.balanceList = balanceList; - } - - _addRating(balanceList) { - return Promise.all(splitEvery(25, balanceList).map(block => { - return ds.api.rating.getAssetsRating(block.map(balanceItem => balanceItem.asset.id)); - })).then(list => { - const listHash = utils.toHash(flatten(list), 'assetId'); - return balanceList.map(balanceItem => { - balanceItem.rating = listHash[balanceItem.asset.id] ? - listHash[balanceItem.asset.id].rating : - null; - return balanceItem; - }); - }) - .catch(() => { - return balanceList; - }); - } - - /** - * @private - */ - _updateBalances() { - const balanceList = balanceWatcher.getFullBalanceList(); - - this._addRating(balanceList).then(balanceListWithRating => { - this.details = balanceListWithRating - .map(item => { - const isPinned = this._isPinned(item.asset.id); - const isSpam = this._isSpam(item.asset.id); - const isOnScamList = user.scam[item.asset.id]; - return { - available: item.available, - asset: item.asset, - inOrders: item.inOrders, - isPinned, - isSpam, - isOnScamList, - rating: item.rating || null, - minSponsoredAssetFee: item.asset.minSponsoredAssetFee, - sponsorBalance: item.asset.sponsorBalance, - leasedOut: item.leasedOut - }; - }) - .reduce((acc, item) => { - const oracleData = ds.dataManager.getOraclesAssetData(item.asset.id); - const spam = item.isOnScamList || item.isSpam; - - if (oracleData && oracleData.status > 0) { - acc.verified.push(item); - } - - if (spam) { - if (!this.dontShowSpam) { - if (item.asset.sender === user.address) { - acc.my.push(item); - } - acc.spam.push(item); - acc.active.push(item); - } - } else { - if (item.asset.sender === user.address) { - acc.my.push(item); - } - acc.active.push(item); - } - - return acc; - }, { spam: [], my: [], active: [], verified: [] }); - - - utils.safeApply($scope); - }); - } - - /** - * @param assetId - * @return {boolean} - * @private - */ - _isPinned(assetId) { - return this.pinned.includes(assetId); - } - - /** - * @param assetId - * @return {boolean} - * @private - */ - _isSpam(assetId) { - return this.spam.includes(assetId); - } - - } - - return new PortfolioCtrl(); - }; - - controller.$inject = [ - 'Base', - '$scope', - 'waves', - 'utils', - 'modalManager', - 'user', - 'gatewayService', - '$state', - 'stService', - 'visibleService', - 'balanceWatcher', - 'notification' - ]; - - angular.module('app.wallet.portfolio') - .controller('PortfolioCtrl', controller); -})(); - -/** - * @name PortfolioCtrl - */ - -/** - * @typedef {object} PortfolioCtrl#IPortfolioBalanceDetails - * @property {boolean} isPinned - * @property {boolean} isSpam - * @property {boolean} isOnScamList - * @property {Asset} asset - * @property {Money} available - * @property {Money} inOrders - * @property {Money|void} minSponsoredAssetFee - * @property {Money|void} sponsorBalance - */ - -/** - * @typedef {object} PortfolioCtrl#IBalances - * @property {Array} active - * @property {Array} pinned // TODO when available assets store - * @property {Array} spam - * @property {Array} my - * @property {Array} verified - */ diff --git a/src/modules/wallet/modules/portfolio/directives/portfolioRow/PortfolioRow.js b/src/modules/wallet/modules/portfolio/directives/portfolioRow/PortfolioRow.js deleted file mode 100644 index 38c94ad37c..0000000000 --- a/src/modules/wallet/modules/portfolio/directives/portfolioRow/PortfolioRow.js +++ /dev/null @@ -1,677 +0,0 @@ -(function () { - 'use strict'; - - const Handlebars = require('handlebars'); - const { STATUS_LIST } = require('@waves/oracle-data'); - const { path } = require('ramda'); - const { SIGN_TYPE } = require('@waves/signature-adapter'); - const analytics = require('@waves/event-sender'); - const { BigNumber } = require('@waves/bignumber'); - - const TEMPLATE_PATH = 'modules/wallet/modules/portfolio/directives/portfolioRow/row.hbs'; - const SELECTORS = { - AVAILABLE: 'js-balance-available', - SPONSORED: 'js-sponsored-asset', - IN_RESERVED: 'js-balance-in-reserved', - BASE_ASSET_BALANCE: 'js-balance-in-base-asset', - EXCHANGE_RATE: 'js-exchange-rate', - CHANGE_24: 'js-change-24', - CHART_CONTAINER: 'js-chart-container', - STARS_CONTAINER: 'js-stars-container', - BUTTONS: { - SEND: 'js-button-send', - RECEIVE: 'js-button-receive', - DEX: 'js-button-open-in-dex', - TOGGLE_SPAM: 'js-button-toggle-spam' - }, - ACTION_BUTTONS: { - ASSET_INFO: 'js-action-button-asset-info', - SEND: 'js-action-button-send', - RECEIVE: 'js-action-button-receive', - BURN: 'js-action-button-burn', - REISSUE: 'js-action-button-reissue', - DEX: 'js-action-button-dex', - TOGGLE_SPAM: 'js-action-button-toggle-spam', - SPONSORSHIP_CREATE: 'js-action-button-sponsorship_create', - SPONSORSHIP_EDIT: 'js-action-button-sponsorship_edit', - SPONSORSHIP_STOP: 'js-action-button-cancel-sponsorship', - SET_ASSET_SCRIPT: 'js-action-button-set-asset-script' - }, - SUSPICIOUS_LABEL: 'js-suspicious-label' - }; - - const i18next = require('i18next'); - const ds = require('data-service'); - /** - * @param Base - * @param {$rootScope.Scope} $scope - * @return {PortfolioRow} - */ - const controller = function (Base, - $templateRequest, - $element, - utils, - waves, - user, - modalManager, - $state, - ChartFactory, - RatingStarsFactory, - i18n, - $scope, - gatewayService, - createPoll) { - - class PortfolioRow extends Base { - - /** - * @type {typeof ChartFactory} - */ - ChartFactory = null; - /** - * @type {$state} - */ - $state = null; - /** - * @type {$rootScope.Scope} - */ - $scope = null; - /** - * @type {app.i18n} - */ - i18n = null; - /** - * @type {ModalManager} - */ - modalManager = null; - /** - * @type {JQuery} - */ - $node = null; - /** - * @type {HTMLElement} - */ - node = null; - /** - * @type {PortfolioCtrl.IPortfolioBalanceDetails} - */ - balance = null; - /** - * @type {app.utils} - */ - utils = null; - /** - * @type {Waves} - */ - waves = null; - /** - * @type {User} - */ - user = null; - /** - * @type {boolean} - */ - canShowDex = null; - /** - * @type {gatewayService} - */ - gatewayService = null; - /** - * @param {IPollCreate} createPoll - */ - createPoll = null; - /** - * @type {boolean} - */ - isSmart = false; - /** - * @type {boolean} - * @private - */ - _isMyAsset = false; - /** - * @type {Function} - */ - changeLanguageHandler = () => this._onChangeLanguage(); - - - constructor() { - super(); - this.ChartFactory = ChartFactory; - this.$state = $state; - this.$scope = $scope; - this.i18n = i18n; - this.modalManager = modalManager; - this.$node = $element; - this.node = $element.get(0); - this.utils = utils; - this.waves = waves; - this.user = user; - this.gatewayService = gatewayService; - this.createPoll = createPoll; - - if (!PortfolioRow.templatePromise) { - PortfolioRow.templatePromise = $templateRequest(TEMPLATE_PATH) - .then((html) => Handlebars.compile(html)); - } - - this.chartOptions = { - axisX: 'timestamp', - axisY: 'rate', - view: { - rate: { - lineColor: 'rgba(90, 129, 234)', - fillColor: 'rgba(90, 129, 234, .3)', - lineWidth: 1 - } - } - }; - } - - $postLink() { - this._isWaves = this.balance.asset.id === WavesApp.defaultAssets.WAVES; - this._isMyAsset = this.balance.asset.sender === this.user.address; - this.canShowDex = this._getCanShowDex(); - const canStopSponsored = this._getCanStopSponsored(); - - Promise.all([ - this.waves.node.getFeeList({ type: SIGN_TYPE.TRANSFER }), - PortfolioRow.templatePromise - ]).then(([list, template]) => { - - let balance = this.balance; - - this.isSmart = balance.asset.hasScript; - const firstAssetChar = this.balance.asset.name.slice(0, 1); - const canPayFee = list.find(item => item.asset.id === this.balance.asset.id) && !this._isWaves; - const { - isVerified, isGateway, - isTokenomica, logo, isGatewaySoon - } = utils.getDataFromOracles(this.balance.asset.id); - - this.isGateway = isGateway; - this.isWEST = this.balance.asset.id === WavesApp.defaultAssets.WEST; - - this.isVerifiedOrGateway = isVerified || isGateway; - - const html = template({ - canSetAssetScript: this._isMyAsset && this.isSmart, - isSmart: this.isSmart, - isVerified: this.isVerified, - isGateway: isGateway, - isTokenomica: isTokenomica, - isWEST: this.isWEST, - isGatewaySoon: isGatewaySoon, - assetIconPath: logo || - this.utils.getAssetLogo(this.balance.asset.id), - firstAssetChar, - canBurn: !this._isWaves, - canReissue: this._isMyAsset && this.balance.asset.reissuable, - charColor: this.utils.getAssetLogoBackground(this.balance.asset.id), - assetName: this.balance.asset.name, - SELECTORS: { ...SELECTORS }, - canShowDex: this.canShowDex, - canShowToggleSpam: this._canShowToggleSpam(), - canSponsored: this._isMyAsset, - canPayFee, - canStopSponsored - }); - - this.node.innerHTML = html; - - Object.defineProperty(this, 'balance', { - get: () => balance, - set: (value) => { - if (this.balance.asset.id !== value.asset.id || - !this.balance.available.getTokens().eq(value.available.getTokens()) || - !this.balance.inOrders.getTokens().eq(value.inOrders.getTokens()) || - this.balance.isOnScamList !== value.isOnScamList - ) { - balance = value; - this._onUpdateBalance(); - } - // TODO Optimize this - this._initSponsorShips(); - } - }); - /** - * @type {Poll} - * @private - */ - this._poll = createPoll(this, this._initSponsorShips, angular.noop, 5000); - this._onUpdateBalance(); - this._setHandlers(); - this.changeLanguageHandler(); - }); - } - - $onDestroy() { - super.$onDestroy(); - this.$node.off(); - } - - /** - * @private - */ - _onChangeLanguage() { - const nodeList = this.node.querySelectorAll('[w-i18n-literal]'); - this._updateBalances(); - - Array.prototype.forEach.call(nodeList, element => { - element.innerHTML = this.i18n.translate( - element.getAttribute('w-i18n-literal'), - 'app.wallet.portfolio'); - }); - } - - /** - * @return {boolean} - * @private - */ - _getCanStopSponsored() { - return this._isMyAsset && ds.utils.getTransferFeeList() - .find(item => item.asset.id === this.balance.asset.id); - } - - /** - * @return {boolean} - * @private - */ - _getCanShowDex() { - const statusPath = ['assets', this.balance.asset.id, 'status']; - const isAssetLockedInDex = utils.isLockedInDex(this.balance.asset.id); - return !isAssetLockedInDex && - (this.balance.isPinned || - this._isMyAsset || - this.balance.asset.isMyAsset || - this.balance.asset.id === WavesApp.defaultAssets.WAVES || - this.gatewayService.getPurchasableWithCards()[this.balance.asset.id] || - this.gatewayService.getCryptocurrencies()[this.balance.asset.id] || - this.gatewayService.getFiats()[this.balance.asset.id] || - path(statusPath, ds.dataManager.getOracleData('oracleWaves')) === STATUS_LIST.VERIFIED); - - } - - /** - * @private - */ - _onUpdateBalance() { - this._updateBalances(); - this._initSpamState(); - - const balance = this.balance; - - if (balance.isOnScamList) { - this.node.querySelector(`.${SELECTORS.CHANGE_24}`).innerHTML = '—'; - this.node.querySelector(`.${SELECTORS.BASE_ASSET_BALANCE}`).innerHTML = '—'; - this.node.querySelector(`.${SELECTORS.EXCHANGE_RATE}`).innerHTML = '—'; - this.node.querySelector(`.${SELECTORS.SUSPICIOUS_LABEL}`).classList.remove('hidden'); - - return null; - } - - const suspiciousSelector = this.node.querySelector(`.${SELECTORS.SUSPICIOUS_LABEL}`); - if (suspiciousSelector) { - suspiciousSelector.classList.add('hidden'); - } - - const baseAssetId = this.user.getSetting('baseAssetId'); - const change24Node = this.node.querySelector(`.${SELECTORS.CHANGE_24}`); - - if (baseAssetId === balance.asset.id) { - change24Node.innerHTML = '—'; - change24Node.classList.remove('minus'); - change24Node.classList.remove('plus'); - } else { - const baseChange24AssetId = WavesApp.defaultAssets.WAVES === balance.asset.id ? - baseAssetId : - WavesApp.defaultAssets.WAVES; - this.waves.utils.getChange(balance.asset.id, baseChange24AssetId) - .then(change24 => { - const change24BN = new BigNumber(change24); - const isMoreZero = change24BN.gt(0); - const isLessZero = change24BN.lt(0); - change24Node.classList.toggle('minus', isLessZero); - change24Node.classList.toggle('plus', isMoreZero); - change24Node.innerHTML = `${change24.toFixed(2)}%`; - }, () => { - change24Node.innerHTML = '0.00%'; - }); - } - - if (baseAssetId === balance.asset.id) { - this.node.querySelector(`.${SELECTORS.EXCHANGE_RATE}`).innerHTML = '—'; - this.node.querySelector(`.${SELECTORS.BASE_ASSET_BALANCE}`).innerHTML = '—'; - } else { - this.waves.utils.getRate(balance.asset.id, baseAssetId) - .then(rate => { - const baseAssetBalance = balance.available.getTokens().mul(rate).toFormat(2); - this.node.querySelector(`.${SELECTORS.EXCHANGE_RATE}`).innerHTML = rate.toFixed(2); - this.node.querySelector(`.${SELECTORS.BASE_ASSET_BALANCE}`).innerHTML = baseAssetBalance; - }) - .catch(() => null); - - const startDate = this.utils.moment().add().day(-7); - this.waves.utils.getRateHistory(balance.asset.id, baseAssetId, startDate).then(values => { - const chartData = { - rate: values.map(item => ({ ...item, rate: Number(item.rate.toFixed()) })) - }; - this.chart = new this.ChartFactory( - this.$node.find(`.${SELECTORS.CHART_CONTAINER}`), - this.chartOptions, - chartData - ); - }).catch(() => null); - - const hasRate = balance.rating !== null; - - if (hasRate && !this.isGateway && balance.asset.id !== WavesApp.defaultAssets.WAVES) { - new RatingStarsFactory({ - $container: this.$node.find(`.${SELECTORS.STARS_CONTAINER}`), - rating: balance.rating, - size: 's' - }); - } - } - - } - - /** - * @private - */ - _initActions() { - let expanded = false; - - const $wrapper = this.$node.find('.actions__container'); - - const toggleExpanded = () => { - expanded = !expanded; - const conteiner = this.$node.find('.actions__container'); - const conteinerNode = conteiner.get(0); - conteiner.toggleClass('expanded', expanded); - - if (expanded) { - $(document).on('mousedown', _handler); - const dropDownPosition = conteinerNode.getBoundingClientRect(); - const bodyPosition = document.body.getBoundingClientRect(); - conteinerNode.classList.toggle('to-up', dropDownPosition.bottom > bodyPosition.bottom); - return; - } - - $(document).off('mousedown', _handler); - conteinerNode.classList.remove('to-up'); - }; - - const _handler = e => { - if ($(e.target).closest($wrapper).length === 0) { - toggleExpanded(); - } - }; - - this.$node.find('.actions__click').on('click', () => { - toggleExpanded(); - }); - - this.$scope.$on('$destroy', () => { - $(document).off('mousedown', _handler); - }); - } - - /** - * @private - */ - _setHandlers() { - this._initActions(); - - this.listenEventEmitter(i18next, 'languageChanged', this.changeLanguageHandler); - - this.$node.on('click', `.${SELECTORS.BUTTONS.SEND}`, () => { - analytics.send({ - name: 'Transfer Click', - params: { Currency: this.balance.asset.id }, - target: 'ui' - }); - this.modalManager.showSendAsset({ assetId: this.balance.asset.id }); - }); - - this.$node.on('click', `.${SELECTORS.BUTTONS.DEX}`, () => { - analytics.send({ - name: 'Wallet Portfolio Open in DEX Click', - params: { Currency: this.balance.asset.id }, - target: 'ui' - }); - this.$state.go('main.dex', this._getSrefParams(this.balance.asset)); - }); - - this.$node.on('click', `.${SELECTORS.BUTTONS.RECEIVE}`, () => { - analytics.send({ - name: 'Transfer Click', - params: { Currency: this.balance.asset.id }, - target: 'ui' - }); - this.modalManager.showReceiveModal(this.balance.asset); - }); - - this.$node.on('click', `.${SELECTORS.BUTTONS.TOGGLE_SPAM}`, () => { - this.user.toggleSpamAsset(this.balance.asset.id); - this._initSpamState(); - }); - - this.$node.on('click', `.${SELECTORS.ACTION_BUTTONS.ASSET_INFO}`, () => { - this.modalManager.showAssetInfo(this.balance.asset); - }); - - this.$node.on('click', `.${SELECTORS.ACTION_BUTTONS.SEND}`, () => { - analytics.send({ - name: 'Transfer Click', - params: { Currency: this.balance.asset.id }, - target: 'ui' - }); - this.modalManager.showSendAsset({ assetId: this.balance.asset.id }); - }); - - this.$node.on('click', `.${SELECTORS.ACTION_BUTTONS.RECEIVE}`, () => { - analytics.send({ - name: 'Transfer Click', - params: { Currency: this.balance.asset.id }, - target: 'ui' - }); - this.modalManager.showReceiveModal(this.balance.asset); - }); - - this.$node.on('click', `.${SELECTORS.ACTION_BUTTONS.BURN}`, () => { - analytics.send({ - name: 'Burn Token Click', - params: { Currency: this.balance.asset.id }, - target: 'ui' - }); - this.modalManager.showBurnModal(this.balance.asset.id); - }); - - this.$node.on('click', `.${SELECTORS.ACTION_BUTTONS.REISSUE}`, () => { - analytics.send({ - name: 'Reissue Token Click', - params: { Currency: this.balance.asset.id }, - target: 'ui' - }); - this.modalManager.showReissueModal(this.balance.asset.id); - }); - - this.$node.on('click', `.${SELECTORS.ACTION_BUTTONS.DEX}`, () => { - analytics.send({ - name: 'Wallet Portfolio Open in DEX Click', - params: { Currency: this.balance.asset.id }, - target: 'ui' - }); - this.$state.go('main.dex', this._getSrefParams(this.balance.asset)); - }); - - this.$node.on('click', `.${SELECTORS.ACTION_BUTTONS.SPONSORSHIP_CREATE}`, () => { - analytics.send({ - name: 'Enable Sponsorship Click', - params: { Currency: this.balance.asset.id }, - target: 'ui' - }); - this.modalManager.showSponsorshipModal(this.balance.asset.id); - }); - - this.$node.on('click', `.${SELECTORS.ACTION_BUTTONS.SET_ASSET_SCRIPT}`, () => { - analytics.send({ - name: 'Update Script Click', - params: { Currency: this.balance.asset.id }, - target: 'ui' - }); - this.modalManager.showSetAssetScriptModal(this.balance.asset.id); - }); - - this.$node.on('click', `.${SELECTORS.ACTION_BUTTONS.SPONSORSHIP_EDIT}`, () => { - analytics.send({ - name: 'Change Sponsorship Click', - params: { Currency: this.balance.asset.id }, - target: 'ui' - }); - this.modalManager.showSponsorshipModal(this.balance.asset.id, true); - }); - - this.$node.on('click', `.${SELECTORS.ACTION_BUTTONS.SPONSORSHIP_STOP}`, () => { - analytics.send({ - name: 'Disable Sponsorship Click', - params: { Currency: this.balance.asset.id }, - target: 'ui' - }); - this.modalManager.showSponsorshipStopModal(this.balance.asset.id); - }); - - this.$node.on('click', `.${SELECTORS.ACTION_BUTTONS.TOGGLE_SPAM}`, () => { - this.user.toggleSpamAsset(this.balance.asset.id); - this._initSpamState(); - }); - } - - /** - * @private - */ - _initSpamState() { - if (!this._canShowToggleSpam()) { - return null; - } - - const spam = this.user.getSetting('wallet.portfolio.spam') || []; - const isSpam = spam.includes(this.balance.asset.id); - - const elements = [ - this.node.querySelector(`.${SELECTORS.BUTTONS.TOGGLE_SPAM}`), - this.node.querySelector(`.${SELECTORS.ACTION_BUTTONS.TOGGLE_SPAM}`) - ]; - elements.forEach(toggleSpam => { - if (toggleSpam) { - toggleSpam.classList.toggle('icon-hide', !isSpam); - toggleSpam.classList.toggle('icon-show', isSpam); - } - }); - } - - /** - * @param list - * @private - */ - _initSponsorShips(list) { - const canStopSponsored = !!this._getCanStopSponsored(); - const canSponsored = !!this._isMyAsset; - const isSmart = this.isSmart; - - const btnCreate = this.node.querySelector(`.${SELECTORS.ACTION_BUTTONS.SPONSORSHIP_CREATE}`); - const btnEdit = this.node.querySelector(`.${SELECTORS.ACTION_BUTTONS.SPONSORSHIP_EDIT}`); - const btnStop = this.node.querySelector(`.${SELECTORS.ACTION_BUTTONS.SPONSORSHIP_STOP}`); - const icon = this.node.querySelector(`.${SELECTORS.SPONSORED} .asset-logo__marker`); - - btnCreate.classList.toggle('hidden', isSmart || !(canSponsored && !canStopSponsored)); - btnEdit.classList.toggle('hidden', !(canSponsored && canStopSponsored)); - btnStop.classList.toggle('hidden', isSmart || !canStopSponsored); - - Promise.resolve(list || this.waves.node.getFeeList({ type: SIGN_TYPE.TRANSFER })) - .then((list) => { - const canPayFee = list.find(item => item.asset.id === this.balance.asset.id) && !this._isWaves; - icon.classList.toggle('asset-logo__marker_sponsored', !!canPayFee); - }); - } - - /** - * @param {Asset} asset - * @private - */ - _getSrefParams(asset) { - this.utils.openDex(asset.id); - - } - - /** - * @private - */ - _updateBalances() { - const asset = this.balance.asset; - const available = this.balance.available.getTokens(); - const inOrders = this.balance.inOrders.getTokens(); - const leasedOut = this.balance.leasedOut.getTokens(); - const availableHtml = this.utils.getNiceNumberTemplate(available, asset.precision, true); - const inReservedHtml = this.utils.getNiceNumberTemplate(inOrders.add(leasedOut), asset.precision); - this.node.querySelector(`.${SELECTORS.AVAILABLE}`).innerHTML = availableHtml; - this.node.querySelector(`.${SELECTORS.IN_RESERVED}`).innerHTML = inReservedHtml; - } - - /** - * @returns {boolean} - * @private - */ - _canShowToggleSpam() { - if (this._isMyAsset) { - return false; - } - - return !this.isVerifiedOrGateway && !this.user.scam[this.balance.asset.id]; - } - - } - - return new PortfolioRow($templateRequest, - $element, - utils, - waves, - user, - modalManager, - $state, - ChartFactory, - RatingStarsFactory, - i18n, - $scope, - gatewayService, - createPoll); - }; - - controller.$inject = [ - 'Base', - '$templateRequest', - '$element', - 'utils', - 'waves', - 'user', - 'modalManager', - '$state', - 'ChartFactory', - 'RatingStarsFactory', - 'i18n', - '$scope', - 'gatewayService', - 'createPoll' - ]; - - angular.module('app.wallet.portfolio').component('wPortfolioRow', { - controller, - bindings: { - balance: '<', - canShowDex: '<' - }, - scope: false - }); - -})(); diff --git a/src/modules/wallet/modules/portfolio/directives/portfolioRow/portfolio-row.less b/src/modules/wallet/modules/portfolio/directives/portfolioRow/portfolio-row.less deleted file mode 100644 index b19b718608..0000000000 --- a/src/modules/wallet/modules/portfolio/directives/portfolioRow/portfolio-row.less +++ /dev/null @@ -1,85 +0,0 @@ -@import (reference) 'config'; - -w-portfolio-row { - display: flex; - width: 100%; - - .asset { - &__logo { - position: relative; - left: 0; - } - - &__marker { - display: none; - position: absolute; - bottom: calc(50% ~'- 16px'); - - &_smart, - &_sponsored { - display: block; - } - } - &__marker { - display: none; - } - } - - .spam & &__marker { - background-color: @color-basic-200 !important; - } - - .spam & .asset__marker { - background-color: @color-basic-200 !important; - } - - .smart-table { - &__chart-wrap { - .cell { - position: relative; - width: 84px; - padding-right: 10px; - float: right; - - .chart-asset-rate { - position: absolute; - bottom: 0; - width: 84px; - height: 25px; - opacity: .3; - right: 0; - } - } - } - } - - .actions__wrapper { - .action-item { - &.icon-hide { - .unspam { - display: none; - } - } - - &.icon-show { - .tospam { - display: none; - } - } - } - } - - .spam & { - color: @color-basic-500; - } -} - -.spam { - w-portfolio-row { - .asset-logo { - &__logo, &__marker { - background-color: @color-basic-200 !important; - } - } - } -} diff --git a/src/modules/wallet/modules/portfolio/directives/portfolioRow/row.hbs b/src/modules/wallet/modules/portfolio/directives/portfolioRow/row.hbs deleted file mode 100644 index 4618eb16f4..0000000000 --- a/src/modules/wallet/modules/portfolio/directives/portfolioRow/row.hbs +++ /dev/null @@ -1,212 +0,0 @@ -
    -
    - {{#if assetIconPath}} - - {{else}} - - {{/if}} -
    -
    -
    {{assetName}}
    - {{#if isVerified}} - - {{/if}} - {{#if isGateway}} - - {{/if}} - {{#if isTokenomica}} - - {{/if}} - {{#if isGatewaySoon}} - - {{/if}} - -
    -
    -
    -
    -
    -
    -
    -
    -
    - {{assetName}} -
    -
    -
    -
    - - {{#if isVerified}} - - {{/if}} -
    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    - - - - - - - - - - - - - - - {{#if canShowDex}} - - - - - - - {{/if}} - {{#if canShowToggleSpam}} - - - - - - - - - - - {{/if}} - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    - -
    - -
    - -
    - -
    - -
    - - {{#if canBurn}} -
    - -
    - {{/if}} - - {{#if canReissue}} -
    - -
    - {{/if}} - -
    - -
    - -
    - -
    - -
    - -
    - - {{#if canSetAssetScript}} -
    - -
    - {{/if}} - - {{#if canShowDex}} -
    - -
    - {{/if}} - - {{#if canShowToggleSpam}} -
    - - -
    - {{/if}} -
    -
    -
    -
    -
    -
    diff --git a/src/modules/wallet/modules/portfolio/less/portfolio.less b/src/modules/wallet/modules/portfolio/less/portfolio.less deleted file mode 100644 index b5edc4b8e2..0000000000 --- a/src/modules/wallet/modules/portfolio/less/portfolio.less +++ /dev/null @@ -1,110 +0,0 @@ -@import (reference) "../../../../app/less/app-icons"; -@import (reference) '../../../../app/less/typography'; -@import (reference) '../../../../ui/directives/smartTable/less/smart-table'; -@import (reference) 'config'; -@import (reference) 'icons'; - -.main.wallet.portfolio { - .w-visible { - flex-wrap: wrap; - @media screen and (min-width: 769px) { - height: 65px !important; - } - } - - .mobiles-only { - display: none; - } - - .portfolio-wrapper { - display: flex; - flex-direction: column; - height: 100%; - - .smart-table__cell:first-child { - padding-left: 10px; - - @media screen and (max-width: 768px) { - padding-left: 0; - } - } - } - - .toolbar { - position: relative; - display: flex; - flex-direction: row; - margin-bottom: 10px; - } - - .btn-icon { - font-family: @font-roboto-medium; - } - - .part { - display: inline-block; - } -} - -//tablet -@media screen and (min-width: 660px) and (max-width: 768px) { - body { - &.portfolio { - .portfolio-list { - w-scroll-box { - min-height: calc(100vh ~'- 130px'); - max-height: 100%; - } - } - } - } -} - -//mobile -@media screen and (max-width: 769px) { - .portfolio-wrapper { - padding: 10px 0 10px 10px; - - .smart-table__row .smart-table__cell { - border: 0; - } - } - - .main.wallet.portfolio { - .mobile-flex { - display: flex; - align-items: center; - } - - .asset__text-mobile { - .js-stars-container { - margin-left: 6px; - margin-top: 2px; - } - } - - .asset__text { - .js-stars-container { - display: none; - } - } - - .asset__wrapper-desktop { - display: none; - } - - .mobiles-only { - display: flex; - align-items: center; - font-family: @font-roboto-regular; - } - - .main-content .content { - padding: 0; - } - - .toolbar { - width: calc(100% ~'- 10px'); - } - } -} diff --git a/src/modules/wallet/modules/portfolio/portfolio.js b/src/modules/wallet/modules/portfolio/portfolio.js deleted file mode 100644 index e013d2b5ef..0000000000 --- a/src/modules/wallet/modules/portfolio/portfolio.js +++ /dev/null @@ -1,5 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.wallet.portfolio', []); -})(); diff --git a/src/modules/wallet/modules/portfolio/templates/portfolio.html b/src/modules/wallet/modules/portfolio/templates/portfolio.html deleted file mode 100644 index 60f39ffda9..0000000000 --- a/src/modules/wallet/modules/portfolio/templates/portfolio.html +++ /dev/null @@ -1,45 +0,0 @@ -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - -
    diff --git a/src/modules/wallet/modules/transactions/controllers/TransactionsCtrl.js b/src/modules/wallet/modules/transactions/controllers/TransactionsCtrl.js deleted file mode 100644 index 81b90f8a6f..0000000000 --- a/src/modules/wallet/modules/transactions/controllers/TransactionsCtrl.js +++ /dev/null @@ -1,187 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {User} user - * @param Base - * @param {$rootScope.Scope} $scope - * @param {TransactionsCsvGen} transactionsCsvGen - * @param {Waves} waves - * @param {IPollCreate} createPoll - * @param {INotification} notification - * @return {TransactionsCtrl} - */ - const controller = function (user, Base, $scope, transactionsCsvGen, waves, createPoll, notification) { - - const analytics = require('@waves/event-sender'); - - class TransactionsCtrl extends Base { - - constructor() { - super($scope); - /** - * @type {ITransaction[]} - */ - this.transactions = []; - /** - * @type {boolean} - */ - this.pending = true; - /** - * @type {string} - */ - this.filter = null; - /** - * @type {ITransaction[]} - * @private - */ - this.txList = []; - /** - * @type {number} - */ - this.limit = 100; - - this.observe(['filter'], this._sendAnalytics); - - this.syncSettings({ filter: 'wallet.transactions.filter' }); - - const poll = createPoll(this, this._getTxList, this._setTxList, 4000, { isBalance: true }); - - this.observe(['txList', 'filter'], this._applyTransactionList); - this.observe('limit', () => poll.restart()); - } - - exportTransactions(maxTransactions = 10000) { - // analytics.push('TransactionsPage', `TransactionsPage.CSV.${WavesApp.type}`, 'download'); - analytics.send({ name: 'Transactions Export Click', target: 'ui' }); - const MAX_LIMIT = 1000; - - const getSeriesTransactions = async ({ allTransactions = [], after = '' } = {}) => { - let transactions; - let downloadError = false; - - try { - transactions = await waves.node.transactions.list(MAX_LIMIT, after); - } catch (e) { - downloadError = true; - if (!allTransactions.length) { - notification.error({ - ns: 'app.wallet.transactions', - title: { literal: 'errors.download.title' }, - body: { literal: 'errors.download.body' } - }); - return []; - } - - transactions = []; - notification.error({ - ns: 'app.wallet.transactions', - title: { literal: 'errors.complete.title' }, - body: { literal: 'errors.complete.body' } - }); - - } - - if (user.getSetting('dontShowSpam')) { - transactions = transactions.filter(el => !user.scam[el.assetId]); - } - allTransactions = allTransactions.concat(transactions); - - if (transactions.length < MAX_LIMIT || allTransactions.length > maxTransactions) { - return { allTransactions, downloadError }; - } else { - return getSeriesTransactions({ - allTransactions, - after: transactions[transactions.length - 1].id - }); - } - }; - - const promiseGetTransactions = getSeriesTransactions(); - promiseGetTransactions.then(({ allTransactions, downloadError }) => { - if (allTransactions.length) { - transactionsCsvGen.generate(allTransactions); - } else if (!downloadError) { - notification.error({ - ns: 'app.wallet.transactions', - title: { literal: 'errors.empty.title' }, - body: { literal: 'errors.empty.body' } - }); - } - }); - return promiseGetTransactions; - } - - _getTxList() { - return waves.node.transactions.list(this.limit); - } - - /** - * @private - */ - _applyTransactionList() { - const filter = this.filter; - const list = this.txList; - const availableTypes = filter.split(',') - .map((type) => type.trim()) - .reduce((result, type) => { - result[type] = true; - return result; - }, Object.create(null)); - - if (filter === 'all') { - this.transactions = list.slice(); - } else { - this.transactions = list.filter(({ typeName }) => availableTypes[typeName]); - } - } - - /** - * @private - */ - _sendAnalytics() { - let actionName; - switch (this.filter) { - case 'all': - actionName = 'Transactions All Show'; - break; - case 'send,mass-send': - actionName = 'Transactions Sent Show'; - break; - case 'receive,mass-receive,sponsorship-fee': - actionName = 'Transactions Received Show'; - break; - case 'exchange-buy,exchange-sell': - actionName = 'Transactions Exchanged Show'; - break; - case 'lease-in,lease-out,cancel-leasing': - actionName = 'Transactions Leased Show'; - break; - case 'issue,reissue,burn,sponsorship-stop,sponsorship-start': - actionName = 'Transactions Issued Show'; - break; - default: - break; - } - analytics.send({ name: actionName, target: 'ui' }); - } - - /** - * @param {ITransaction[]} transactions - * @private - */ - _setTxList(transactions) { - this.pending = false; - this.txList = transactions; - $scope.$digest(); - } - - } - - return new TransactionsCtrl(); - }; - - controller.$inject = ['user', 'Base', '$scope', 'transactionsCsvGen', 'waves', 'createPoll', 'notification']; - - angular.module('app.wallet.transactions').controller('TransactionsCtrl', controller); -})(); diff --git a/src/modules/wallet/modules/transactions/less/transactions.less b/src/modules/wallet/modules/transactions/less/transactions.less deleted file mode 100644 index ab1cd830e3..0000000000 --- a/src/modules/wallet/modules/transactions/less/transactions.less +++ /dev/null @@ -1,60 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; - -.transactions { - - w-radio-wrap { - flex-grow: 1; - } - - .transactions-content { - display: flex; - flex-direction: column; - height: 100%; - - .controls { - display: flex; - flex-direction: row; - justify-content: space-between; - min-height: 42px; - margin-bottom: 10px; - z-index: 1; - background: @app-background; - - .btn-wrap.btn-group { - justify-content: flex-start; - padding: 0; - align-items: center; - height: 42px; - } - } - } - - button.download { - flex-grow: 0; - } -} - -@media screen and (max-width: 1024px) { - .transactions { - w-radio-wrap.split-mode { - display: none; - } - - w-button { - & > *.interface svg { - margin-left: 0; - margin-right: 0; - } - button.download { - width: 42px; - height: 42px; - padding: 0; - background-position: center; - span { - display: none; - } - } - } - } -} diff --git a/src/modules/wallet/modules/transactions/services/TransactionsCsvGen.js b/src/modules/wallet/modules/transactions/services/TransactionsCsvGen.js deleted file mode 100644 index 68a93c3602..0000000000 --- a/src/modules/wallet/modules/transactions/services/TransactionsCsvGen.js +++ /dev/null @@ -1,150 +0,0 @@ -(function () { - 'use strict'; - - /** - * @param {app.i18n} i18n - * @param {app.utils} utils - * @returns {TransactionsCsvGen} - */ - const factory = function (i18n, utils) { - - const Papa = require('papaparse'); - - const HEADERS = [ - { name: 'csv.date', id: 'timestamp' }, - { name: 'csv.id', id: 'id' }, - { name: 'csv.type', id: 'typeName' }, - { name: 'csv.transactionType', id: 'type' }, - { name: 'csv.price.ticker', id: 'priceTicker' }, - { name: 'csv.price.name', id: 'priceName' }, - { name: 'csv.price.value', id: 'priceValue' }, - { name: 'csv.price.id', id: 'priceId' }, - { name: 'csv.amount.ticker', id: 'amountTicker' }, - { name: 'csv.amount.name', id: 'amountName' }, - { name: 'csv.amount.value', id: 'amountValue' }, - { name: 'csv.amount.id', id: 'amountId' }, - { name: 'csv.fee.ticker', id: 'feeTicker' }, - { name: 'csv.fee.name', id: 'feeName' }, - { name: 'csv.fee.value', id: 'feeValue' }, - { name: 'csv.fee.id', id: 'feeId' }, - { name: 'csv.sender', id: 'sender' }, - { name: 'csv.recipient', id: 'recipient' }, - { name: 'csv.attachment', id: 'attachment' }, - { name: 'csv.height', id: 'height' }, - { name: 'csv.alias', id: 'alias' }, - { name: 'csv.description', id: 'description' }, - { name: 'csv.name', id: 'name' }, - { name: 'csv.reissuable.name', id: 'reissuable' }, - { name: 'csv.precision', id: 'precision' } - ]; - - const NS = 'app.wallet.transactions'; - - class TransactionsCsvGen { - - generate(transactionList) { - const fileName = 'transactions.csv'; - - const fields = HEADERS.map((item) => i18n.translate(item.name, NS)); - /* eslint complexity: ["off"] */ - const data = transactionList.map((tx) => HEADERS.map((header) => { - const id = header.id; - const value = tx[id]; - - try { - switch (id) { - case 'timestamp': - return value && utils.moment(value).format('DD.MM.YYYY hh:mm:ss') || value; - case 'reissuable': - return value != null && i18n.translate(`csv.reissuable.${value}`, NS) || value; - case 'priceTicker': - return tx.price && tx.price.asset.ticker || ''; - case 'priceName': - return tx.price && tx.price.asset.name || ''; - case 'priceValue': - return tx.price && tx.price.toFormat() || ''; - case 'priceId': - return tx.price && tx.price.asset.id || ''; - case 'amountTicker': - return tx.amount && tx.amount.asset.ticker || ''; - case 'amountName': - return tx.amount && tx.amount.asset.name || ''; - case 'amountValue': - return tx.amount && tx.amount.toFormat() || ''; - case 'amountId': - return tx.amount && tx.amount.asset.id || ''; - case 'feeTicker': - return tx.fee && tx.fee.asset.ticker || ''; - case 'feeName': - return tx.fee && tx.fee.asset.name || ''; - case 'feeValue': - return tx.fee && tx.fee.toFormat() || ''; - case 'feeId': - return tx.fee && tx.fee.asset.id || ''; - default: - return value == null ? '' : String(value); - } - } catch (e) { - return ''; - } - })); - - const csv = Papa.unparse({ - fields, - data - }); - - if (WavesApp.isDesktop()) { - transfer('download', { - fileContent: csv, - fileName: fileName - }); - } else { - TransactionsCsvGen._download(csv, fileName); - } - } - - /** - * @param {string} csv - * @param {string} name - * @private - */ - static _download(csv, name) { - if (window.navigator && typeof window.navigator.msSaveOrOpenBlob === 'function') { - this._downloadInMsEdge(csv, name); - } else { - const blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' }); - const url = URL.createObjectURL(blob); - const link = document.createElement('a'); - link.setAttribute('href', url); - link.setAttribute('download', name); - link.setAttribute('target', '_blank'); - link.style.position = 'absolute'; - link.style.opacity = '0'; - document.body.appendChild(link); - link.click(); - requestAnimationFrame(() => { - document.body.removeChild(link); - }); - } - } - - /** - * @param {string} csv - * @param {string} name - * @private - */ - static _downloadInMsEdge(csv, name) { - const blob = new Blob([csv], { type: 'text/csv' }); - window.navigator.msSaveOrOpenBlob(blob, name); - } - - } - - return new TransactionsCsvGen(); - }; - - factory.$inject = ['i18n', 'utils']; - - angular.module('app.wallet.transactions').factory('transactionsCsvGen', factory); -})(); diff --git a/src/modules/wallet/modules/transactions/templates/transactions.html b/src/modules/wallet/modules/transactions/templates/transactions.html deleted file mode 100644 index 32a29e3123..0000000000 --- a/src/modules/wallet/modules/transactions/templates/transactions.html +++ /dev/null @@ -1,74 +0,0 @@ -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - -
    - -
    -     -
    diff --git a/src/modules/wallet/modules/transactions/transactions.js b/src/modules/wallet/modules/transactions/transactions.js deleted file mode 100644 index b3f67ab9a3..0000000000 --- a/src/modules/wallet/modules/transactions/transactions.js +++ /dev/null @@ -1,5 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.wallet.transactions', []); -})(); diff --git a/src/modules/wallet/wallet.js b/src/modules/wallet/wallet.js deleted file mode 100644 index 8a461583ca..0000000000 --- a/src/modules/wallet/wallet.js +++ /dev/null @@ -1,11 +0,0 @@ -(function () { - 'use strict'; - - angular.module('app.wallet', [ - 'app.wallet.assets', - 'app.wallet.portfolio', - 'app.wallet.transactions', - 'app.wallet.leasing' - ]); - -})(); diff --git a/src/modules/welcome/components/dexwLocked/dexwLocked.html b/src/modules/welcome/components/dexwLocked/dexwLocked.html new file mode 100644 index 0000000000..790e3c0e52 --- /dev/null +++ b/src/modules/welcome/components/dexwLocked/dexwLocked.html @@ -0,0 +1,345 @@ +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + +
    + +
    + + sign2 + Created with Sketch. + + + + + + +
    +
    +
    +

    +
    +

    +

    +
    +
    +
    +
    +
    + + + +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + +
    + +
    + + sign2 + Created with Sketch. + + + + + + +
    +
    +
    +

    +
    +

    +

    +
    + + + +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + +
    + +
    + + sign2 + Created with Sketch. + + + + + + +
    +
    +
    +

    +
    +

    +

    +
    +
    +
    +
    +
    + +
    + +
    + + + +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + +
    + +
    + + sign2 + Created with Sketch. + + + + + + +
    +
    +
    +

    +
    +
    +
    +
    +
    + + + +
    + +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + +
    + +
    + + sign2 + Created with Sketch. + + + + + + +
    +
    +
    +

    +
    +
    + Waves.Exchange. +
    +
    + +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + +
    + +
    + + sign2 + Created with Sketch. + + + + + + +
    +
    +
    +

    +
    +

    +

    +
    +
    +
    +
    +
    +
    + +
    + +
    + + + +
    +
    +
    +
    + +
    diff --git a/src/modules/welcome/components/dexwLocked/dexwLocked.js b/src/modules/welcome/components/dexwLocked/dexwLocked.js new file mode 100644 index 0000000000..73d9ba3aa9 --- /dev/null +++ b/src/modules/welcome/components/dexwLocked/dexwLocked.js @@ -0,0 +1,154 @@ +(() => { + 'use strict'; + + const ds = require('data-service'); + + class DexwLockedCtrl { + + static $inject = [ + '$scope', + '$state', + 'user', + 'exportStorageService', + 'storage' + ]; + + /** + * @type {boolean} + */ + isDesktop = false; + /** + * @type {'new' | 'old' | 'multiAccount'} + */ + userType = 'new'; + /** + * @type {string} + */ + wavesExchangeLink = WavesApp.network.wavesExchangeLink; + + /** + * @return {boolean} + */ + get isAuthorised() { + return this.user.isAuthorised; + } + + constructor($scope, $state, user, exportStorageService, storage) { + this.$scope = $scope; + this.$state = $state; + this.user = user; + this.exportStorageService = exportStorageService; + this.storage = storage; + } + + $onInit() { + this.isDesktop = WavesApp.isDesktop(); + Promise.all([ + this.user.getMultiAccountUsersCount(), + this.user.getFilteredUserList() + ]).then(([multiAccountCount, userList]) => { + if (userList && userList.length && multiAccountCount === 0) { + this.userType = 'old'; + } else if (multiAccountCount) { + this.userType = 'multiAccount'; + } else { + this.userType = 'new'; + } + this.$scope.$apply(); + }); + } + + onSign() { + Promise.all([ + this.user.getMultiAccountUsers(), + this.user.getMultiAccountSettings() + ]) + .then(([multiAccountUsers, commonSettings]) => { + const [firstUser] = multiAccountUsers; + + this.user.setMultiAccountSettings(commonSettings); + + if (firstUser) { + return this.user.login(firstUser); + } else { + return Promise.resolve(); + } + + }) + .then(() => { + this.$scope.$apply(); + }) + .catch(() => { + return null; + }); + } + + moving() { + analytics.send({ + name: 'Start migration', + target: 'all' + }); + + if (this.isDesktop) { + this.$state.go('desktopUpdate'); + } else { + this._export(); + } + } + + _export() { + const connectProvider = this._getConnectProvider(); + + this.exportStorageService.export({ + provider: connectProvider, + attempts: 20, + timeout: 2000 + }); + + this.exportStorageService.onData().then(result => { + if (result.payload === 'ok') { + this.$scope.$apply(); + + analytics.send({ + name: 'End migration', + target: 'all' + }); + + return this.storage.save('migrationSuccess', true); + } else { + analytics.send({ + name: 'Bad migration', + target: 'all' + }); + + this.$scope.$apply(); + + return this.storage.save('migrationSuccess', false); + } + }); + } + + /** + * @returns {ConnectProvider} + */ + _getConnectProvider() { + const origins = WavesApp.isProduction() ? + WavesApp.network.migration.origins : + '*'; + + const childWindow = window.open(WavesApp.network.migration.webUrl); + + return new ds.connect.PostMessageConnectProvider({ + win: childWindow, + mode: 'export', + origins + }); + } + + } + + angular.module('app.welcome').component('wDexwLocked', { + templateUrl: 'modules/welcome/components/dexwLocked/dexwLocked.html', + controller: DexwLockedCtrl + }); +})(); diff --git a/src/modules/welcome/components/dexwLocked/dexwLocked.less b/src/modules/welcome/components/dexwLocked/dexwLocked.less new file mode 100644 index 0000000000..ff16bf58ad --- /dev/null +++ b/src/modules/welcome/components/dexwLocked/dexwLocked.less @@ -0,0 +1,133 @@ +@import (reference) 'config'; +@import (reference) 'icons'; + +.new-user, +.multiAccount, +.old-user { + padding: 40px; + max-width: 540px; + background: @color-white; + border-radius: @border-radius; + + &__img { + position: relative; + height: 100px; + margin: 0 auto 20px; + overflow: hidden; + } + + &__title { + margin-bottom: 20px; + color: @color-basic-700; + text-align: center; + } + + &__desc { + color: @color-basic-500; + line-height: 20px; + } + + &__plate { + display: flex; + padding: 16px; + border-radius: 4px; + border: dashed 1px @color-basic-200; + font-family: @font-roboto-medium; + + &-icon { + min-width: 40px; + width: 40px; + height: 40px; + background: @migrate-lock-icon center no-repeat; + margin-right: 10px; + } + + &-text { + color: @color-basic-700; + } + } +} + +.new-user { + &__desc { + margin-bottom: 20px; + } + + &:not(.new-user_desktop) { + .new-user__desc { + padding: 0 40px; + text-align: center; + } + } +} + +.old-user, +.multiAccount { + &__desc { + margin-bottom: 20px; + } + + &__plate { + margin-bottom: 30px; + } +} + +.userType-container { + height: 100%; + display: flex; + justify-content: center; + align-items: center; + padding: 16px; +} + +div.dexw-locked { + width: 100%; + min-height: calc(100% ~"- 60px"); + display: flex; + justify-content: center; + align-items: center; +} + +@media screen and (max-width: 860px) { + div.dexw-locked { + min-height: calc(100% ~"- 40px"); + } +} + +@media screen and (max-width: 480px) { + .new-user, + .multiAccount, + .old-user { + padding: 40px 16px; + + &__title { + font-size: 17px; + } + + &__desc { + font-size: 12px; + padding: 0; + } + + &__img { + width: 256px; + } + + &__plate { + padding: 12px; + align-items: center; + } + } + + .new-user:not(.new-user_desktop) { + .new-user__desc { + padding: 0; + } + } +} + +@media screen and (max-height: 700px) { + div.dexw-locked { + height: auto; + } +} \ No newline at end of file diff --git a/src/modules/welcome/components/dexwLocked/moving-animate.less b/src/modules/welcome/components/dexwLocked/moving-animate.less new file mode 100644 index 0000000000..b0b4292b0c --- /dev/null +++ b/src/modules/welcome/components/dexwLocked/moving-animate.less @@ -0,0 +1,141 @@ +@import (reference) 'config'; +@import (reference) 'icons'; + +.scene{ + position:absolute; + width:400px; + height: 160px; + top: -50px; + left:50%; + overflow:hidden; + transform: translateX(-50%); + &:after{ + content:" "; + left:0; + top:0; + bottom:0; + width:100px; + background: @moving-gradient-left; + position:absolute; + z-index: 99999; + } + &:before{ + content:" "; + right:0; + top:0; + bottom:0; + width:100px; + background: @moving-gradient-right; + position:absolute; + z-index: 99999; + } + em{ + display:none; + position:absolute; + bottom:20px; + left:55px; + right:0; + text-align:center; + font-style:normal; + color:#0bb4a6; + letter-spacing:0.2em; + } +} + +.car{ + position:absolute; + top:10px; + left:50%; + z-index:900; + margin-left:-30px; + animation: peel 4s ease-in-out forwards infinite, bump 0.2s linear infinite; +} + +.poof{ + position:absolute; + top:110px; + left:160px; + margin-left:-30px; + opacity:0; + animation: poof 4s ease-in-out forwards infinite; +} + +.sign{ + position:absolute; + right:-40px; + top:58px; + z-index:100; + animation: sign 4s ease-in-out forwards infinite; +} + +@keyframes sign { + 0% { + right:-40px; + } + 30% { + right:80px; + } + 70% { + right:80px; + } + 100% { + right:100%; + } +} + +@keyframes peel { + 0% { + transform: rotate(0deg); + } + 70% { + transform: rotate(0deg); + } + 73% { + transform: rotate(-9deg); + } + 95% { + transform: rotate(-9deg); + } + 100% { + transform: rotate(0deg); + } +} + +@keyframes poof { + 0% { + opacity:0; + transform: scale(1.0); + } + 70% { + opacity:0; + left:170px; + transform: scale(1.0); + } + 76% { + opacity:1; + transform: scale(1.3); + left:160px; + } + 95% { + opacity:0; + } + 100% { + opacity:0; + transform: scale(1.3); + } +} + +@keyframes bump { + 0% { + top:70px; + } + 50% { + top:70px; + } + 60% { + top:69px; + } + 100% { + top:70px; + } +} \ No newline at end of file diff --git a/src/modules/signIn/components/signInForm/signInForm.html b/src/modules/welcome/components/signInForm/signInForm.html similarity index 80% rename from src/modules/signIn/components/signInForm/signInForm.html rename to src/modules/welcome/components/signInForm/signInForm.html index 86f0435179..8c0c878efa 100644 --- a/src/modules/signIn/components/signInForm/signInForm.html +++ b/src/modules/welcome/components/signInForm/signInForm.html @@ -1,6 +1,6 @@ -
    - -
    + + +
    @@ -25,7 +25,7 @@
    -
    +
    { this.hasMultiAccount = !!data; - if (!this.hasMultiAccount && this.isWeb) { + if (!this.hasMultiAccount && WavesApp.isWeb()) { storage.load('accountImportComplete').then(complete => { if (!complete) { this._loadUserListFromOldOrigin(); @@ -138,116 +37,6 @@ }); } }); - - this._initPairs(); - } - - /** - * @private - */ - _addScrollHandler() { - const scrolledView = $element.find('.scrolled-view'); - const header = $element.find('w-main-header'); - - scrolledView.on('scroll', () => { - header.toggleClass('fixed', scrolledView.scrollTop() > whenHeaderGetFix); - header.toggleClass('unfixed', scrolledView.scrollTop() <= whenHeaderGetFix); - }); - } - - /** - * @public - */ - showTutorialModals() { - return modalManager.showTutorialModals(); - } - - /** - * @public - */ - goToDexDemo(pairAssets) { - utils.openDex(pairAssets.assetId1, pairAssets.assetId2, 'dex-demo'); - } - - /** - * @private - */ - _initPairs() { - const FAKE_RATE_HISTORY = [{ - rate: new BigNumber(0), - timestamp: ds.utils.normalizeTime(Date.now()) - }]; - - const startDate = utils.moment().add().day(-7); - Promise.all(PAIRS_IN_SLIDER.map(pair => ds.api.pairs.get(pair.amount, pair.price))) - .then(pairs => Promise.all(pairs.map( - pair => ds.api.pairs.info(matcher.currentMatcherAddress, [pair]))) - ) - .then(infoList => { - const flattenInfoList = flatten(infoList); - - Promise.all( - PAIRS_IN_SLIDER - .map(({ amount, price }) => waves.utils.getRateHistory(amount, price, startDate)) - .map(promise => promise.catch(() => FAKE_RATE_HISTORY)) - ) - .then(rateHistory => { - this.pairsInfoList = rateHistory.map(WelcomeCtrl._fillValues(flattenInfoList)); - }) - .then(() => { - utils.safeApply($scope); - this._insertCharts(); - this._addScrollHandler(); - }); - }); - } - - /** - * @param {array} infoList - * @static - */ - static _fillValues(infoList) { - return (rateHistory, i) => { - const info = infoList[i]; - const volume = info.volume || new Money(0, info.priceAsset); - return { - ...info, - ticker: info.ticker || info.displayName, - change24: info.change24 || new BigNumber(0), - high: info.high || new Money(0, info.priceAsset), - lastPrice: info.lastPrice || new Money(0, info.priceAsset), - low: info.low || new Money(0, info.priceAsset), - volume, - rateHistory, - volumeBigNum: volume.getTokens() - }; - }; - } - - /** - * @private - */ - _insertCharts() { - const marketRows = $element.find('.js-table-markets .js-row-content'); - PAIRS_IN_SLIDER.forEach((pair, i) => { - const options = this.pairsInfoList[i].change24.gt(0) ? chartOptions.blue : chartOptions.red; - const chartData = { - rate: this.pairsInfoList[i].rateHistory - }; - new ChartFactory( - marketRows.eq(i).find('.graph'), - options, - chartData - ); - }); - } - - /** - * @private - */ - _initDeviceTypes() { - this.isDesktop = WavesApp.isDesktop(); - this.isWeb = WavesApp.isWeb(); } /** @@ -284,16 +73,10 @@ }; controller.$inject = [ - 'Base', '$scope', 'user', - 'modalManager', 'utils', - 'waves', - '$element', - 'ChartFactory', - 'storage', - 'matcher' + 'storage' ]; angular.module('app.welcome') diff --git a/src/modules/welcome/less/page-welcome.less b/src/modules/welcome/less/page-welcome.less index b27e9228d0..cd79a8c370 100644 --- a/src/modules/welcome/less/page-welcome.less +++ b/src/modules/welcome/less/page-welcome.less @@ -12,6 +12,11 @@ color: @color-basic-900; max-width: 100%; + &-container { + min-height: calc(100vh ~"- 60px"); + height: 100%; + } + .white-bg { background: @color-white; position: fixed; @@ -52,4 +57,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/modules/welcome/templates/welcome.html b/src/modules/welcome/templates/welcome.html index fcc7270835..67723f5946 100644 --- a/src/modules/welcome/templates/welcome.html +++ b/src/modules/welcome/templates/welcome.html @@ -1,148 +1,6 @@ - -
    -
    -
    -
    -
    -

    -
    -
    - - - - - - - - - - - - -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    -

    -
    -
    -
    -
    -
    -
    -

    -
    -
    -
    -
    -
    -
    -

    -
    -
    -
    -
    -
    -
    -

    -
    -
    -
    -
    -
    -
    -

    -
    -
    -
    -
    -
    -
    -

    -
    -
    -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    - -

    -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    - {{pair.amountAsset.ticker || pair.amountAsset.displayName }} / {{pair.priceAsset.ticker || pair.priceAsset.displayName}} -
    -
    - -  /  - -  $ - -
    -
    {{pair.change24}}%
    -
    - -
    -
    - -
    -
    - -
    -
    -
    - -
    - -
    - -
    -
    -
    - -
    -

    -
    - -
    -     - - +
    +
    diff --git a/src/themeConfig/black/config.less b/src/themeConfig/black/config.less index 2fce567c35..cd839eeeb8 100644 --- a/src/themeConfig/black/config.less +++ b/src/themeConfig/black/config.less @@ -205,6 +205,8 @@ @shadow-tooltip-confirm: 0 0 20px rgba(0, 0, 0, 0.5); @shadow-dex-welcome: 0 1px 4px 0 rgba(203, 221, 239, 0.2); @shadow-portfolio-dropdown: 0 4px 18px 0 rgba(0, 0, 0, .5); +@moving-gradient-left: linear-gradient(to right, rgba(45, 45, 45, 1) 0%, rgba(45, 45, 45, 0) 100%); +@moving-gradient-right: linear-gradient(to left, rgba(45, 45, 45, 1) 0%, rgba(45, 45, 45, 0) 100%); // Hovers @hover-default: rgba(53, 53, 53, .7); diff --git a/src/themeConfig/black/icons.less b/src/themeConfig/black/icons.less index 17c7f05700..852d4dfc85 100644 --- a/src/themeConfig/black/icons.less +++ b/src/themeConfig/black/icons.less @@ -164,5 +164,7 @@ @warning-icon-700: url(/img/icons/warning-basic-700.svg); @info-icon-300: url(/img/icons/info-basic-300.svg); @migrate-lock-icon: url(/img/icons/lock-40-disabled-700.svg); +@dex-closed-icon: url(/img/icons/closed.svg); +@check-lang: url(/img/icons/check-lang.svg); @downloaded-congratulations: url(/img/icons/downloaded.svg); @migrate-congratulations-icon: url(/img/icons/icon-installed-el.svg); diff --git a/src/themeConfig/default/config.less b/src/themeConfig/default/config.less index d4df1c0369..555024c6ed 100644 --- a/src/themeConfig/default/config.less +++ b/src/themeConfig/default/config.less @@ -206,6 +206,8 @@ @shadow-tooltip-confirm: 0 0 19px rgba(97, 116, 144, 0.25); @shadow-dex-welcome: 0 1px 4px 0 rgba(203, 221, 239, 0.2); @shadow-portfolio-dropdown: 0 2px 4px 0 rgba(218, 225, 233, 0.5); +@moving-gradient-left: linear-gradient(to right, rgba(255, 255, 255, 1) 0%, rgba(255, 255, 255, 0) 100%); +@moving-gradient-right: linear-gradient(to left, rgba(255, 255, 255, 1) 0%, rgba(255, 255, 255, 0) 100%); // Hovers @hover-default: rgba(248, 249, 251, .5); diff --git a/src/themeConfig/default/icons.less b/src/themeConfig/default/icons.less index 10627e0204..9cff3318ef 100644 --- a/src/themeConfig/default/icons.less +++ b/src/themeConfig/default/icons.less @@ -164,4 +164,7 @@ @warning-icon-700: url(/img/icons/warning-basic-700.svg); @info-icon-300: url(/img/icons/info-basic-300.svg); @migrate-lock-icon: url(/img/icons/lock-40-basic-200.svg); +@dex-closed-icon: url(/img/icons/closed.svg); +@check-lang: url(/img/icons/check-lang.svg); +@downloaded-congratulations: url(/img/icons/downloaded.svg); @migrate-congratulations-icon: url(/img/icons/icon-installed-el.svg); diff --git a/ts-scripts/meta.json b/ts-scripts/meta.json index 7fd5acff64..187d783bb8 100644 --- a/ts-scripts/meta.json +++ b/ts-scripts/meta.json @@ -58,104 +58,6 @@ "group": " ", "decimal": "." } - }, - "ko": { - "name": "Korean", - "separators": { - "group": ",", - "decimal": "." - } - }, - "zh_CN": { - "name": "Chinese", - "separators": { - "group": ",", - "decimal": "." - } - }, - "tr": { - "name": "Turkish", - "separators": { - "group": " ", - "decimal": "." - } - }, - "ja": { - "name": "Japanese", - "separators": { - "group": ",", - "decimal": "." - } - }, - "nl_NL": { - "name": "Dutch", - "separators": { - "group": ",", - "decimal": "." - } - }, - "hi_IN": { - "name": "Hindi", - "separators": { - "group": ",", - "decimal": "." - } - }, - "es": { - "name": "Spanish", - "separators": { - "group": ",", - "decimal": "." - } - }, - "et_EE": { - "name": "Estonian", - "separators": { - "group": ",", - "decimal": "." - } - }, - "pt_BR": { - "name": "Brazil", - "separators": { - "group": ",", - "decimal": "." - } - }, - "pl": { - "name": "Polish", - "separators": { - "group": ",", - "decimal": "." - } - }, - "it": { - "name": "Italian", - "separators": { - "group": ",", - "decimal": "." - } - }, - "de": { - "name": "German", - "separators": { - "group": ",", - "decimal": "." - } - }, - "id": { - "name": "Indonesian", - "separators": { - "group": ",", - "decimal": "." - } - }, - "fr": { - "name": "French", - "separators": { - "group": ",", - "decimal": "." - } } }, "electronScripts": [