From e737446cee095821305dfb3fb00b903f9add338e Mon Sep 17 00:00:00 2001
From: okanishcheva <okanishcheva@wavesplatform.com>
Date: Mon, 19 Aug 2019 16:19:07 +0300
Subject: [PATCH 01/18] DEXW-1239: save

---
 .../components/singleSend/SingleSend.js       | 745 +----------------
 .../singleSend/bankSend/BankSend.js           |  28 +
 .../singleSend/bankSend/bank-send.html        |   2 +
 .../singleSend/gatewaySend/GatewaySend.js     | 768 ++++++++++++++++++
 .../singleSend/gatewaySend/gateway-send.html  |   0
 .../components/singleSend/single-send.html    | 330 +-------
 .../singleSend/wavesSend/WavesSend.js         | 668 +++++++++++++++
 .../singleSend/wavesSend/waves-send.html      | 128 +++
 8 files changed, 1618 insertions(+), 1051 deletions(-)
 create mode 100644 src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
 create mode 100644 src/modules/utils/modals/sendAsset/components/singleSend/bankSend/bank-send.html
 create mode 100644 src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
 create mode 100644 src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/gateway-send.html
 create mode 100644 src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
 create mode 100644 src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/waves-send.html

diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js
index 44a09b69d8..a1a2d3e110 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js
@@ -1,734 +1,21 @@
 (function () {
     'use strict';
 
-    const FIAT_ASSETS = {
-        [WavesApp.defaultAssets.USD]: true,
-        [WavesApp.defaultAssets.EUR]: true,
-        [WavesApp.defaultAssets.TRY]: true
-    };
-
-    const { Money } = require('@waves/data-entities');
-    const { BigNumber } = require('@waves/bignumber');
-    const ds = require('data-service');
-    const { SIGN_TYPE } = require('@waves/signature-adapter');
-    const analytics = require('@waves/event-sender');
-
-    const BANK_RECIPIENT = WavesApp.bankRecipient;
-    const MIN_TOKEN_COUNT = 100;
-    const MAX_TOKEN_COUNT = 50000;
-
-    /**
-     * @param {Base} Base
-     * @param {$rootScope.Scope} $scope
-     * @param {app.utils} utils
-     * @param {IPollCreate} createPoll
-     * @param {ConfigService} configService
-     * @param {IOuterBlockchains} outerBlockchains
-     * @param {User} user
-     * @param {GatewayService} gatewayService
-     * @param {Waves} waves
-     */
-    const controller = function (Base,
-                                 $scope,
-                                 utils,
-                                 createPoll,
-                                 waves,
-                                 configService,
-                                 outerBlockchains,
-                                 user,
-                                 gatewayService) {
-
-        class SingleSend extends Base {
-
-            /**
-             * @return {boolean}
-             */
-            get hasSendToBank() {
-                return FIAT_ASSETS[this.assetId] || false;
-            }
-
-            /**
-             * @return {boolean}
-             */
-            get isLira() {
-                return this.assetId === WavesApp.defaultAssets.TRY;
-            }
-
-            /**
-             * @return {ISingleSendTx}
-             */
-            get tx() {
-                return this.state.singleSend;
-            }
-
-            /**
-             * @return {string}
-             */
-            get assetId() {
-                return this.state.assetId;
-            }
-
-            set assetId(id) {
-                this.state.assetId = id;
-            }
-
-            /**
-             * @return {string}
-             */
-            get mirrorId() {
-                return this.state.mirrorId;
-            }
+    const controller = function () {
 
-            /**
-             * @return {Object<string, Money>}
-             */
-            get moneyHash() {
-                return this.state.moneyHash;
-            }
+        class SingleSend {
 
             /**
-             * @return {Object.<string, Money>}
+             * @type {ISendMode}
              */
-            get feeHash() {
-                return utils.groupMoney(this.feeList || []);
-            }
-
-            /**
-             * @return {Money}
-             */
-            get balance() {
-                return this.moneyHash[this.assetId];
-            }
-
-            /**
-             * @return {boolean}
-             */
-            get outerSendMode() {
-                return this.state.outerSendMode;
-            }
-
-            set outerSendMode(value) {
-                this.state.outerSendMode = value;
-            }
-
-            /**
-             * @return {string}
-             */
-            get paymentId() {
-                return this.state.paymentId;
-            }
-
-            set paymentId(value) {
-                this.state.paymentId = value;
-            }
-
-            /**
-             * @return {IGatewayDetails}
-             */
-            get gatewayDetails() {
-                return this.state.gatewayDetails;
-            }
-
-            set gatewayDetails(value) {
-                this.state.gatewayDetails = value;
-            }
-
-            get isBankPending() {
-                return this.toBankMode && this.termsIsPending;
-            }
-
-            get isBankError() {
-                return this.toBankMode && this.termsLoadError;
-            }
-
-            get isGatewayAccepted() {
-                return !configService
-                    .get('PERMISSIONS.CANT_TRANSFER_GATEWAY').includes(this.balance.asset.id);
-            }
-
-            get isBankAccepted() {
-                return this.toBankMode ? this.isGatewayAccepted : true;
-            }
-
-            get isBankPendingOrError() {
-                return this.isBankError || this.isBankPending;
-            }
-
-            get hasOuterError() {
-                return this.outerSendMode && this.gatewayError || this.isBankError;
-            }
-
-            get minimumAmount() {
-                return this.gatewayDetails &&
-                    this.gatewayDetails.minimumAmount ||
-                    this.toBankMode &&
-                    new BigNumber(MIN_TOKEN_COUNT);
-            }
-
-            get maximumAmount() {
-                return this.maxGatewayAmount || this.toBankMode && this.balance.cloneWithTokens(MAX_TOKEN_COUNT);
-            }
-
-            /**
-             * @type {string}
-             */
-            txType = WavesApp.TRANSACTION_TYPES.NODE.TRANSFER;
-
-            /**
-             * @type {boolean}
-             */
-            get toBankMode() {
-                return this.state.toBankMode;
-            }
-
-            set toBankMode(value) {
-                this.state.toBankMode = value;
-            }
-
-            /**
-             * @type {string}
-             */
-            digiLiraUserLink = 'https://www.digilira.com/';
-            /**
-             * @type {Function}
-             */
-            onContinue = null;
-            /**
-             * @type {string}
-             */
-            focus = null;
-            /**
-             * @type {Money}
-             */
-            mirror = null;
-            /**
-             * @type {boolean}
-             */
-            noMirror = false;
-            /**
-             * @type {boolean}
-             */
-            hasComission = true;
-            /**
-             * @type {Array}
-             */
-            feeList = null;
-            /**
-             * @type {Money}
-             */
-            minAmount = null;
-            /**
-             * @type {Money}
-             */
-            maxAmount = null;
-            /**
-             * @type {ISendState}
-             */
-            state = Object.create(null);
-            /**
-             * @type {Money}
-             */
-            maxGatewayAmount = null;
-            /**
-             * @type {boolean}
-             */
-            gatewayDetailsError = false;
-            /**
-             * @type {boolean}
-             */
-            gatewayAddressError = false;
-            /**
-             * @type {boolean}
-             */
-            gatewayWrongAddress = false;
-            /**
-             * @type {boolean}
-             */
-            gatewayError = false;
-            /**
-             * @type {boolean}
-             */
-            termsIsPending = true;
-            /**
-             * @type {boolean}
-             */
-            termsLoadError = false;
-            /**
-             * @type {boolean}
-             */
-            signInProgress = false;
-            /**
-             * @type {ISingleSendTx}
-             */
-            wavesTx = {
-                type: SIGN_TYPE.TRANSFER,
-                amount: null,
-                attachment: '',
-                fee: null,
-                recipient: '',
-                assetId: ''
-            };
-            /**
-             * @type {boolean}
-             * @private
-             */
-            _noCurrentRate = false;
+            sendMode = 'waves';
 
             constructor() {
-                super();
-
-                $scope.WavesApp = WavesApp;
-            }
-
-            $postLink() {
-                this.receive(utils.observe(this.tx, 'fee'), this._currentHasCommission, this);
-                const onHasMoneyHash = () => {
-                    this.receive(utils.observe(this.state, 'toBankMode'), this._onChangeBankMode, this);
-                    this.observe('gatewayDetails', this._currentHasCommission);
-
-                    this.minAmount = this.state.moneyHash[this.state.assetId].cloneWithTokens('0');
-                    this.tx.amount = this.tx.amount || this.moneyHash[this.assetId].cloneWithTokens('0');
-                    this._fillMirror();
-
-                    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._updateGatewayDetails, this);
-                    this.receive(utils.observe(this.tx, 'recipient'), this._updateGatewayDetails, this);
-
-                    this.receive(utils.observe(this.state, 'paymentId'), this._updateGatewayPermisson, this);
-                    this.receive(utils.observe(this.tx, 'recipient'), this._updateGatewayPermisson, this);
-
-                    this.receive(utils.observe(this.tx, 'amount'), this._onChangeAmount, this);
-
-                    this.observe('gatewayDetails', this._updateWavesTxObject);
-                    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.observe('mirror', this._onChangeAmountMirror);
-                    this.observe(['gatewayAddressError', 'gatewayDetailsError', 'gatewayWrongAddress'],
-                        this._updateGatewayError);
-
-                    this._currentHasCommission();
-                    this._onChangeBaseAssets();
-                    this._updateGatewayDetails();
-                    this._updateGatewayPermisson();
-                };
-                if (!this.state.moneyHash) {
-                    this.receiveOnce(utils.observe(this.state, 'moneyHash'), onHasMoneyHash);
-                } else {
-                    onHasMoneyHash();
-                }
-                this.receive(utils.observe(this.state, 'moneyHash'), () => {
-                    this._currentHasCommission();
-                    this._onChangeBaseAssets();
-                    this._updateGatewayDetails();
-                });
-                this._onChangeBaseAssets();
-                this._updateWavesTxObject();
-            }
-
-            onSignCoinomatStart() {
-                this.signInProgress = true;
-            }
-
-            onSignCoinomatEnd() {
-                this.signInProgress = false;
-            }
-
-            createTx() {
-                const toGateway = this.outerSendMode && this.gatewayDetails;
-                const fee = toGateway ? this.tx.amount.cloneWithTokens(toGateway.gatewayFee) : null;
-                const attachmentString = this.tx.attachment ? this.tx.attachment.toString() : '';
-                const tx = waves.node.transactions.createTransaction({
-                    ...this.tx,
-                    recipient: toGateway ? this.gatewayDetails.address : this.tx.recipient,
-                    attachment: utils.stringToBytes(toGateway ? this.gatewayDetails.attachment : attachmentString),
-                    amount: toGateway ? this.tx.amount.add(fee) : this.tx.amount
-                });
-
-                const signable = ds.signature.getSignatureApi().makeSignable({
-                    type: tx.type,
-                    data: tx
-                });
-
-                return signable;
-            }
-
-            onSignTx(signable) {
-                analytics.send({ name: 'Transfer Continue Click', target: 'ui' });
-                this.onContinue({ signable });
-            }
-
-            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.moneyHash[this.assetId].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;
-                    $scope.$apply();
-                });
-            }
-
-            onBlurMirror() {
-                if (!this.mirror) {
-                    this._fillMirror();
-                }
-                this.focus = '';
+                this.test = 0;
             }
 
-            /**
-             * @param {string} url
-             * @return {null}
-             */
-            onReadQrCode(url) {
-                if (!url.includes('https://')) {
-                    this.tx.recipient = url;
-                    $scope.$apply();
-                    return null;
-                }
-
-                const routeData = utils.getRouterParams(utils.getUrlForRoute(url));
-
-                if (!routeData || routeData.name !== 'SEND_ASSET') {
-                    return null;
-                }
-
-                const result = routeData.data;
-
-                this.tx.recipient = result.recipient;
-
-                // analytics.push('Send', `Send.QrCodeRead.${WavesApp.type}`,
-                // `Send.QrCodeRead.${WavesApp.type}.Success`);
-
-                if (result) {
-
-                    const applyAmount = () => {
-                        if (result.amount) {
-                            this.tx.amount = this.moneyHash[this.assetId].cloneWithTokens(result.amount);
-                            this._fillMirror();
-                        }
-                        $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();
-                    }
-                }
-            }
-
-            /**
-             * @return {boolean}
-             */
-            isMoneroNotIntegratedAddress() {
-                const moneroAddressLength = 95;
-                const assetIsMonero = this.state.assetId === WavesApp.defaultAssets.XMR;
-                return assetIsMonero && this.tx.recipient.length === moneroAddressLength;
-            }
-
-            getGatewayDetails() {
-                this._onChangeAssetId();
-            }
-
-            /**
-             * @private
-             */
-            _updateWavesTxObject() {
-                const toGateway = this.outerSendMode && this.gatewayDetails;
-                const fee = toGateway ? this.tx.amount.cloneWithTokens(toGateway.gatewayFee) : null;
-                const attachmentString = this.tx.attachment ? this.tx.attachment.toString() : '';
-                const isWavesAddress = user.isValidAddress(this.tx.recipient);
-                this.wavesTx = {
-                    ...this.wavesTx,
-                    recipient: toGateway ? this.gatewayDetails.address : isWavesAddress && this.tx.recipient || '',
-                    attachment: utils.stringToBytes(toGateway ? this.gatewayDetails.attachment : attachmentString),
-                    amount: toGateway ? this.tx.amount.add(fee) : this.tx.amount,
-                    assetId: this.assetId
-                };
-            }
-
-            /**
-             * @private
-             */
-            _validateForm() {
-                if (this.tx.amount.getTokens().gt(0) || this.tx.recipient) {
-                    this.send.$setDirty(true);
-                    this.send.$setSubmitted(true);
-                }
-            }
-
-            /**
-             * @private
-             */
-            _onChangeBankMode() {
-                if (this.toBankMode && !this.isLira) {
-                    this.tx.recipient = BANK_RECIPIENT;
-                    this.termsIsPending = true;
-                } else {
-                    this.tx.recipient = '';
-                    this.termsIsPending = false;
-                }
-
-                this._setMinAmount();
-                this._updateGatewayPermisson();
-            }
-
-            /**
-             * @private
-             */
-            _setMinAmount() {
-                if (this.toBankMode && !this.isLira) {
-                    const maxCoinomatAmount = this.balance.cloneWithTokens(50000);
-                    const minCoinomatAmount = this.balance.cloneWithTokens(100);
-
-                    this.maxAmount = Money.min(maxCoinomatAmount, this.balance);
-                    this.minAmount = minCoinomatAmount;
-                } else {
-                    this.minAmount = this.state.moneyHash[this.assetId].cloneWithTokens('0');
-                    this.maxAmount = this.moneyHash[this.assetId];
-                }
-
-                this._validateForm();
-            }
-
-            /**
-             * @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
-             */
-            _onChangeAssetId() {
-                if (!this.assetId) {
-                    throw new Error('Has no asset id!');
-                }
-
-                this._onChangeBaseAssets();
-
-                if (!this.moneyHash[this.assetId]) {
-                    return null;
-                }
-
-                this.tx.amount = this.moneyHash[this.assetId].cloneWithTokens('0');
-                this.mirror = this.moneyHash[this.mirrorId].cloneWithTokens('0');
-                this._updateGatewayDetails();
-                this._updateGatewayPermisson();
-            }
-
-            /**
-             * @private
-             */
-            _currentHasCommission() {
-                if (!this.moneyHash) {
-                    return null;
-                }
-
-                const details = this.gatewayDetails;
-
-                const check = (feeList) => {
-                    const feeHash = utils.groupMoney(feeList);
-                    const balanceHash = this.moneyHash;
-
-                    this.hasComission = 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)));
-                } else {
-                    this.feeList = [this.tx.fee];
-                    check(this.feeList);
-                }
-            }
-
-            /**
-             * @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
-             */
-            _onChangeAmount() {
-                if (!this._noCurrentRate && !this.noMirror && this.focus === 'amount') {
-                    this._fillMirror();
-                }
-
-            }
-
-            /**
-             * @private
-             */
-            _onChangeAmountMirror() {
-                if (!this._noCurrentRate && this.focus === 'mirror') {
-                    this._fillAmount();
-                }
-            }
-
-            /**
-             * @private
-             */
-            _fillMirror() {
-
-                if (!this.tx.amount) {
-                    this.mirror = null;
-                    setTimeout(() => $scope.$digest(), 0);
-                    return null;
-                }
-
-                waves.utils.getRate(this.assetId, this.mirrorId).then((rate) => {
-                    this.mirror = this.tx.amount.convertTo(this.moneyHash[this.mirrorId].asset, rate);
-                    $scope.$digest();
-                });
-            }
-
-            /**
-             * @private
-             */
-            _fillAmount() {
-
-                if (!this.mirror) {
-                    this.tx.amount = null;
-                    setTimeout(() => $scope.$digest(), 0);
-                    return null;
-                }
-
-                waves.utils.getRate(this.mirrorId, this.assetId).then((rate) => {
-                    this.tx.amount = this.mirror.convertTo(this.moneyHash[this.assetId].asset, rate);
-                    $scope.$digest();
-                });
-            }
-
-            /**
-             * @private
-             */
-            _updateGatewayDetails() {
-                if (this.toBankMode && !this.isLira) {
-                    this._setMinAmount();
-                    return;
-                }
-
-                const outerChain = outerBlockchains[this.assetId];
-                const isValidWavesAddress = user.isValidAddress(this.tx.recipient);
-
-                if (this.gatewayDetailsError) {
-                    this.outerSendMode = false;
-                    this.gatewayDetailsError = false;
-                }
-
-                if (this.gatewayAddressError) {
-                    this.gatewayAddressError = false;
-                }
-
-                if (this.gatewayWrongAddress) {
-                    this.gatewayWrongAddress = false;
-                }
-
-                this.outerSendMode = !isValidWavesAddress && outerChain && outerChain.isValidAddress(this.tx.recipient);
-
-                if (this.outerSendMode) {
-                    return gatewayService.getWithdrawDetails(this.balance.asset, this.tx.recipient, this.paymentId)
-                        .then((details) => {
-                            const max = BigNumber.min(
-                                details.maximumAmount.add(details.gatewayFee),
-                                this.moneyHash[this.assetId].getTokens()
-                            );
-
-                            this.gatewayDetails = details;
-                            this.minAmount = this.moneyHash[this.assetId]
-                                .cloneWithTokens(details.minimumAmount.sub('0.00000001'));
-                            this.maxAmount = this.moneyHash[this.assetId].cloneWithTokens(max);
-                            this.maxGatewayAmount = Money.fromTokens(details.maximumAmount, this.balance.asset);
-                            $scope.$apply();
-                        }, (e) => {
-                            this.gatewayDetails = null;
-                            if (e.message === gatewayService.getAddressErrorMessage(this.balance.asset,
-                                this.tx.recipient, 'errorAddressMessage')) {
-                                this.gatewayAddressError = true;
-                            } else if (e.message === gatewayService.getWrongAddressMessage(this.balance.asset,
-                                this.tx.recipient, 'wrongAddressMessage')) {
-                                this.gatewayWrongAddress = true;
-                            } else {
-                                this.gatewayDetailsError = true;
-                            }
-                            $scope.$apply();
-                        });
-                } else {
-                    this.minAmount = this.state.moneyHash[this.assetId].cloneWithTokens('0');
-                    this.maxAmount = this.moneyHash[this.assetId];
-                    this.gatewayDetails = null;
-                    this._validateForm();
-                }
-                return Promise.resolve();
-            }
-
-            /**
-             * @private
-             */
-            _updateGatewayPermisson() {
-                this.gatewayDetailsError = this.outerSendMode ? !this.isGatewayAccepted : this.gatewayDetailsError;
-            }
-
-            /**
-             * @private
-             */
-            _updateGatewayError() {
-                this.gatewayError = this.gatewayAddressError || this.gatewayDetailsError || this.gatewayWrongAddress;
+            onChangeMode(mode) {
+                this.sendMode = mode;
             }
 
         }
@@ -736,17 +23,7 @@
         return new SingleSend();
     };
 
-    controller.$inject = [
-        'Base',
-        '$scope',
-        'utils',
-        'createPoll',
-        'waves',
-        'configService',
-        'outerBlockchains',
-        'user',
-        'gatewayService'
-    ];
+    controller.$inject = [];
 
     angular.module('app.ui').component('wSingleSend', {
         bindings: {
@@ -760,9 +37,5 @@
 })();
 
 /**
- * @typedef {object} ISendTx
- * @property {Money} fee
- * @property {Money} amount
- * @property {string} recipient
- * @property {string} attachment
+ * @typedef {string} ISendMode = waves | bank | gateway
  */
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
new file mode 100644
index 0000000000..494813404f
--- /dev/null
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
@@ -0,0 +1,28 @@
+(function () {
+    'use strict';
+
+    const controller = function () {
+
+        class BankSend {
+
+            constructor() {
+                this.test = 0;
+            }
+
+        }
+
+        return new BankSend();
+    };
+
+    controller.$inject = [];
+
+    angular.module('app.ui').component('wBankSend', {
+        bindings: {
+            state: '<',
+            onContinue: '&'
+        },
+        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
new file mode 100644
index 0000000000..103be5fa4a
--- /dev/null
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/bank-send.html
@@ -0,0 +1,2 @@
+Bank send
+<ng-transclude></ng-transclude>
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
new file mode 100644
index 0000000000..b08d2ee1e8
--- /dev/null
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
@@ -0,0 +1,768 @@
+(function () {
+    'use strict';
+
+    const FIAT_ASSETS = {
+        [WavesApp.defaultAssets.USD]: true,
+        [WavesApp.defaultAssets.EUR]: true,
+        [WavesApp.defaultAssets.TRY]: true
+    };
+
+    const { Money } = require('@waves/data-entities');
+    const { BigNumber } = require('@waves/bignumber');
+    const ds = require('data-service');
+    const { SIGN_TYPE } = require('@waves/signature-adapter');
+    const analytics = require('@waves/event-sender');
+
+    const BANK_RECIPIENT = WavesApp.bankRecipient;
+    const MIN_TOKEN_COUNT = 100;
+    const MAX_TOKEN_COUNT = 50000;
+
+    /**
+     * @param {Base} Base
+     * @param {$rootScope.Scope} $scope
+     * @param {app.utils} utils
+     * @param {IPollCreate} createPoll
+     * @param {ConfigService} configService
+     * @param {IOuterBlockchains} outerBlockchains
+     * @param {User} user
+     * @param {GatewayService} gatewayService
+     * @param {Waves} waves
+     */
+    const controller = function (Base,
+                                 $scope,
+                                 utils,
+                                 createPoll,
+                                 waves,
+                                 configService,
+                                 outerBlockchains,
+                                 user,
+                                 gatewayService) {
+
+        class GatewaySend extends Base {
+
+            /**
+             * @return {boolean}
+             */
+            get hasSendToBank() {
+                return FIAT_ASSETS[this.assetId] || false;
+            }
+
+            /**
+             * @return {boolean}
+             */
+            get isLira() {
+                return this.assetId === WavesApp.defaultAssets.TRY;
+            }
+
+            /**
+             * @return {ISingleSendTx}
+             */
+            get tx() {
+                return this.state.singleSend;
+            }
+
+            /**
+             * @return {string}
+             */
+            get assetId() {
+                return this.state.assetId;
+            }
+
+            set assetId(id) {
+                this.state.assetId = id;
+            }
+
+            /**
+             * @return {string}
+             */
+            get mirrorId() {
+                return this.state.mirrorId;
+            }
+
+            /**
+             * @return {Object<string, Money>}
+             */
+            get moneyHash() {
+                return this.state.moneyHash;
+            }
+
+            /**
+             * @return {Object.<string, Money>}
+             */
+            get feeHash() {
+                return utils.groupMoney(this.feeList || []);
+            }
+
+            /**
+             * @return {Money}
+             */
+            get balance() {
+                return this.moneyHash[this.assetId];
+            }
+
+            /**
+             * @return {boolean}
+             */
+            get outerSendMode() {
+                return this.state.outerSendMode;
+            }
+
+            set outerSendMode(value) {
+                this.state.outerSendMode = value;
+            }
+
+            /**
+             * @return {string}
+             */
+            get paymentId() {
+                return this.state.paymentId;
+            }
+
+            set paymentId(value) {
+                this.state.paymentId = value;
+            }
+
+            /**
+             * @return {IGatewayDetails}
+             */
+            get gatewayDetails() {
+                return this.state.gatewayDetails;
+            }
+
+            set gatewayDetails(value) {
+                this.state.gatewayDetails = value;
+            }
+
+            get isBankPending() {
+                return this.toBankMode && this.termsIsPending;
+            }
+
+            get isBankError() {
+                return this.toBankMode && this.termsLoadError;
+            }
+
+            get isGatewayAccepted() {
+                return !configService
+                    .get('PERMISSIONS.CANT_TRANSFER_GATEWAY').includes(this.balance.asset.id);
+            }
+
+            get isBankAccepted() {
+                return this.toBankMode ? this.isGatewayAccepted : true;
+            }
+
+            get isBankPendingOrError() {
+                return this.isBankError || this.isBankPending;
+            }
+
+            get hasOuterError() {
+                return this.outerSendMode && this.gatewayError || this.isBankError;
+            }
+
+            get minimumAmount() {
+                return this.gatewayDetails &&
+                    this.gatewayDetails.minimumAmount ||
+                    this.toBankMode &&
+                    new BigNumber(MIN_TOKEN_COUNT);
+            }
+
+            get maximumAmount() {
+                return this.maxGatewayAmount || this.toBankMode && this.balance.cloneWithTokens(MAX_TOKEN_COUNT);
+            }
+
+            /**
+             * @type {string}
+             */
+            txType = WavesApp.TRANSACTION_TYPES.NODE.TRANSFER;
+
+            /**
+             * @type {boolean}
+             */
+            get toBankMode() {
+                return this.state.toBankMode;
+            }
+
+            set toBankMode(value) {
+                this.state.toBankMode = value;
+            }
+
+            /**
+             * @type {string}
+             */
+            digiLiraUserLink = 'https://www.digilira.com/';
+            /**
+             * @type {Function}
+             */
+            onContinue = null;
+            /**
+             * @type {string}
+             */
+            focus = null;
+            /**
+             * @type {Money}
+             */
+            mirror = null;
+            /**
+             * @type {boolean}
+             */
+            noMirror = false;
+            /**
+             * @type {boolean}
+             */
+            hasComission = true;
+            /**
+             * @type {Array}
+             */
+            feeList = null;
+            /**
+             * @type {Money}
+             */
+            minAmount = null;
+            /**
+             * @type {Money}
+             */
+            maxAmount = null;
+            /**
+             * @type {ISendState}
+             */
+            state = Object.create(null);
+            /**
+             * @type {Money}
+             */
+            maxGatewayAmount = null;
+            /**
+             * @type {boolean}
+             */
+            gatewayDetailsError = false;
+            /**
+             * @type {boolean}
+             */
+            gatewayAddressError = false;
+            /**
+             * @type {boolean}
+             */
+            gatewayWrongAddress = false;
+            /**
+             * @type {boolean}
+             */
+            gatewayError = false;
+            /**
+             * @type {boolean}
+             */
+            termsIsPending = true;
+            /**
+             * @type {boolean}
+             */
+            termsLoadError = false;
+            /**
+             * @type {boolean}
+             */
+            signInProgress = false;
+            /**
+             * @type {ISingleSendTx}
+             */
+            wavesTx = {
+                type: SIGN_TYPE.TRANSFER,
+                amount: null,
+                attachment: '',
+                fee: null,
+                recipient: '',
+                assetId: ''
+            };
+            /**
+             * @type {boolean}
+             * @private
+             */
+            _noCurrentRate = false;
+
+            constructor() {
+                super();
+
+                $scope.WavesApp = WavesApp;
+            }
+
+            $postLink() {
+                this.receive(utils.observe(this.tx, 'fee'), this._currentHasCommission, this);
+                const onHasMoneyHash = () => {
+                    this.receive(utils.observe(this.state, 'toBankMode'), this._onChangeBankMode, this);
+                    this.observe('gatewayDetails', this._currentHasCommission);
+
+                    this.minAmount = this.state.moneyHash[this.state.assetId].cloneWithTokens('0');
+                    this.tx.amount = this.tx.amount || this.moneyHash[this.assetId].cloneWithTokens('0');
+                    this._fillMirror();
+
+                    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._updateGatewayDetails, this);
+                    this.receive(utils.observe(this.tx, 'recipient'), this._updateGatewayDetails, this);
+
+                    this.receive(utils.observe(this.state, 'paymentId'), this._updateGatewayPermisson, this);
+                    this.receive(utils.observe(this.tx, 'recipient'), this._updateGatewayPermisson, this);
+
+                    this.receive(utils.observe(this.tx, 'amount'), this._onChangeAmount, this);
+
+                    this.observe('gatewayDetails', this._updateWavesTxObject);
+                    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.observe('mirror', this._onChangeAmountMirror);
+                    this.observe(['gatewayAddressError', 'gatewayDetailsError', 'gatewayWrongAddress'],
+                        this._updateGatewayError);
+
+                    this._currentHasCommission();
+                    this._onChangeBaseAssets();
+                    this._updateGatewayDetails();
+                    this._updateGatewayPermisson();
+                };
+                if (!this.state.moneyHash) {
+                    this.receiveOnce(utils.observe(this.state, 'moneyHash'), onHasMoneyHash);
+                } else {
+                    onHasMoneyHash();
+                }
+                this.receive(utils.observe(this.state, 'moneyHash'), () => {
+                    this._currentHasCommission();
+                    this._onChangeBaseAssets();
+                    this._updateGatewayDetails();
+                });
+                this._onChangeBaseAssets();
+                this._updateWavesTxObject();
+            }
+
+            onSignCoinomatStart() {
+                this.signInProgress = true;
+            }
+
+            onSignCoinomatEnd() {
+                this.signInProgress = false;
+            }
+
+            createTx() {
+                const toGateway = this.outerSendMode && this.gatewayDetails;
+                const fee = toGateway ? this.tx.amount.cloneWithTokens(toGateway.gatewayFee) : null;
+                const attachmentString = this.tx.attachment ? this.tx.attachment.toString() : '';
+                const tx = waves.node.transactions.createTransaction({
+                    ...this.tx,
+                    recipient: toGateway ? this.gatewayDetails.address : this.tx.recipient,
+                    attachment: utils.stringToBytes(toGateway ? this.gatewayDetails.attachment : attachmentString),
+                    amount: toGateway ? this.tx.amount.add(fee) : this.tx.amount
+                });
+
+                const signable = ds.signature.getSignatureApi().makeSignable({
+                    type: tx.type,
+                    data: tx
+                });
+
+                return signable;
+            }
+
+            onSignTx(signable) {
+                analytics.send({ name: 'Transfer Continue Click', target: 'ui' });
+                this.onContinue({ signable });
+            }
+
+            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.moneyHash[this.assetId].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;
+                    $scope.$apply();
+                });
+            }
+
+            onBlurMirror() {
+                if (!this.mirror) {
+                    this._fillMirror();
+                }
+                this.focus = '';
+            }
+
+            /**
+             * @param {string} url
+             * @return {null}
+             */
+            onReadQrCode(url) {
+                if (!url.includes('https://')) {
+                    this.tx.recipient = url;
+                    $scope.$apply();
+                    return null;
+                }
+
+                const routeData = utils.getRouterParams(utils.getUrlForRoute(url));
+
+                if (!routeData || routeData.name !== 'SEND_ASSET') {
+                    return null;
+                }
+
+                const result = routeData.data;
+
+                this.tx.recipient = result.recipient;
+
+                // analytics.push('Send', `Send.QrCodeRead.${WavesApp.type}`,
+                // `Send.QrCodeRead.${WavesApp.type}.Success`);
+
+                if (result) {
+
+                    const applyAmount = () => {
+                        if (result.amount) {
+                            this.tx.amount = this.moneyHash[this.assetId].cloneWithTokens(result.amount);
+                            this._fillMirror();
+                        }
+                        $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();
+                    }
+                }
+            }
+
+            /**
+             * @return {boolean}
+             */
+            isMoneroNotIntegratedAddress() {
+                const moneroAddressLength = 95;
+                const assetIsMonero = this.state.assetId === WavesApp.defaultAssets.XMR;
+                return assetIsMonero && this.tx.recipient.length === moneroAddressLength;
+            }
+
+            getGatewayDetails() {
+                this._onChangeAssetId();
+            }
+
+            /**
+             * @private
+             */
+            _updateWavesTxObject() {
+                const toGateway = this.outerSendMode && this.gatewayDetails;
+                const fee = toGateway ? this.tx.amount.cloneWithTokens(toGateway.gatewayFee) : null;
+                const attachmentString = this.tx.attachment ? this.tx.attachment.toString() : '';
+                const isWavesAddress = user.isValidAddress(this.tx.recipient);
+                this.wavesTx = {
+                    ...this.wavesTx,
+                    recipient: toGateway ? this.gatewayDetails.address : isWavesAddress && this.tx.recipient || '',
+                    attachment: utils.stringToBytes(toGateway ? this.gatewayDetails.attachment : attachmentString),
+                    amount: toGateway ? this.tx.amount.add(fee) : this.tx.amount,
+                    assetId: this.assetId
+                };
+            }
+
+            /**
+             * @private
+             */
+            _validateForm() {
+                if (this.tx.amount.getTokens().gt(0) || this.tx.recipient) {
+                    this.send.$setDirty(true);
+                    this.send.$setSubmitted(true);
+                }
+            }
+
+            /**
+             * @private
+             */
+            _onChangeBankMode() {
+                if (this.toBankMode && !this.isLira) {
+                    this.tx.recipient = BANK_RECIPIENT;
+                    this.termsIsPending = true;
+                } else {
+                    this.tx.recipient = '';
+                    this.termsIsPending = false;
+                }
+
+                this._setMinAmount();
+                this._updateGatewayPermisson();
+            }
+
+            /**
+             * @private
+             */
+            _setMinAmount() {
+                if (this.toBankMode && !this.isLira) {
+                    const maxCoinomatAmount = this.balance.cloneWithTokens(50000);
+                    const minCoinomatAmount = this.balance.cloneWithTokens(100);
+
+                    this.maxAmount = Money.min(maxCoinomatAmount, this.balance);
+                    this.minAmount = minCoinomatAmount;
+                } else {
+                    this.minAmount = this.state.moneyHash[this.assetId].cloneWithTokens('0');
+                    this.maxAmount = this.moneyHash[this.assetId];
+                }
+
+                this._validateForm();
+            }
+
+            /**
+             * @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
+             */
+            _onChangeAssetId() {
+                if (!this.assetId) {
+                    throw new Error('Has no asset id!');
+                }
+
+                this._onChangeBaseAssets();
+
+                if (!this.moneyHash[this.assetId]) {
+                    return null;
+                }
+
+                this.tx.amount = this.moneyHash[this.assetId].cloneWithTokens('0');
+                this.mirror = this.moneyHash[this.mirrorId].cloneWithTokens('0');
+                this._updateGatewayDetails();
+                this._updateGatewayPermisson();
+            }
+
+            /**
+             * @private
+             */
+            _currentHasCommission() {
+                if (!this.moneyHash) {
+                    return null;
+                }
+
+                const details = this.gatewayDetails;
+
+                const check = (feeList) => {
+                    const feeHash = utils.groupMoney(feeList);
+                    const balanceHash = this.moneyHash;
+
+                    this.hasComission = 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)));
+                } else {
+                    this.feeList = [this.tx.fee];
+                    check(this.feeList);
+                }
+            }
+
+            /**
+             * @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
+             */
+            _onChangeAmount() {
+                if (!this._noCurrentRate && !this.noMirror && this.focus === 'amount') {
+                    this._fillMirror();
+                }
+
+            }
+
+            /**
+             * @private
+             */
+            _onChangeAmountMirror() {
+                if (!this._noCurrentRate && this.focus === 'mirror') {
+                    this._fillAmount();
+                }
+            }
+
+            /**
+             * @private
+             */
+            _fillMirror() {
+
+                if (!this.tx.amount) {
+                    this.mirror = null;
+                    setTimeout(() => $scope.$digest(), 0);
+                    return null;
+                }
+
+                waves.utils.getRate(this.assetId, this.mirrorId).then((rate) => {
+                    this.mirror = this.tx.amount.convertTo(this.moneyHash[this.mirrorId].asset, rate);
+                    $scope.$digest();
+                });
+            }
+
+            /**
+             * @private
+             */
+            _fillAmount() {
+
+                if (!this.mirror) {
+                    this.tx.amount = null;
+                    setTimeout(() => $scope.$digest(), 0);
+                    return null;
+                }
+
+                waves.utils.getRate(this.mirrorId, this.assetId).then((rate) => {
+                    this.tx.amount = this.mirror.convertTo(this.moneyHash[this.assetId].asset, rate);
+                    $scope.$digest();
+                });
+            }
+
+            /**
+             * @private
+             */
+            _updateGatewayDetails() {
+                if (this.toBankMode && !this.isLira) {
+                    this._setMinAmount();
+                    return;
+                }
+
+                const outerChain = outerBlockchains[this.assetId];
+                const isValidWavesAddress = user.isValidAddress(this.tx.recipient);
+
+                if (this.gatewayDetailsError) {
+                    this.outerSendMode = false;
+                    this.gatewayDetailsError = false;
+                }
+
+                if (this.gatewayAddressError) {
+                    this.gatewayAddressError = false;
+                }
+
+                if (this.gatewayWrongAddress) {
+                    this.gatewayWrongAddress = false;
+                }
+
+                this.outerSendMode = !isValidWavesAddress && outerChain && outerChain.isValidAddress(this.tx.recipient);
+
+                if (this.outerSendMode) {
+                    return gatewayService.getWithdrawDetails(this.balance.asset, this.tx.recipient, this.paymentId)
+                        .then((details) => {
+                            const max = BigNumber.min(
+                                details.maximumAmount.add(details.gatewayFee),
+                                this.moneyHash[this.assetId].getTokens()
+                            );
+
+                            this.gatewayDetails = details;
+                            this.minAmount = this.moneyHash[this.assetId]
+                                .cloneWithTokens(details.minimumAmount.sub('0.00000001'));
+                            this.maxAmount = this.moneyHash[this.assetId].cloneWithTokens(max);
+                            this.maxGatewayAmount = Money.fromTokens(details.maximumAmount, this.balance.asset);
+                            $scope.$apply();
+                        }, (e) => {
+                            this.gatewayDetails = null;
+                            if (e.message === gatewayService.getAddressErrorMessage(this.balance.asset,
+                                this.tx.recipient, 'errorAddressMessage')) {
+                                this.gatewayAddressError = true;
+                            } else if (e.message === gatewayService.getWrongAddressMessage(this.balance.asset,
+                                this.tx.recipient, 'wrongAddressMessage')) {
+                                this.gatewayWrongAddress = true;
+                            } else {
+                                this.gatewayDetailsError = true;
+                            }
+                            $scope.$apply();
+                        });
+                } else {
+                    this.minAmount = this.state.moneyHash[this.assetId].cloneWithTokens('0');
+                    this.maxAmount = this.moneyHash[this.assetId];
+                    this.gatewayDetails = null;
+                    this._validateForm();
+                }
+                return Promise.resolve();
+            }
+
+            /**
+             * @private
+             */
+            _updateGatewayPermisson() {
+                this.gatewayDetailsError = this.outerSendMode ? !this.isGatewayAccepted : this.gatewayDetailsError;
+            }
+
+            /**
+             * @private
+             */
+            _updateGatewayError() {
+                this.gatewayError = this.gatewayAddressError || this.gatewayDetailsError || this.gatewayWrongAddress;
+            }
+
+        }
+
+        return new GatewaySend();
+    };
+
+    controller.$inject = [
+        'Base',
+        '$scope',
+        'utils',
+        'createPoll',
+        'waves',
+        'configService',
+        'outerBlockchains',
+        'user',
+        'gatewayService'
+    ];
+
+    angular.module('app.ui').component('wGatewaySend', {
+        bindings: {
+            state: '<',
+            onContinue: '&'
+        },
+        templateUrl: 'modules/utils/modals/sendAsset/components/singleSend/gatewaySend/gateway-send.html',
+        transclude: true,
+        controller
+    });
+})();
+
+/**
+ * @typedef {object} ISendTx
+ * @property {Money} fee
+ * @property {Money} amount
+ * @property {string} recipient
+ * @property {string} attachment
+ */
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
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/single-send.html b/src/modules/utils/modals/sendAsset/components/singleSend/single-send.html
index 4711a9d1ba..4f2a1abbd4 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/single-send.html
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/single-send.html
@@ -1,318 +1,18 @@
-<form class="send-form"
-      name="$ctrl.send"
-      novalidate>
-
+<w-waves-send ng-if="$ctrl.sendMode === 'waves'"
+              state="$ctrl.state"
+              on-continue="$ctrl.onContinue"
+              on-change-mode="$ctrl.onChangeMode(mode)">
     <ng-transclude></ng-transclude>
+</w-waves-send>
 
-    <div class="row" ng-if="!$ctrl.isLira">
-        <div ng-if="$ctrl.toBankMode && !$ctrl.isVerified && !$ctrl.isBankPendingOrError"
-             class="plate-error">
-            <div class="body-2 error-500 margin-05" w-i18n="modal.send.notVerifiedHeader"></div>
-            <div class="footnote-1 basic-500" w-i18n="modal.send.notVerifiedText"></div>
-        </div>
-    </div>
-
-    <div class="row margin-top-2">
-        <div class="flex-row-title">
-            <div class="body-2 margin-05" w-i18n="modal.send.recipient"></div>
-            <div ng-if="$ctrl.hasSendToBank"
-                 class="toggle-mode-container">
-                <span class="link"
-                      ng-click="$ctrl.toBankMode = !$ctrl.toBankMode"
-                      ng-if="!$ctrl.toBankMode && !$ctrl.isLira"
-                      w-i18n="modal.send.toBank"></span>
-                <span class="link"
-                      ng-click="$ctrl.toBankMode = !$ctrl.toBankMode"
-                      ng-if="$ctrl.toBankMode"
-                      w-i18n="modal.send.toWaves"></span>
-            </div>
-        </div>
-
-        <div class="input-like big disabled" ng-if="$ctrl.toBankMode">
-            <span w-i18n="modal.send.bankAccount" ng-if="!$ctrl.isLira"></span>
-            <span w-i18n="modal.send.liraBankAccount" ng-if="$ctrl.isLira"></span>
-        </div>
-
-        <w-input-container ng-if="!$ctrl.toBankMode">
-            <div class="read-address-wrap">
-                <w-input type="text"
-                         name="recipient"
-                         ng-model="$ctrl.state.singleSend.recipient"
-                         placeholder="modal.send.placeholderRecipient"
-                         w-i18n-attr="placeholder"
-                         w-validate
-                         w-validator-any-address="{{$ctrl.state.assetId}}"
-                         required></w-input>
-
-                <w-qr-code-read on-read="$ctrl.onReadQrCode(text)" max-width="415"
-                                max-height="310"></w-qr-code-read>
-            </div>
-
-            <w-input-error message="anyAddress">
-                <span w-i18n="modal.send.errors.address"></span>
-            </w-input-error>
-            <w-input-error message="required">
-                <span w-i18n="modal.send.errors.required"></span>
-            </w-input-error>
-        </w-input-container>
-    </div>
-
-    <div class="row relative" style="min-height: 60px;"
-         ng-if="$ctrl.toBankMode && $ctrl.termsIsPending && !$ctrl.isLira && $ctrl.isBankAccepted">
-        <w-loader class="asd"></w-loader>
-    </div>
-
-    <div ng-if="$ctrl.toBankMode && !$ctrl.isBankPendingOrError && $ctrl.isVerified && $ctrl.isGatewayAccepted" class="margin-1">
-        <div class="plate-warning">
-            <div class="body-2 warning-500 margin-05" w-i18n="modal.send.coinomatWarningHeader"></div>
-            <div class="footnote-1 basic-500" w-i18n="modal.send.coinomatWarningText"></div>
-        </div>
-    </div>
-
-    <div ng-if="$ctrl.toBankMode && !$ctrl.isBankPendingOrError && $ctrl.isVerified && $ctrl.isGatewayAccepted" class="row">
-        <div class="plate-warning">
-            <div class="body-2 warning-500 margin-05" w-i18n="modal.send.coinomatLimits"></div>
-        </div>
-    </div>
-
-    <div ng-if="$ctrl.outerSendMode && !$ctrl.gatewayError" class="row">
-        <div class="plate-warning margin-2">
-            <div class="body-2 warning-500"
-                 w-i18n="modal.send.coinomat.feeTitle"
-                 params="{
-                               fee: $ctrl.gatewayDetails.gatewayFee,
-                               assetTicker: $ctrl.state.moneyHash[$ctrl.state.assetId].asset.displayName
-                             }"></div>
-            <div class="footnote-1 basic-500"
-                 w-i18n="modal.send.gateway.feeExplanation"
-                 params="{
-                               min: $ctrl.gatewayDetails.minimumAmount,
-                               max: $ctrl.gatewayDetails.maximumAmount,
-                               assetTicker: $ctrl.state.moneyHash[$ctrl.state.assetId].asset.displayName,
-                               assetName: $ctrl.state.moneyHash[$ctrl.state.assetId].asset.name
-                             }"></div>
-        </div>
-
-        <div class="plate-warning basic-500">
-            <span w-i18n="modal.send.icoWarning"
-                  params="{assetName: $ctrl.state.moneyHash[$ctrl.state.assetId].asset.name}"></span>
-        </div>
-    </div>
-
-    <div ng-if="$ctrl.outerSendMode && $ctrl.gatewayDetailsError || !$ctrl.isBankAccepted" class="row">
-        <div class="plate-warning server-error">
-            <div class="body-2 warning-500 margin-05"
-                 w-i18n="modal.receive.gatewayError">
-            </div>
-        </div>
-    </div>
-
-    <div ng-if="$ctrl.outerSendMode && $ctrl.gatewayAddressError" class="row">
-        <div class="plate-warning server-error">
-            <div class="body-2 warning-500 margin-05"
-                 w-i18n="modal.receive.serverAddressError">
-            </div>
-        </div>
-    </div>
-
-    <div ng-if="$ctrl.outerSendMode && $ctrl.gatewayWrongAddress" class="row">
-        <div class="plate-warning server-error">
-            <div class="body-2 warning-500 margin-05"
-                 w-i18n="modal.receive.serverWrongAddress">
-            </div>
-        </div>
-    </div>
-
-    <div ng-if="$ctrl.outerSendMode && $ctrl.isMoneroNotIntegratedAddress() && !$ctrl.gatewayError">
-        <div class="body-2 margin-05" w-i18n="modal.send.moneroPaymentId"></div>
-        <w-input-container class="row">
-            <div>
-                <w-input type="text"
-                         name="payment-id"
-                         ng-model="$ctrl.state.paymentId"
-                         placeholder="modal.send.moneroPaymentIdPlaceholder"
-                         w-i18n-attr="placeholder"
-                         ng-minlength="64"
-                         ng-maxlength="64"
-                         w-validate
-                         w-validator-pattern="^[0-9a-fA-F]+$"
-                         required></w-input>
-            </div>
-
-            <w-input-error message="minlength">
-                <span w-i18n="modal.send.errors.paymentIdLength"></span>
-            </w-input-error>
-            <w-input-error message="maxlength">
-                <span w-i18n="modal.send.errors.paymentIdLength"></span>
-            </w-input-error>
-            <w-input-error message="pattern">
-                <span w-i18n="modal.send.errors.paymentIdPattern"></span>
-            </w-input-error>
-            <w-input-error message="required">
-                <span w-i18n="modal.send.errors.required"></span>
-            </w-input-error>
-        </w-input-container>
-    </div>
-
-    <w-input-container ng-if="!$ctrl.hasOuterError && !$ctrl.isBankPending && $ctrl.isBankAccepted"
-                       class="margin-top-2">
-        <div class="body-2 margin-05" w-i18n="modal.send.amount"></div>
-        <div class="amount-wrap" ng-class="{'no-mirror': $ctrl.noMirror}">
-
-            <w-balance-input name="amount"
-                             asset-id="$ctrl.state.assetId"
-                             max-balance="$ctrl.maxAmount"
-                             fee="$ctrl.feeList"
-                             input-classes="big"
-                             disabled="$ctrl.toBankMode && (!$ctrl.isVerified || !$ctrl.termsAccepted)"
-                             min="$ctrl.minAmount"
-                             on-focus="$ctrl.focus = 'amount'"
-                             on-blur="$ctrl.focus = ''"
-                             amount="$ctrl.state.singleSend.amount">
-            </w-balance-input>
-            <div class="amount-modal-icon"></div>
-            <w-balance-input ng-if="!$ctrl.noMirror"
-                             on-focus="$ctrl.focus = 'mirror'"
-                             on-blur="$ctrl.onBlurMirror()"
-                             name="amountMirror"
-                             asset-id="$ctrl.mirrorId"
-                             fill-max="$ctrl.fillMax()"
-                             fee="$ctrl.tx.fee"
-                             input-classes="big"
-                             disabled="$ctrl.toBankMode && (!$ctrl.isVerified || !$ctrl.termsAccepted)"
-                             amount="$ctrl.mirror">
-            </w-balance-input>
-
-        </div>
-
-        <div class="like-input-error multiline "
-             ng-if="$ctrl.send.amount.$touched && $ctrl.send.amount.$invalid && $ctrl.focus !== 'amount'">
-            <div class="error">
-            <span ng-if="$ctrl.send.amount.$error.required"
-                  class="error-list-row"
-                  w-i18n="inputs.errors.required"></span>
-                <span ng-if="$ctrl.send.amount.$error.gt && $ctrl.tx.amount.getTokens().eq(0)"
-                      class="error-list-row"
-                      w-i18n="inputs.errors.required"></span>
-                <span ng-if="$ctrl.send.amount.$error.gt && $ctrl.tx.amount.getTokens().gt(0)"
-                      class="error-list-row"
-                      w-i18n="inputs.errors.gtGatewayMin"
-                      params="{min: $ctrl.minimumAmount, assetName: $ctrl.tx.amount.asset.displayName}"></span>
-                <span ng-if="$ctrl.send.amount.$error.precision"
-                      class="error-list-row"
-                      w-i18n="modal.send.errors.precision"
-                      params="{precision: $ctrl.state.moneyHash[$ctrl.state.assetId].asset.precision}"></span>
-                <span ng-if="$ctrl.send.amount.$error.lte && !$ctrl.tx.amount.getTokens().gte($ctrl.gatewayDetails.maximumAmount)"
-                      class="error-list-row"
-                      w-i18n="modal.send.errors.max"></span>
-                <span ng-if="$ctrl.send.amount.$error.lte && $ctrl.tx.amount.getTokens().gte($ctrl.gatewayDetails.maximumAmount)"
-                      params="{money: $ctrl.maxGatewayAmount}"
-                      class="error-list-row"
-                      w-i18n="modal.send.errors.maxCoinomat"></span>
-            </div>
-        </div>
-    </w-input-container>
-
-    <w-input-container ng-if="$ctrl.toBankMode && !$ctrl.isBankPendingOrError"
-                       class="margin-top-2">
-        <div class="body-2 margin-05">
-            <span w-i18n="modal.send.idNumberTitle"></span>
-            <w-help-icon>
-                <div w-i18n="modal.send.idNumber.helpIcon.title"
-                     class="help-icon__row headline-3"></div>
-                <div w-i18n="modal.send.idNumber.helpIcon.description"
-                     class="help-icon__row"></div>
-            </w-help-icon>
-        </div>
-        <w-input required
-                 w-validate
-                 ng-disabled="!$ctrl.termsAccepted"
-                 w-validator-pattern="\d*"
-                 ng-model="$ctrl.state.singleSend.attachment"
-                 name="id-number"
-                 type="text"></w-input>
-        <w-input-error name="idNumber" message="required">
-            <span w-i18n="inputs.errors.required"></span>
-        </w-input-error>
-    </w-input-container>
-
-    <div ng-if="!$ctrl.outerSendMode && !$ctrl.toBankMode && !$ctrl.hasOuterError"
-         class="margin-top-2">
-        <div class="body-2 margin-05" w-i18n="modal.send.description"></div>
-        <w-input-container>
-            <w-input textarea="true"
-                     name="attachment"
-                     ng-model="$ctrl.state.singleSend.attachment"
-                     w-i18n-attr="placeholder"
-                     w-validate
-                     w-validator-byte-lte="140"
-                     placeholder="modal.send.descriptionPlaceholder"></w-input>
-
-            <w-input-error message="byteLte">
-                <span w-i18n="modal.send.attachmentLength"></span>
-            </w-input-error>
-        </w-input-container>
-    </div>
-
-    <div class="fee margin-top-1 margin-1" ng-if="!$ctrl.hasOuterError && !$ctrl.isBankPending && $ctrl.isBankAccepted">
-        <w-fee-list tx="$ctrl.wavesTx"
-                    disabled="$ctrl.toBankMode && (!$ctrl.isVerified || !$ctrl.termsAccepted)"
-                    balance-hash="$ctrl.state.moneyHash"
-                    fee="$ctrl.tx.fee"></w-fee-list>
-    </div>
-
-    <div class="commission-error margin-top-1 margin-2 footnote error-500"
-         ng-if="!$ctrl.hasComission && !$ctrl.gatewayError">
-        <span w-i18n="modal.send.validationError.notEnoughFundsWithdraw"
-              ng-show="$ctrl.outerSendMode"
-              params="{
-                fee: $ctrl.state.singleSend.fee,
-                getawayFee: $ctrl.gatewayDetails.gatewayFee,
-                currency: $ctrl.state.moneyHash[$ctrl.state.assetId].asset.displayName,
-                minGatewayAmount: $ctrl.gatewayDetails.minimumAmount
-              }"></span>
-        <span w-i18n="modal.send.validationError.notEnoughFunds"
-              ng-hide="$ctrl.outerSendMode"
-              params="{fee: $ctrl.state.singleSend.fee}"></span>
-    </div>
-
-    <div ng-if="$ctrl.toBankMode && !$ctrl.isLira && $ctrl.isBankAccepted" class="margin-top-2">
-        <w-coinomat-terms force-show-terms="::false"
-                          terms-pending="$ctrl.termsIsPending"
-                          load-error="$ctrl.termsLoadError"
-                          show-accepted-checkbox="::false"
-                          is-verified="$ctrl.isVerified"
-                          terms-accepted="$ctrl.termsAccepted"
-                          on-sign-start="$ctrl.onSignCoinomatStart()"
-                          on-sign-end="$ctrl.onSignCoinomatEnd()"></w-coinomat-terms>
-    </div>
-
-    <div ng-if="$ctrl.toBankMode && $ctrl.isLira" class="margin-top-2">
-        <div class="plate-warning margin-2">
-            <div class="body-2 warning-500 margin-05" w-i18n="modal.receive.wtryPlate1Header"></div>
-            <div class="footnote-1 basic-500" w-i18n="modal.receive.wtryPlate1Text"></div>
-        </div>
-
-        <div class="row margin-3 caption-1 info-block">
-            <i class="icon-info"></i>
-            <div w-i18n="modal.receive.wtry.info"></div>
-        </div>
-    </div>
-
-    <div class="margin-top-3">
-        <a href="{{$ctrl.digiLiraUserLink}}"
-           target="_blank" rel="noopener noreferrer"
-           ng-if="$ctrl.toBankMode && $ctrl.isLira"
-           class="fake-button long margin-4">
-            <span class="fake-button-content big submit long" w-i18n="button.continue"></span>
-        </a>
+<w-gateway-send ng-if="$ctrl.sendMode === 'gateway'"
+                state="$ctrl.state"
+                on-continue="$ctrl.onContinue"
+                on-change-mode="$ctrl.onChangeMode(mode)">
+    <ng-transclude></ng-transclude>
+</w-gateway-send>
 
-        <w-sign-button
-                ng-if="!$ctrl.hasOuterError && !$ctrl.isBankPending && !($ctrl.toBankMode && $ctrl.isLira)"
-                on-click="$ctrl.createTx()"
-                on-success="$ctrl.onSignTx(signable)"
-                disabled="$ctrl.send.$invalid || (!$ctrl.send.$invalid && !$ctrl.hasComission) || ($ctrl.toBankMode && !$ctrl.termsAccepted)">
-            <span w-i18n="button.continue"></span>
-        </w-sign-button>
-    </div>
-</form>
+<w-bank-send ng-if="$ctrl.sendMode === 'bank'"
+             state="$ctrl.state">
+    <ng-transclude></ng-transclude>
+</w-bank-send>
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
new file mode 100644
index 0000000000..d1f8d2160a
--- /dev/null
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
@@ -0,0 +1,668 @@
+(function () {
+    'use strict';
+
+    const FIAT_ASSETS = {
+        [WavesApp.defaultAssets.USD]: true,
+        [WavesApp.defaultAssets.EUR]: true,
+        [WavesApp.defaultAssets.TRY]: true
+    };
+
+    const { BigNumber } = require('@waves/bignumber');
+    const ds = require('data-service');
+    const { SIGN_TYPE } = require('@waves/signature-adapter');
+    const analytics = require('@waves/event-sender');
+
+    const BANK_RECIPIENT = WavesApp.bankRecipient;
+    const MIN_TOKEN_COUNT = 100;
+    const MAX_TOKEN_COUNT = 50000;
+
+    /**
+     * @param {Base} Base
+     * @param {$rootScope.Scope} $scope
+     * @param {app.utils} utils
+     * @param {IPollCreate} createPoll
+     * @param {ConfigService} configService
+     * @param {IOuterBlockchains} outerBlockchains
+     * @param {User} user
+     * @param {GatewayService} gatewayService
+     * @param {Waves} waves
+     */
+    const controller = function (Base,
+                                 $scope,
+                                 utils,
+                                 createPoll,
+                                 waves,
+                                 configService,
+                                 outerBlockchains,
+                                 user,
+                                 gatewayService) {
+
+        class WavesSend extends Base {
+
+            /**
+             * @return {boolean}
+             */
+            get canSendToBank() {
+                return (FIAT_ASSETS[this.assetId] && !this.isLira) || false;
+            }
+
+            /**
+             * @return {boolean}
+             */
+            get isLira() {
+                return this.assetId === WavesApp.defaultAssets.TRY;
+            }
+
+            /**
+             * @return {ISingleSendTx}
+             */
+            get tx() {
+                return this.state.singleSend;
+            }
+
+            /**
+             * @return {string}
+             */
+            get assetId() {
+                return this.state.assetId;
+            }
+
+            set assetId(id) {
+                this.state.assetId = id;
+            }
+
+            /**
+             * @return {string}
+             */
+            get mirrorId() {
+                return this.state.mirrorId;
+            }
+
+            /**
+             * @return {Object<string, Money>}
+             */
+            get moneyHash() {
+                return this.state.moneyHash;
+            }
+
+            /**
+             * @return {Money}
+             */
+            get balance() {
+                return this.moneyHash[this.assetId];
+            }
+
+            /**
+             * @return {boolean}
+             */
+            get outerSendMode() {
+                return this.state.outerSendMode;
+            }
+
+            set outerSendMode(value) {
+                this.state.outerSendMode = value;
+            }
+
+            /**
+             * @return {string}
+             */
+            get paymentId() {
+                return this.state.paymentId;
+            }
+
+            set paymentId(value) {
+                this.state.paymentId = value;
+            }
+
+            /**
+             * @return {IGatewayDetails}
+             */
+            get gatewayDetails() {
+                return this.state.gatewayDetails;
+            }
+
+            set gatewayDetails(value) {
+                this.state.gatewayDetails = value;
+            }
+
+            get isBankPending() {
+                return this.toBankMode && this.termsIsPending;
+            }
+
+            get isBankError() {
+                return this.toBankMode && this.termsLoadError;
+            }
+
+            get isGatewayAccepted() {
+                return !configService
+                    .get('PERMISSIONS.CANT_TRANSFER_GATEWAY').includes(this.balance.asset.id);
+            }
+
+            get isBankAccepted() {
+                return this.toBankMode ? this.isGatewayAccepted : true;
+            }
+
+            get isBankPendingOrError() {
+                return this.isBankError || this.isBankPending;
+            }
+
+            get minimumAmount() {
+                return this.gatewayDetails &&
+                    this.gatewayDetails.minimumAmount ||
+                    this.toBankMode &&
+                    new BigNumber(MIN_TOKEN_COUNT);
+            }
+
+            get maximumAmount() {
+                return this.maxGatewayAmount || this.toBankMode && this.balance.cloneWithTokens(MAX_TOKEN_COUNT);
+            }
+
+            /**
+             * @type {string}
+             */
+            txType = WavesApp.TRANSACTION_TYPES.NODE.TRANSFER;
+
+            /**
+             * @type {boolean}
+             */
+            get toBankMode() {
+                return this.state.toBankMode;
+            }
+
+            set toBankMode(value) {
+                this.state.toBankMode = value;
+            }
+
+            /**
+             * @type {string}
+             */
+            digiLiraUserLink = 'https://www.digilira.com/';
+            /**
+             * @type {Function}
+             */
+            onContinue = null;
+            /**
+             * @type {Function}
+             */
+            onChangeMode = null;
+            /**
+             * @type {string}
+             */
+            focus = null;
+            /**
+             * @type {Money}
+             */
+            mirror = null;
+            /**
+             * @type {boolean}
+             */
+            noMirror = false;
+            /**
+             * @type {boolean}
+             */
+            hasFee = true;
+            /**
+             * @type {Array}
+             */
+            feeList = null;
+            /**
+             * @type {Money}
+             */
+            minAmount = null;
+            /**
+             * @type {Money}
+             */
+            maxAmount = null;
+            /**
+             * @type {ISendState}
+             */
+            state = Object.create(null);
+            /**
+             * @type {Money}
+             */
+            maxGatewayAmount = null;
+            /**
+             * @type {boolean}
+             */
+            gatewayDetailsError = false;
+            /**
+             * @type {boolean}
+             */
+            gatewayAddressError = false;
+            /**
+             * @type {boolean}
+             */
+            gatewayWrongAddress = false;
+            /**
+             * @type {boolean}
+             */
+            gatewayError = false;
+            /**
+             * @type {boolean}
+             */
+            termsIsPending = true;
+            /**
+             * @type {boolean}
+             */
+            termsLoadError = false;
+            /**
+             * @type {boolean}
+             */
+            signInProgress = false;
+            /**
+             * @type {ISingleSendTx}
+             */
+            wavesTx = {
+                type: SIGN_TYPE.TRANSFER,
+                amount: null,
+                attachment: '',
+                fee: null,
+                recipient: '',
+                assetId: ''
+            };
+
+            constructor() {
+                gatewayService.getFiats();
+                super();
+            }
+
+            $postLink() {
+                this.receive(utils.observe(this.tx, 'recipient'), this._onUpdateRecipient, this);
+                const onHasMoneyHash = () => {
+                    // this.receive(utils.observe(this.state, 'toBankMode'), this._onChangeBankMode, this);
+                    // this.observe('gatewayDetails', this._checkFee);
+                    this.receive(utils.observe(this.tx, 'fee'), this._onUpdateFee, this);
+                    this.tx.amount = this.tx.amount || this.moneyHash[this.assetId].cloneWithTokens('0');
+                    // this._fillMirror();
+
+                    // 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._updateGatewayDetails, this);
+                    // this.receive(utils.observe(this.tx, 'recipient'), this._updateGatewayDetails, this);
+
+                    // this.receive(utils.observe(this.state, 'paymentId'), this._updateGatewayPermisson, this);
+                    // this.receive(utils.observe(this.tx, 'recipient'), this._updateGatewayPermisson, this);
+
+                    this.receive(utils.observe(this.tx, 'amount'), this._onChangeAmount, this);
+                    this.observe('mirror', this._onChangeAmountMirror);
+
+                    // this.observe('gatewayDetails', this._updateWavesTxObject);
+                    // 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.observe('mirror', this._onChangeAmountMirror);
+                    // this.observe(['gatewayAddressError', 'gatewayDetailsError', 'gatewayWrongAddress'],
+                    //     this._updateGatewayError);
+
+                    this._onUpdateFee();
+                    this._setMinAndMaxAmount();
+                    this._onChangeBaseAssets();
+                    // this._updateGatewayDetails();
+                    // this._updateGatewayPermisson();
+                };
+
+                if (!this.state.moneyHash) {
+                    this.receiveOnce(utils.observe(this.state, 'moneyHash'), onHasMoneyHash);
+                } else {
+                    onHasMoneyHash();
+                }
+
+                this.receive(utils.observe(this.state, 'moneyHash'), () => {
+                    this._onUpdateFee();
+                    this._setMinAndMaxAmount();
+                    this._onChangeBaseAssets();
+                    // this._updateGatewayDetails();
+                });
+
+                this._onChangeBaseAssets();
+                this._updateWavesTxObject();
+            }
+
+            setSendMode(mode) {
+                this.onChangeMode({ mode });
+            }
+
+            onSignCoinomatStart() {
+                this.signInProgress = true;
+            }
+
+            onSignCoinomatEnd() {
+                this.signInProgress = false;
+            }
+
+            createTx() {
+                const toGateway = this.outerSendMode && this.gatewayDetails;
+                const fee = toGateway ? this.tx.amount.cloneWithTokens(toGateway.gatewayFee) : null;
+                const attachmentString = this.tx.attachment ? this.tx.attachment.toString() : '';
+                const tx = waves.node.transactions.createTransaction({
+                    ...this.tx,
+                    recipient: toGateway ? this.gatewayDetails.address : this.tx.recipient,
+                    attachment: utils.stringToBytes(toGateway ? this.gatewayDetails.attachment : attachmentString),
+                    amount: toGateway ? this.tx.amount.add(fee) : this.tx.amount
+                });
+
+                const signable = ds.signature.getSignatureApi().makeSignable({
+                    type: tx.type,
+                    data: tx
+                });
+
+                return signable;
+            }
+
+            onSignTx(signable) {
+                analytics.send({ name: 'Transfer Continue Click', target: 'ui' });
+                this.onContinue({ signable });
+            }
+
+            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.moneyHash[this.assetId].cloneWithTokens('0');
+                }
+
+                waves.utils.getRate(this.assetId, this.mirrorId).then(rate => {
+                    this.mirror = amount.convertTo(this.moneyHash[this.mirrorId].asset, rate);
+                    this.tx.amount = amount;
+                    $scope.$apply();
+                });
+            }
+
+            onBlurMirror() {
+                if (!this.mirror) {
+                    this._fillMirror();
+                }
+                this.focus = '';
+            }
+
+            /**
+             * @param {string} url
+             * @return {null}
+             */
+            onReadQrCode(url) {
+                if (!url.includes('https://')) {
+                    this.tx.recipient = url;
+                    $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.moneyHash[this.assetId].cloneWithTokens(result.amount);
+                            this._fillMirror();
+                        }
+                        $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();
+                    }
+                }
+            }
+
+            /**
+             * @return {boolean}
+             */
+            isMoneroNotIntegratedAddress() {
+                const moneroAddressLength = 95;
+                const assetIsMonero = this.state.assetId === WavesApp.defaultAssets.XMR;
+                return assetIsMonero && this.tx.recipient.length === moneroAddressLength;
+            }
+
+            getGatewayDetails() {
+                this._onChangeAssetId();
+            }
+
+            /**
+             * @private
+             */
+            _updateWavesTxObject() {
+                const toGateway = this.outerSendMode && this.gatewayDetails;
+                const fee = toGateway ? this.tx.amount.cloneWithTokens(toGateway.gatewayFee) : null;
+                const attachmentString = this.tx.attachment ? this.tx.attachment.toString() : '';
+                const isWavesAddress = user.isValidAddress(this.tx.recipient);
+                this.wavesTx = {
+                    ...this.wavesTx,
+                    recipient: toGateway ? this.gatewayDetails.address : isWavesAddress && this.tx.recipient || '',
+                    attachment: utils.stringToBytes(toGateway ? this.gatewayDetails.attachment : attachmentString),
+                    amount: toGateway ? this.tx.amount.add(fee) : this.tx.amount,
+                    assetId: this.assetId
+                };
+            }
+
+            /**
+             * @private
+             */
+            _validateForm() {
+                if (this.tx.amount.getTokens().gt(0) || this.tx.recipient) {
+                    this.wavesSend.$setDirty(true);
+                    this.wavesSend.$setSubmitted(true);
+                }
+            }
+
+            /**
+             * @private
+             */
+            _onChangeBankMode() {
+                if (this.toBankMode && !this.isLira) {
+                    this.tx.recipient = BANK_RECIPIENT;
+                    this.termsIsPending = true;
+                } else {
+                    this.tx.recipient = '';
+                    this.termsIsPending = false;
+                }
+
+                this._updateGatewayPermisson();
+            }
+
+            /**
+             * @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
+             */
+            _onChangeAssetId() {
+                if (!this.assetId) {
+                    throw new Error('Has no asset id!');
+                }
+
+                this._onChangeBaseAssets();
+
+                if (!this.moneyHash[this.assetId]) {
+                    return null;
+                }
+
+                this.tx.amount = this.moneyHash[this.assetId].cloneWithTokens('0');
+                this.mirror = this.moneyHash[this.mirrorId].cloneWithTokens('0');
+                this._updateGatewayPermisson();
+            }
+
+            /**
+             * @private
+             */
+            _onUpdateFee() {
+                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
+             */
+            _onChangeBaseAssets() {
+                if (this.assetId === this.mirrorId) {
+                    this.noMirror = true;
+                } else {
+                    waves.utils.getRate(this.assetId, this.mirrorId).then((rate) => {
+                        this.noMirror = rate.eq(0);
+                    });
+                }
+            }
+
+            _setMinAndMaxAmount() {
+                this.minAmount = this.state.moneyHash[this.state.assetId].cloneWithTokens('0');
+                this.maxAmount = this.moneyHash[this.assetId];
+            }
+
+            /**
+             * @private
+             */
+            _onChangeAmount() {
+                if (!this.noMirror && this.focus === 'amount') {
+                    this._fillMirror();
+                }
+
+            }
+
+            /**
+             * @private
+             */
+            _onChangeAmountMirror() {
+                if (this.focus === 'mirror') {
+                    this._fillAmount();
+                }
+            }
+
+            /**
+             * @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);
+                });
+            }
+
+            /**
+             * @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.moneyHash[this.assetId].asset, rate);
+                });
+            }
+
+            /**
+             * @private
+             */
+            _onUpdateRecipient() {
+                this._validateForm();
+            }
+
+            /**
+             * @private
+             */
+            _updateGatewayPermisson() {
+                this.gatewayDetailsError = this.outerSendMode ? !this.isGatewayAccepted : this.gatewayDetailsError;
+            }
+
+            /**
+             * @private
+             */
+            _updateGatewayError() {
+                this.gatewayError = this.gatewayAddressError || this.gatewayDetailsError || this.gatewayWrongAddress;
+            }
+
+        }
+
+        return new WavesSend();
+    };
+
+    controller.$inject = [
+        'Base',
+        '$scope',
+        'utils',
+        'createPoll',
+        'waves',
+        'configService',
+        'outerBlockchains',
+        'user',
+        'gatewayService'
+    ];
+
+    angular.module('app.ui').component('wWavesSend', {
+        bindings: {
+            state: '<',
+            onContinue: '&',
+            onChangeMode: '&'
+        },
+        templateUrl: 'modules/utils/modals/sendAsset/components/singleSend/wavesSend/waves-send.html',
+        transclude: true,
+        controller
+    });
+})();
+
+/**
+ * @typedef {object} ISendTx
+ * @property {Money} fee
+ * @property {Money} amount
+ * @property {string} recipient
+ * @property {string} attachment
+ */
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
new file mode 100644
index 0000000000..880a85252a
--- /dev/null
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/waves-send.html
@@ -0,0 +1,128 @@
+<form class="send-form"
+      name="$ctrl.wavesSend"
+      novalidate>
+
+    <ng-transclude></ng-transclude>
+
+    <div class="row margin-top-2">
+        <div class="flex-row-title">
+            <div class="body-2 margin-05" w-i18n="modal.send.recipient"></div>
+            <div ng-if="$ctrl.canSendToBank"
+                 class="toggle-mode-container">
+                <span class="link"
+                      ng-click="$ctrl.setSendMode('bank')"
+                      w-i18n="modal.send.toBank"></span>
+            </div>
+        </div>
+
+        <w-input-container>
+            <div class="read-address-wrap">
+                <w-input type="text"
+                         name="recipient"
+                         ng-model="$ctrl.state.singleSend.recipient"
+                         placeholder="modal.send.placeholderRecipient"
+                         w-i18n-attr="placeholder"
+                         w-validate
+                         w-validator-any-address="{{$ctrl.state.assetId}}"
+                         required></w-input>
+
+                <w-qr-code-read on-read="$ctrl.onReadQrCode(text)" max-width="415" max-height="310"></w-qr-code-read>
+            </div>
+
+            <w-input-error message="anyAddress">
+                <span w-i18n="modal.send.errors.address"></span>
+            </w-input-error>
+            <w-input-error message="required">
+                <span w-i18n="modal.send.errors.required"></span>
+            </w-input-error>
+        </w-input-container>
+    </div>
+
+    <w-input-container class="margin-top-2">
+        <div class="body-2 margin-05" w-i18n="modal.send.amount"></div>
+        <div class="amount-wrap" ng-class="{'no-mirror': $ctrl.noMirror}">
+
+            <w-balance-input name="amount"
+                             input-classes="big"
+                             asset-id="$ctrl.state.assetId"
+                             max-balance="$ctrl.maxAmount"
+                             fee="$ctrl.feeList"
+                             min="$ctrl.minAmount"
+                             on-focus="$ctrl.focus = 'amount'"
+                             on-blur="$ctrl.focus = ''"
+                             amount="$ctrl.state.singleSend.amount">
+            </w-balance-input>
+            <div class="amount-modal-icon"></div>
+            <w-balance-input name="amountMirror"
+                             ng-if="!$ctrl.noMirror"
+                             input-classes="big"
+                             asset-id="$ctrl.mirrorId"
+                             on-focus="$ctrl.focus = 'mirror'"
+                             on-blur="$ctrl.onBlurMirror()"
+                             fill-max="$ctrl.fillMax()"
+                             fee="$ctrl.tx.fee"
+                             amount="$ctrl.mirror">
+            </w-balance-input>
+
+        </div>
+
+        <div class="like-input-error multiline"
+             ng-if="$ctrl.wavesSend.amount.$touched && $ctrl.wavesSend.amount.$invalid && $ctrl.focus !== 'amount'">
+            <div class="error">
+                <span ng-if="$ctrl.wavesSend.amount.$error.required"
+                      class="error-list-row"
+                      w-i18n="inputs.errors.required"></span>
+                <span ng-if="$ctrl.wavesSend.amount.$error.gt && $ctrl.tx.amount.getTokens().eq(0)"
+                      class="error-list-row"
+                      w-i18n="inputs.errors.required"></span>
+                <span ng-if="$ctrl.wavesSend.amount.$error.precision"
+                      class="error-list-row"
+                      w-i18n="modal.send.errors.precision"
+                      params="{precision: $ctrl.state.moneyHash[$ctrl.state.assetId].asset.precision}"></span>
+                <span ng-if="$ctrl.wavesSend.amount.$error.lte"
+                      class="error-list-row"
+                      w-i18n="modal.send.errors.max"></span>
+            </div>
+        </div>
+    </w-input-container>
+
+    <div class="margin-top-2">
+        <div class="body-2 margin-05" w-i18n="modal.send.description"></div>
+        <w-input-container>
+            <w-input textarea="true"
+                     name="attachment"
+                     ng-model="$ctrl.state.singleSend.attachment"
+                     w-i18n-attr="placeholder"
+                     w-validate
+                     w-validator-byte-lte="140"
+                     placeholder="modal.send.descriptionPlaceholder">
+            </w-input>
+
+            <w-input-error message="byteLte">
+                <span w-i18n="modal.send.attachmentLength"></span>
+            </w-input-error>
+        </w-input-container>
+    </div>
+
+    <div class="fee margin-top-1 margin-1">
+        <w-fee-list tx="$ctrl.wavesTx"
+                    balance-hash="$ctrl.state.moneyHash"
+                    fee="$ctrl.tx.fee">
+        </w-fee-list>
+    </div>
+
+    <div class="commission-error margin-top-1 margin-2 footnote error-500" ng-if="!$ctrl.hasFee">
+        <span w-i18n="modal.send.validationError.notEnoughFunds"
+              params="{ fee: $ctrl.state.singleSend.fee }"></span>
+    </div>
+
+    <div class="margin-top-3">
+        <w-sign-button
+                ng-if="!$ctrl.hasOuterError && !$ctrl.isBankPending && !($ctrl.toBankMode && $ctrl.isLira)"
+                on-click="$ctrl.createTx()"
+                on-success="$ctrl.onSignTx(signable)"
+                disabled="$ctrl.wavesSend.$invalid || !$ctrl.hasFee">
+            <span w-i18n="button.continue"></span>
+        </w-sign-button>
+    </div>
+</form>

From f21b4c5a1a43645ec84ed09dfc4b3352dacd15cf Mon Sep 17 00:00:00 2001
From: okanishcheva <okanishcheva@wavesplatform.com>
Date: Tue, 20 Aug 2019 18:46:21 +0300
Subject: [PATCH 02/18] DEXW-1239: save

---
 .../components/singleSend/SingleSend.js       |  12 +-
 .../singleSend/gatewaySend/GatewaySend.js     | 671 ++++++------------
 .../singleSend/gatewaySend/gateway-send.html  | 184 +++++
 .../components/singleSend/single-send.html    |   7 +-
 .../singleSend/wavesSend/WavesSend.js         | 305 ++------
 .../singleSend/wavesSend/waves-send.html      |  23 +-
 6 files changed, 464 insertions(+), 738 deletions(-)

diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js
index a1a2d3e110..d59babc41b 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js
@@ -10,14 +10,14 @@
              */
             sendMode = 'waves';
 
-            constructor() {
-                this.test = 0;
-            }
-
             onChangeMode(mode) {
                 this.sendMode = mode;
             }
 
+            onSign(signable) {
+                this.onContinue({ signable });
+            }
+
         }
 
         return new SingleSend();
@@ -35,7 +35,3 @@
         controller
     });
 })();
-
-/**
- * @typedef {string} ISendMode = waves | bank | gateway
- */
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
index b08d2ee1e8..ea7f286067 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
@@ -1,59 +1,23 @@
 (function () {
     'use strict';
 
-    const FIAT_ASSETS = {
-        [WavesApp.defaultAssets.USD]: true,
-        [WavesApp.defaultAssets.EUR]: true,
-        [WavesApp.defaultAssets.TRY]: true
-    };
-
+    const { SIGN_TYPE } = require('@waves/signature-adapter');
     const { Money } = require('@waves/data-entities');
     const { BigNumber } = require('@waves/bignumber');
-    const ds = require('data-service');
-    const { SIGN_TYPE } = require('@waves/signature-adapter');
-    const analytics = require('@waves/event-sender');
-
-    const BANK_RECIPIENT = WavesApp.bankRecipient;
-    const MIN_TOKEN_COUNT = 100;
-    const MAX_TOKEN_COUNT = 50000;
 
     /**
      * @param {Base} Base
      * @param {$rootScope.Scope} $scope
      * @param {app.utils} utils
-     * @param {IPollCreate} createPoll
-     * @param {ConfigService} configService
-     * @param {IOuterBlockchains} outerBlockchains
      * @param {User} user
-     * @param {GatewayService} gatewayService
      * @param {Waves} waves
+     * @param {IOuterBlockchains} outerBlockchains
+     * @param {GatewayService} gatewayService
      */
-    const controller = function (Base,
-                                 $scope,
-                                 utils,
-                                 createPoll,
-                                 waves,
-                                 configService,
-                                 outerBlockchains,
-                                 user,
-                                 gatewayService) {
+    const controller = function (Base, $scope, utils, user, waves, outerBlockchains, gatewayService) {
 
         class GatewaySend extends Base {
 
-            /**
-             * @return {boolean}
-             */
-            get hasSendToBank() {
-                return FIAT_ASSETS[this.assetId] || false;
-            }
-
-            /**
-             * @return {boolean}
-             */
-            get isLira() {
-                return this.assetId === WavesApp.defaultAssets.TRY;
-            }
-
             /**
              * @return {ISingleSendTx}
              */
@@ -68,10 +32,6 @@
                 return this.state.assetId;
             }
 
-            set assetId(id) {
-                this.state.assetId = id;
-            }
-
             /**
              * @return {string}
              */
@@ -86,13 +46,6 @@
                 return this.state.moneyHash;
             }
 
-            /**
-             * @return {Object.<string, Money>}
-             */
-            get feeHash() {
-                return utils.groupMoney(this.feeList || []);
-            }
-
             /**
              * @return {Money}
              */
@@ -100,17 +53,6 @@
                 return this.moneyHash[this.assetId];
             }
 
-            /**
-             * @return {boolean}
-             */
-            get outerSendMode() {
-                return this.state.outerSendMode;
-            }
-
-            set outerSendMode(value) {
-                this.state.outerSendMode = value;
-            }
-
             /**
              * @return {string}
              */
@@ -118,117 +60,33 @@
                 return this.state.paymentId;
             }
 
-            set paymentId(value) {
-                this.state.paymentId = value;
-            }
-
-            /**
-             * @return {IGatewayDetails}
-             */
-            get gatewayDetails() {
-                return this.state.gatewayDetails;
-            }
-
-            set gatewayDetails(value) {
-                this.state.gatewayDetails = value;
-            }
-
-            get isBankPending() {
-                return this.toBankMode && this.termsIsPending;
-            }
-
-            get isBankError() {
-                return this.toBankMode && this.termsLoadError;
-            }
-
-            get isGatewayAccepted() {
-                return !configService
-                    .get('PERMISSIONS.CANT_TRANSFER_GATEWAY').includes(this.balance.asset.id);
-            }
-
-            get isBankAccepted() {
-                return this.toBankMode ? this.isGatewayAccepted : true;
-            }
-
-            get isBankPendingOrError() {
-                return this.isBankError || this.isBankPending;
-            }
-
-            get hasOuterError() {
-                return this.outerSendMode && this.gatewayError || this.isBankError;
-            }
-
-            get minimumAmount() {
-                return this.gatewayDetails &&
-                    this.gatewayDetails.minimumAmount ||
-                    this.toBankMode &&
-                    new BigNumber(MIN_TOKEN_COUNT);
-            }
-
-            get maximumAmount() {
-                return this.maxGatewayAmount || this.toBankMode && this.balance.cloneWithTokens(MAX_TOKEN_COUNT);
-            }
-
-            /**
-             * @type {string}
-             */
-            txType = WavesApp.TRANSACTION_TYPES.NODE.TRANSFER;
-
-            /**
-             * @type {boolean}
-             */
-            get toBankMode() {
-                return this.state.toBankMode;
-            }
-
-            set toBankMode(value) {
-                this.state.toBankMode = value;
-            }
-
-            /**
-             * @type {string}
-             */
-            digiLiraUserLink = 'https://www.digilira.com/';
             /**
              * @type {Function}
              */
-            onContinue = null;
+            onSign = null;
             /**
-             * @type {string}
+             * @type {Function}
              */
-            focus = null;
+            onChangeMode = null;
             /**
-             * @type {Money}
+             * @type {ISingleSendTx}
              */
-            mirror = null;
+            wavesTx = {
+                type: SIGN_TYPE.TRANSFER,
+                amount: null,
+                attachment: '',
+                fee: null,
+                recipient: '',
+                assetId: ''
+            };
             /**
-             * @type {boolean}
+             * @type {IGatewayDetails}
              */
-            noMirror = false;
+            gatewayDetails = null;
             /**
              * @type {boolean}
              */
-            hasComission = true;
-            /**
-             * @type {Array}
-             */
-            feeList = null;
-            /**
-             * @type {Money}
-             */
-            minAmount = null;
-            /**
-             * @type {Money}
-             */
-            maxAmount = null;
-            /**
-             * @type {ISendState}
-             */
-            state = Object.create(null);
-            /**
-             * @type {Money}
-             */
-            maxGatewayAmount = null;
+            gatewayError = false;
             /**
              * @type {boolean}
              */
@@ -242,152 +100,75 @@
              */
             gatewayWrongAddress = false;
             /**
-             * @type {boolean}
+             * @type {Money | null}
              */
-            gatewayError = false;
+            mirror = null;
             /**
-             * @type {boolean}
+             * @type {string}
              */
-            termsIsPending = true;
+            focus = '';
             /**
              * @type {boolean}
              */
-            termsLoadError = false;
+            hasFee = true;
             /**
-             * @type {boolean}
+             * @type {Array}
              */
-            signInProgress = false;
+            feeList = [];
             /**
-             * @type {ISingleSendTx}
+             * @type {Money}
              */
-            wavesTx = {
-                type: SIGN_TYPE.TRANSFER,
-                amount: null,
-                attachment: '',
-                fee: null,
-                recipient: '',
-                assetId: ''
-            };
+            minAmount = null;
             /**
-             * @type {boolean}
-             * @private
+             * @type {Money}
              */
-            _noCurrentRate = false;
-
-            constructor() {
-                super();
-
-                $scope.WavesApp = WavesApp;
-            }
+            maxAmount = null;
+            /**
+             * @type {Money}
+             */
+            maxGatewayAmount = null;
 
             $postLink() {
-                this.receive(utils.observe(this.tx, 'fee'), this._currentHasCommission, this);
+                this.receive(utils.observe(this.tx, 'recipient'), this._onUpdateRecipient, this);
+                this.observe(['gatewayAddressError', 'gatewayDetailsError', 'gatewayWrongAddress'],
+                    this._updateGatewayError);
+
                 const onHasMoneyHash = () => {
-                    this.receive(utils.observe(this.state, 'toBankMode'), this._onChangeBankMode, this);
-                    this.observe('gatewayDetails', this._currentHasCommission);
 
-                    this.minAmount = this.state.moneyHash[this.state.assetId].cloneWithTokens('0');
-                    this.tx.amount = this.tx.amount || this.moneyHash[this.assetId].cloneWithTokens('0');
-                    this._fillMirror();
+                    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._updateGatewayDetails, this);
-                    this.receive(utils.observe(this.tx, 'recipient'), this._updateGatewayDetails, this);
-
-                    this.receive(utils.observe(this.state, 'paymentId'), this._updateGatewayPermisson, this);
-                    this.receive(utils.observe(this.tx, 'recipient'), this._updateGatewayPermisson, this);
-
-                    this.receive(utils.observe(this.tx, 'amount'), this._onChangeAmount, this);
+                    this.observe('mirror', this._onChangeAmountMirror);
+                    this.observe('gatewayDetails', this._onChangeGatewayDetails);
 
-                    this.observe('gatewayDetails', this._updateWavesTxObject);
                     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.observe('mirror', this._onChangeAmountMirror);
-                    this.observe(['gatewayAddressError', 'gatewayDetailsError', 'gatewayWrongAddress'],
-                        this._updateGatewayError);
-
-                    this._currentHasCommission();
-                    this._onChangeBaseAssets();
-                    this._updateGatewayDetails();
-                    this._updateGatewayPermisson();
+                    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._currentHasCommission();
-                    this._onChangeBaseAssets();
-                    this._updateGatewayDetails();
-                });
-                this._onChangeBaseAssets();
-                this._updateWavesTxObject();
-            }
-
-            onSignCoinomatStart() {
-                this.signInProgress = true;
-            }
-
-            onSignCoinomatEnd() {
-                this.signInProgress = false;
-            }
 
-            createTx() {
-                const toGateway = this.outerSendMode && this.gatewayDetails;
-                const fee = toGateway ? this.tx.amount.cloneWithTokens(toGateway.gatewayFee) : null;
-                const attachmentString = this.tx.attachment ? this.tx.attachment.toString() : '';
-                const tx = waves.node.transactions.createTransaction({
-                    ...this.tx,
-                    recipient: toGateway ? this.gatewayDetails.address : this.tx.recipient,
-                    attachment: utils.stringToBytes(toGateway ? this.gatewayDetails.attachment : attachmentString),
-                    amount: toGateway ? this.tx.amount.add(fee) : this.tx.amount
-                });
-
-                const signable = ds.signature.getSignatureApi().makeSignable({
-                    type: tx.type,
-                    data: tx
+                this.receive(utils.observe(this.state, 'moneyHash'), () => {
+                    this._onChangeFee();
                 });
 
-                return signable;
-            }
-
-            onSignTx(signable) {
-                analytics.send({ name: 'Transfer Continue Click', target: 'ui' });
-                this.onContinue({ signable });
+                this._updateGatewayDetails()
+                    .then(() => {
+                        this._validateForm();
+                    });
             }
 
-            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.moneyHash[this.assetId].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;
-                    $scope.$apply();
-                });
-            }
-
-            onBlurMirror() {
-                if (!this.mirror) {
-                    this._fillMirror();
-                }
-                this.focus = '';
+            setSendMode(mode) {
+                this.onChangeMode({ mode });
             }
 
             /**
@@ -401,19 +182,16 @@
                     return null;
                 }
 
-                const routeData = utils.getRouterParams(utils.getUrlForRoute(url));
+                const routerData = utils.getRouterParams(utils.getUrlForRoute(url));
 
-                if (!routeData || routeData.name !== 'SEND_ASSET') {
+                if (!routerData || routerData.name !== 'SEND_ASSET') {
                     return null;
                 }
 
-                const result = routeData.data;
+                const result = routerData.data;
 
                 this.tx.recipient = result.recipient;
 
-                // analytics.push('Send', `Send.QrCodeRead.${WavesApp.type}`,
-                // `Send.QrCodeRead.${WavesApp.type}.Success`);
-
                 if (result) {
 
                     const applyAmount = () => {
@@ -451,73 +229,131 @@
              */
             isMoneroNotIntegratedAddress() {
                 const moneroAddressLength = 95;
-                const assetIsMonero = this.state.assetId === WavesApp.defaultAssets.XMR;
+                const assetIsMonero = this.assetId === WavesApp.defaultAssets.XMR;
                 return assetIsMonero && this.tx.recipient.length === moneroAddressLength;
             }
 
-            getGatewayDetails() {
-                this._onChangeAssetId();
+            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.mirror = amount.convertTo(this.moneyHash[this.mirrorId].asset, rate);
+                    this.tx.amount = amount;
+                    $scope.$apply();
+                });
+            }
+
+            onBlurMirror() {
+                if (!this.mirror) {
+                    this._fillMirror();
+                }
+                this.focus = '';
+            }
+
+            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;
+            }
+
+            onSignTx(signable) {
+                analytics.send({ name: 'Transfer Continue Click', target: 'ui' });
+                this.onSign({ signable });
             }
 
             /**
              * @private
              */
-            _updateWavesTxObject() {
-                const toGateway = this.outerSendMode && this.gatewayDetails;
-                const fee = toGateway ? this.tx.amount.cloneWithTokens(toGateway.gatewayFee) : null;
-                const attachmentString = this.tx.attachment ? this.tx.attachment.toString() : '';
-                const isWavesAddress = user.isValidAddress(this.tx.recipient);
-                this.wavesTx = {
-                    ...this.wavesTx,
-                    recipient: toGateway ? this.gatewayDetails.address : isWavesAddress && this.tx.recipient || '',
-                    attachment: utils.stringToBytes(toGateway ? this.gatewayDetails.attachment : attachmentString),
-                    amount: toGateway ? this.tx.amount.add(fee) : this.tx.amount,
-                    assetId: this.assetId
-                };
+            _updateGatewayDetails() {
+                if (this.gatewayError) {
+                    this.gatewayError = false;
+                }
+                if (this.gatewayDetailsError) {
+                    this.outerSendMode = false;
+                    this.gatewayDetailsError = false;
+                }
+
+                if (this.gatewayAddressError) {
+                    this.gatewayAddressError = false;
+                }
+
+                if (this.gatewayWrongAddress) {
+                    this.gatewayWrongAddress = false;
+                }
+
+                return gatewayService.getWithdrawDetails(this.balance.asset, this.tx.recipient, this.paymentId)
+                    .then(details => {
+                        const max = BigNumber.min(
+                            details.maximumAmount.add(details.gatewayFee),
+                            this.balance.getTokens()
+                        );
+
+                        this.gatewayDetails = details;
+                        this.minAmount = this.balance.cloneWithTokens(details.minimumAmount);
+                        this.maxAmount = this.balance.cloneWithTokens(max);
+                        this.maxGatewayAmount = Money.fromTokens(details.maximumAmount, this.balance.asset);
+                        $scope.$apply();
+                    }, e => {
+                        this.gatewayDetails = null;
+                        if (e.message === gatewayService.getAddressErrorMessage(this.balance.asset,
+                            this.tx.recipient, 'errorAddressMessage')) {
+                            this.gatewayAddressError = true;
+                        } else if (e.message === gatewayService.getWrongAddressMessage(this.balance.asset,
+                            this.tx.recipient, 'wrongAddressMessage')) {
+                            this.gatewayWrongAddress = true;
+                        } else {
+                            this.gatewayDetailsError = true;
+                        }
+                        $scope.$apply();
+                    });
             }
 
             /**
              * @private
              */
-            _validateForm() {
-                if (this.tx.amount.getTokens().gt(0) || this.tx.recipient) {
-                    this.send.$setDirty(true);
-                    this.send.$setSubmitted(true);
-                }
+            _onUpdateRecipient() {
+                this._checkOuterBlockchains();
             }
 
             /**
              * @private
              */
-            _onChangeBankMode() {
-                if (this.toBankMode && !this.isLira) {
-                    this.tx.recipient = BANK_RECIPIENT;
-                    this.termsIsPending = true;
-                } else {
-                    this.tx.recipient = '';
-                    this.termsIsPending = false;
+            _checkOuterBlockchains() {
+                const outerChain = outerBlockchains[this.assetId];
+                const isValidWavesAddress = user.isValidAddress(this.tx.recipient);
+                const gatewayAddress = !isValidWavesAddress &&
+                    outerChain && outerChain.isValidAddress(this.tx.recipient);
+                if (!gatewayAddress) {
+                    this.setSendMode('waves');
                 }
-
-                this._setMinAmount();
-                this._updateGatewayPermisson();
             }
 
             /**
              * @private
              */
-            _setMinAmount() {
-                if (this.toBankMode && !this.isLira) {
-                    const maxCoinomatAmount = this.balance.cloneWithTokens(50000);
-                    const minCoinomatAmount = this.balance.cloneWithTokens(100);
-
-                    this.maxAmount = Money.min(maxCoinomatAmount, this.balance);
-                    this.minAmount = minCoinomatAmount;
-                } else {
-                    this.minAmount = this.state.moneyHash[this.assetId].cloneWithTokens('0');
-                    this.maxAmount = this.moneyHash[this.assetId];
-                }
-
-                this._validateForm();
+            _updateGatewayError() {
+                this.gatewayError = this.gatewayAddressError || this.gatewayDetailsError || this.gatewayWrongAddress;
             }
 
             /**
@@ -528,13 +364,11 @@
                     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.mirror = this.balance.cloneWithTokens('0');
                 this._onChangeAmount();
             }
 
@@ -546,94 +380,34 @@
                     throw new Error('Has no asset id!');
                 }
 
-                this._onChangeBaseAssets();
-
-                if (!this.moneyHash[this.assetId]) {
+                if (!this.balance) {
                     return null;
                 }
 
-                this.tx.amount = this.moneyHash[this.assetId].cloneWithTokens('0');
+                this.tx.amount = this.balance.cloneWithTokens('0');
                 this.mirror = this.moneyHash[this.mirrorId].cloneWithTokens('0');
-                this._updateGatewayDetails();
-                this._updateGatewayPermisson();
-            }
-
-            /**
-             * @private
-             */
-            _currentHasCommission() {
-                if (!this.moneyHash) {
-                    return null;
-                }
-
-                const details = this.gatewayDetails;
-
-                const check = (feeList) => {
-                    const feeHash = utils.groupMoney(feeList);
-                    const balanceHash = this.moneyHash;
-
-                    this.hasComission = 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)));
-                } else {
-                    this.feeList = [this.tx.fee];
-                    check(this.feeList);
-                }
-            }
-
-            /**
-             * @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
              */
             _onChangeAmount() {
-                if (!this._noCurrentRate && !this.noMirror && this.focus === 'amount') {
+                if (this.focus === 'amount') {
                     this._fillMirror();
                 }
-
-            }
-
-            /**
-             * @private
-             */
-            _onChangeAmountMirror() {
-                if (!this._noCurrentRate && this.focus === 'mirror') {
-                    this._fillAmount();
-                }
             }
 
             /**
              * @private
              */
             _fillMirror() {
-
                 if (!this.tx.amount) {
                     this.mirror = null;
-                    setTimeout(() => $scope.$digest(), 0);
-                    return null;
+                    return;
                 }
 
-                waves.utils.getRate(this.assetId, this.mirrorId).then((rate) => {
+                waves.utils.getRate(this.assetId, this.mirrorId).then(rate => {
                     this.mirror = this.tx.amount.convertTo(this.moneyHash[this.mirrorId].asset, rate);
-                    $scope.$digest();
                 });
             }
 
@@ -641,94 +415,80 @@
              * @private
              */
             _fillAmount() {
-
                 if (!this.mirror) {
                     this.tx.amount = null;
-                    setTimeout(() => $scope.$digest(), 0);
                     return null;
                 }
 
-                waves.utils.getRate(this.mirrorId, this.assetId).then((rate) => {
+                waves.utils.getRate(this.mirrorId, this.assetId).then(rate => {
                     this.tx.amount = this.mirror.convertTo(this.moneyHash[this.assetId].asset, rate);
-                    $scope.$digest();
                 });
             }
 
             /**
              * @private
              */
-            _updateGatewayDetails() {
-                if (this.toBankMode && !this.isLira) {
-                    this._setMinAmount();
-                    return;
+            _onChangeAmountMirror() {
+                if (this.focus === 'mirror') {
+                    this._fillAmount();
                 }
+            }
 
-                const outerChain = outerBlockchains[this.assetId];
-                const isValidWavesAddress = user.isValidAddress(this.tx.recipient);
-
-                if (this.gatewayDetailsError) {
-                    this.outerSendMode = false;
-                    this.gatewayDetailsError = false;
-                }
+            /**
+             * @private
+             */
+            _onChangeFee() {
+                const details = this.gatewayDetails;
 
-                if (this.gatewayAddressError) {
-                    this.gatewayAddressError = false;
-                }
+                const check = (feeList) => {
+                    const feeHash = utils.groupMoney(feeList);
+                    const balanceHash = this.moneyHash;
 
-                if (this.gatewayWrongAddress) {
-                    this.gatewayWrongAddress = false;
-                }
+                    this.hasFee = Object.keys(feeHash).every((feeAssetId) => {
+                        const fee = feeHash[feeAssetId];
+                        return balanceHash[fee.asset.id] && balanceHash[fee.asset.id].gte(fee);
+                    });
+                };
 
-                this.outerSendMode = !isValidWavesAddress && outerChain && outerChain.isValidAddress(this.tx.recipient);
-
-                if (this.outerSendMode) {
-                    return gatewayService.getWithdrawDetails(this.balance.asset, this.tx.recipient, this.paymentId)
-                        .then((details) => {
-                            const max = BigNumber.min(
-                                details.maximumAmount.add(details.gatewayFee),
-                                this.moneyHash[this.assetId].getTokens()
-                            );
-
-                            this.gatewayDetails = details;
-                            this.minAmount = this.moneyHash[this.assetId]
-                                .cloneWithTokens(details.minimumAmount.sub('0.00000001'));
-                            this.maxAmount = this.moneyHash[this.assetId].cloneWithTokens(max);
-                            this.maxGatewayAmount = Money.fromTokens(details.maximumAmount, this.balance.asset);
-                            $scope.$apply();
-                        }, (e) => {
-                            this.gatewayDetails = null;
-                            if (e.message === gatewayService.getAddressErrorMessage(this.balance.asset,
-                                this.tx.recipient, 'errorAddressMessage')) {
-                                this.gatewayAddressError = true;
-                            } else if (e.message === gatewayService.getWrongAddressMessage(this.balance.asset,
-                                this.tx.recipient, 'wrongAddressMessage')) {
-                                this.gatewayWrongAddress = true;
-                            } else {
-                                this.gatewayDetailsError = true;
-                            }
-                            $scope.$apply();
-                        });
+                if (details) {
+                    const gatewayFee = this.balance.cloneWithTokens(details.gatewayFee);
+                    this.feeList = [this.tx.fee, gatewayFee];
+                    check(this.feeList.concat(this.balance.cloneWithTokens(details.minimumAmount)));
                 } else {
-                    this.minAmount = this.state.moneyHash[this.assetId].cloneWithTokens('0');
-                    this.maxAmount = this.moneyHash[this.assetId];
-                    this.gatewayDetails = null;
-                    this._validateForm();
+                    this.feeList = [this.tx.fee];
+                    check(this.feeList);
                 }
-                return Promise.resolve();
             }
 
             /**
              * @private
              */
-            _updateGatewayPermisson() {
-                this.gatewayDetailsError = this.outerSendMode ? !this.isGatewayAccepted : this.gatewayDetailsError;
+            _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 ? this.tx.amount.add(fee) : null,
+                    assetId: this.assetId
+                };
             }
 
             /**
              * @private
              */
-            _updateGatewayError() {
-                this.gatewayError = this.gatewayAddressError || this.gatewayDetailsError || this.gatewayWrongAddress;
+            _onChangeGatewayDetails() {
+                this._updateWavesTxObject();
+                this._onChangeFee();
+            }
+
+            /**
+             * @private
+             */
+            _validateForm() {
+                if (this.tx.amount.getTokens().gt(0)) {
+                    this.gatewaySend.amount.$setTouched(true);
+                }
             }
 
         }
@@ -740,29 +500,20 @@
         'Base',
         '$scope',
         'utils',
-        'createPoll',
+        'user',
         'waves',
-        'configService',
         'outerBlockchains',
-        'user',
         'gatewayService'
     ];
 
     angular.module('app.ui').component('wGatewaySend', {
         bindings: {
             state: '<',
-            onContinue: '&'
+            onSign: '&',
+            onChangeMode: '&'
         },
         templateUrl: 'modules/utils/modals/sendAsset/components/singleSend/gatewaySend/gateway-send.html',
         transclude: true,
         controller
     });
 })();
-
-/**
- * @typedef {object} ISendTx
- * @property {Money} fee
- * @property {Money} amount
- * @property {string} recipient
- * @property {string} attachment
- */
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
index e69de29bb2..95ec37528c 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/gateway-send.html
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/gateway-send.html
@@ -0,0 +1,184 @@
+<form class="send-form"
+      name="$ctrl.gatewaySend"
+      novalidate>
+
+    <ng-transclude></ng-transclude>
+
+    <div class="row margin-top-2">
+
+        <div class="flex-row-title">
+            <div class="body-2 margin-05" w-i18n="modal.send.recipient"></div>
+        </div>
+
+        <w-input-container>
+            <div class="read-address-wrap">
+                <w-input type="text"
+                         name="recipient"
+                         ng-model="$ctrl.tx.recipient"
+                         placeholder="modal.send.placeholderRecipient"
+                         w-i18n-attr="placeholder"
+                         w-validate
+                         w-validator-any-address="{{$ctrl.state.assetId}}"
+                         required></w-input>
+
+                <w-qr-code-read on-read="$ctrl.onReadQrCode(text)" max-width="415" max-height="310"></w-qr-code-read>
+            </div>
+        </w-input-container>
+    </div>
+
+    <div ng-if="!$ctrl.gatewayError" class="row">
+        <div class="plate-warning margin-2">
+            <div class="body-2 warning-500"
+                 w-i18n="modal.send.coinomat.feeTitle"
+                 params="{ fee: $ctrl.gatewayDetails.gatewayFee,
+                           assetTicker: $ctrl.balance.asset.displayName }"></div>
+            <div class="footnote-1 basic-500"
+                 w-i18n="modal.send.gateway.feeExplanation"
+                 params="{ min: $ctrl.gatewayDetails.minimumAmount,
+                           max: $ctrl.gatewayDetails.maximumAmount,
+                           assetTicker: $ctrl.balance.asset.displayName,
+                           assetName: $ctrl.balance.asset.name }"></div>
+        </div>
+
+        <div class="plate-warning basic-500">
+            <span w-i18n="modal.send.icoWarning"
+                  params="{assetName: $ctrl.balance.asset.name}"></span>
+        </div>
+    </div>
+
+    <div ng-if="$ctrl.gatewayDetailsError" class="row">
+        <div class="plate-warning server-error">
+            <div class="body-2 warning-500 margin-05"
+                 w-i18n="modal.receive.gatewayError">
+            </div>
+        </div>
+    </div>
+
+    <div ng-if="$ctrl.gatewayAddressError" class="row">
+        <div class="plate-warning server-error">
+            <div class="body-2 warning-500 margin-05"
+                 w-i18n="modal.receive.serverAddressError">
+            </div>
+        </div>
+    </div>
+
+    <div ng-if="$ctrl.gatewayWrongAddress" class="row">
+        <div class="plate-warning server-error">
+            <div class="body-2 warning-500 margin-05"
+                 w-i18n="modal.receive.serverWrongAddress">
+            </div>
+        </div>
+    </div>
+
+    <div ng-if="$ctrl.isMoneroNotIntegratedAddress() && !$ctrl.gatewayError">
+        <div class="body-2 margin-05" w-i18n="modal.send.moneroPaymentId"></div>
+        <w-input-container class="row">
+            <div>
+                <w-input type="text"
+                         name="payment-id"
+                         ng-model="$ctrl.paymentId"
+                         placeholder="modal.send.moneroPaymentIdPlaceholder"
+                         w-i18n-attr="placeholder"
+                         ng-minlength="64"
+                         ng-maxlength="64"
+                         w-validate
+                         w-validator-pattern="^[0-9a-fA-F]+$"
+                         required></w-input>
+            </div>
+
+            <w-input-error message="minlength">
+                <span w-i18n="modal.send.errors.paymentIdLength"></span>
+            </w-input-error>
+            <w-input-error message="maxlength">
+                <span w-i18n="modal.send.errors.paymentIdLength"></span>
+            </w-input-error>
+            <w-input-error message="pattern">
+                <span w-i18n="modal.send.errors.paymentIdPattern"></span>
+            </w-input-error>
+            <w-input-error message="required">
+                <span w-i18n="modal.send.errors.required"></span>
+            </w-input-error>
+        </w-input-container>
+    </div>
+
+    <w-input-container ng-if="!$ctrl.gatewayError" class="margin-top-2">
+        <div class="body-2 margin-05" w-i18n="modal.send.amount"></div>
+        <div class="amount-wrap">
+
+            <w-balance-input input-classes="big"
+                             name="amount"
+                             asset-id="$ctrl.assetId"
+                             on-focus="$ctrl.focus = 'amount'"
+                             on-blur="$ctrl.focus = ''"
+                             fee="$ctrl.feeList"
+                             max-balance="$ctrl.maxAmount"
+                             min="$ctrl.minAmount"
+                             amount="$ctrl.tx.amount">
+            </w-balance-input>
+            <div class="amount-modal-icon"></div>
+            <w-balance-input input-classes="big"
+                             name="amountMirror"
+                             asset-id="$ctrl.mirrorId"
+                             on-focus="$ctrl.focus = 'mirror'"
+                             on-blur="$ctrl.onBlurMirror()"
+                             fee="$ctrl.feeList"
+                             fill-max="$ctrl.fillMax()"
+                             amount="$ctrl.mirror">
+            </w-balance-input>
+
+        </div>
+
+        <div class="like-input-error multiline" ng-if="$ctrl.gatewaySend.amount.$touched && $ctrl.gatewaySend.amount.$invalid && $ctrl.focus !== 'amount'">
+            <div class="error">
+                <span ng-if="$ctrl.gatewaySend.amount.$error.required"
+                      class="error-list-row"
+                      w-i18n="inputs.errors.required"></span>
+                <span ng-if="$ctrl.gatewaySend.amount.$error.gt && $ctrl.tx.amount.getTokens().eq(0)"
+                      class="error-list-row"
+                      w-i18n="inputs.errors.required"></span>
+                <span ng-if="$ctrl.gatewaySend.amount.$error.gt && $ctrl.tx.amount.getTokens().gt(0)"
+                      class="error-list-row"
+                      w-i18n="inputs.errors.gtGatewayMin"
+                      params="{min: $ctrl.gatewayDetails.minimumAmount, assetName: $ctrl.tx.amount.asset.displayName}"></span>
+                <span ng-if="$ctrl.gatewaySend.amount.$error.precision"
+                      class="error-list-row"
+                      w-i18n="modal.send.errors.precision"
+                      params="{precision: $ctrl.balance.asset.precision}"></span>
+                <span ng-if="$ctrl.gatewaySend.amount.$error.lte && !$ctrl.tx.amount.getTokens().gte($ctrl.gatewayDetails.maximumAmount)"
+                      class="error-list-row"
+                      w-i18n="modal.send.errors.max"></span>
+                <span ng-if="$ctrl.gatewaySend.amount.$error.lte && $ctrl.tx.amount.getTokens().gte($ctrl.gatewayDetails.maximumAmount)"
+                      params="{money: $ctrl.maxGatewayAmount}"
+                      class="error-list-row"
+                      w-i18n="modal.send.errors.maxCoinomat"></span>
+            </div>
+        </div>
+    </w-input-container>
+
+    <div class="fee margin-top-1 margin-1">
+        <w-fee-list tx="$ctrl.wavesTx"
+                    balance-hash="$ctrl.moneyHash"
+                    fee="$ctrl.tx.fee"></w-fee-list>
+    </div>
+
+    <div class="commission-error margin-top-1 margin-2 footnote error-500"
+         ng-if="!$ctrl.hasFee && !$ctrl.gatewayError">
+        <span w-i18n="modal.send.validationError.notEnoughFundsWithdraw"
+              params="{
+                        fee: $ctrl.state.singleSend.fee,
+                        getawayFee: $ctrl.gatewayDetails.gatewayFee,
+                        currency: $ctrl.balance.asset.displayName,
+                        minGatewayAmount: $ctrl.gatewayDetails.minimumAmount
+              }">
+        </span>
+    </div>
+
+    <div class="margin-top-3">
+        <w-sign-button on-click="$ctrl.createTx()"
+                       on-success="$ctrl.onSignTx(signable)"
+                       disabled="$ctrl.gatewaySend.$invalid || !$ctrl.hasFee">
+            <span w-i18n="button.continue"></span>
+        </w-sign-button>
+    </div>
+
+</form>
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/single-send.html b/src/modules/utils/modals/sendAsset/components/singleSend/single-send.html
index 4f2a1abbd4..1f8be38dc0 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/single-send.html
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/single-send.html
@@ -1,18 +1,19 @@
 <w-waves-send ng-if="$ctrl.sendMode === 'waves'"
               state="$ctrl.state"
-              on-continue="$ctrl.onContinue"
+              on-sign="$ctrl.onSign(signable)"
               on-change-mode="$ctrl.onChangeMode(mode)">
     <ng-transclude></ng-transclude>
 </w-waves-send>
 
 <w-gateway-send ng-if="$ctrl.sendMode === 'gateway'"
                 state="$ctrl.state"
-                on-continue="$ctrl.onContinue"
+                on-sign="$ctrl.onSign(signable)"
                 on-change-mode="$ctrl.onChangeMode(mode)">
     <ng-transclude></ng-transclude>
 </w-gateway-send>
 
 <w-bank-send ng-if="$ctrl.sendMode === 'bank'"
-             state="$ctrl.state">
+             state="$ctrl.state"
+             on-sign="$ctrl.onSign(signable)">
     <ng-transclude></ng-transclude>
 </w-bank-send>
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
index d1f8d2160a..3cbde3d414 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
@@ -7,35 +7,24 @@
         [WavesApp.defaultAssets.TRY]: true
     };
 
-    const { BigNumber } = require('@waves/bignumber');
     const ds = require('data-service');
     const { SIGN_TYPE } = require('@waves/signature-adapter');
     const analytics = require('@waves/event-sender');
 
-    const BANK_RECIPIENT = WavesApp.bankRecipient;
-    const MIN_TOKEN_COUNT = 100;
-    const MAX_TOKEN_COUNT = 50000;
-
     /**
      * @param {Base} Base
      * @param {$rootScope.Scope} $scope
      * @param {app.utils} utils
-     * @param {IPollCreate} createPoll
-     * @param {ConfigService} configService
-     * @param {IOuterBlockchains} outerBlockchains
      * @param {User} user
-     * @param {GatewayService} gatewayService
      * @param {Waves} waves
+     * @param {IOuterBlockchains} outerBlockchains
      */
     const controller = function (Base,
                                  $scope,
                                  utils,
-                                 createPoll,
                                  waves,
-                                 configService,
-                                 outerBlockchains,
                                  user,
-                                 gatewayService) {
+                                 outerBlockchains) {
 
         class WavesSend extends Base {
 
@@ -67,10 +56,6 @@
                 return this.state.assetId;
             }
 
-            set assetId(id) {
-                this.state.assetId = id;
-            }
-
             /**
              * @return {string}
              */
@@ -92,95 +77,10 @@
                 return this.moneyHash[this.assetId];
             }
 
-            /**
-             * @return {boolean}
-             */
-            get outerSendMode() {
-                return this.state.outerSendMode;
-            }
-
-            set outerSendMode(value) {
-                this.state.outerSendMode = value;
-            }
-
-            /**
-             * @return {string}
-             */
-            get paymentId() {
-                return this.state.paymentId;
-            }
-
-            set paymentId(value) {
-                this.state.paymentId = value;
-            }
-
-            /**
-             * @return {IGatewayDetails}
-             */
-            get gatewayDetails() {
-                return this.state.gatewayDetails;
-            }
-
-            set gatewayDetails(value) {
-                this.state.gatewayDetails = value;
-            }
-
-            get isBankPending() {
-                return this.toBankMode && this.termsIsPending;
-            }
-
-            get isBankError() {
-                return this.toBankMode && this.termsLoadError;
-            }
-
-            get isGatewayAccepted() {
-                return !configService
-                    .get('PERMISSIONS.CANT_TRANSFER_GATEWAY').includes(this.balance.asset.id);
-            }
-
-            get isBankAccepted() {
-                return this.toBankMode ? this.isGatewayAccepted : true;
-            }
-
-            get isBankPendingOrError() {
-                return this.isBankError || this.isBankPending;
-            }
-
-            get minimumAmount() {
-                return this.gatewayDetails &&
-                    this.gatewayDetails.minimumAmount ||
-                    this.toBankMode &&
-                    new BigNumber(MIN_TOKEN_COUNT);
-            }
-
-            get maximumAmount() {
-                return this.maxGatewayAmount || this.toBankMode && this.balance.cloneWithTokens(MAX_TOKEN_COUNT);
-            }
-
-            /**
-             * @type {string}
-             */
-            txType = WavesApp.TRANSACTION_TYPES.NODE.TRANSFER;
-
-            /**
-             * @type {boolean}
-             */
-            get toBankMode() {
-                return this.state.toBankMode;
-            }
-
-            set toBankMode(value) {
-                this.state.toBankMode = value;
-            }
-
-            /**
-             * @type {string}
-             */
-            digiLiraUserLink = 'https://www.digilira.com/';
             /**
              * @type {Function}
              */
-            onContinue = null;
+            onSign = null;
             /**
              * @type {Function}
              */
@@ -188,9 +88,9 @@
             /**
              * @type {string}
              */
-            focus = null;
+            focus = '';
             /**
-             * @type {Money}
+             * @type {Money | null}
              */
             mirror = null;
             /**
@@ -204,51 +104,15 @@
             /**
              * @type {Array}
              */
-            feeList = null;
+            feeList = [];
             /**
-             * @type {Money}
+             * @type {Money | null}
              */
             minAmount = null;
             /**
              * @type {Money}
              */
             maxAmount = null;
-            /**
-             * @type {ISendState}
-             */
-            state = Object.create(null);
-            /**
-             * @type {Money}
-             */
-            maxGatewayAmount = null;
-            /**
-             * @type {boolean}
-             */
-            gatewayDetailsError = false;
-            /**
-             * @type {boolean}
-             */
-            gatewayAddressError = false;
-            /**
-             * @type {boolean}
-             */
-            gatewayWrongAddress = false;
-            /**
-             * @type {boolean}
-             */
-            gatewayError = false;
-            /**
-             * @type {boolean}
-             */
-            termsIsPending = true;
-            /**
-             * @type {boolean}
-             */
-            termsLoadError = false;
-            /**
-             * @type {boolean}
-             */
-            signInProgress = false;
             /**
              * @type {ISingleSendTx}
              */
@@ -261,46 +125,29 @@
                 assetId: ''
             };
 
-            constructor() {
-                gatewayService.getFiats();
-                super();
-            }
-
             $postLink() {
                 this.receive(utils.observe(this.tx, 'recipient'), this._onUpdateRecipient, this);
-                const onHasMoneyHash = () => {
-                    // this.receive(utils.observe(this.state, 'toBankMode'), this._onChangeBankMode, this);
-                    // this.observe('gatewayDetails', this._checkFee);
-                    this.receive(utils.observe(this.tx, 'fee'), this._onUpdateFee, this);
-                    this.tx.amount = this.tx.amount || this.moneyHash[this.assetId].cloneWithTokens('0');
-                    // this._fillMirror();
 
-                    // 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._updateGatewayDetails, this);
-                    // this.receive(utils.observe(this.tx, 'recipient'), this._updateGatewayDetails, 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, 'paymentId'), this._updateGatewayPermisson, this);
-                    // this.receive(utils.observe(this.tx, 'recipient'), this._updateGatewayPermisson, 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.tx, 'amount'), this._onChangeAmount, this);
                     this.observe('mirror', this._onChangeAmountMirror);
 
-                    // this.observe('gatewayDetails', this._updateWavesTxObject);
-                    // 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.observe('mirror', this._onChangeAmountMirror);
-                    // this.observe(['gatewayAddressError', 'gatewayDetailsError', 'gatewayWrongAddress'],
-                    //     this._updateGatewayError);
+                    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._onUpdateFee();
+                    this._onUpdateRecipient();
+                    this._onChangeFee();
                     this._setMinAndMaxAmount();
                     this._onChangeBaseAssets();
-                    // this._updateGatewayDetails();
-                    // this._updateGatewayPermisson();
+                    this._updateWavesTxObject();
+                    this._fillMirror();
                 };
 
                 if (!this.state.moneyHash) {
@@ -310,37 +157,25 @@
                 }
 
                 this.receive(utils.observe(this.state, 'moneyHash'), () => {
-                    this._onUpdateFee();
+                    this._onChangeFee();
                     this._setMinAndMaxAmount();
                     this._onChangeBaseAssets();
-                    // this._updateGatewayDetails();
                 });
 
-                this._onChangeBaseAssets();
-                this._updateWavesTxObject();
             }
 
             setSendMode(mode) {
                 this.onChangeMode({ mode });
             }
 
-            onSignCoinomatStart() {
-                this.signInProgress = true;
-            }
-
-            onSignCoinomatEnd() {
-                this.signInProgress = false;
-            }
-
+            /**
+             * @return {Signable}
+             */
             createTx() {
-                const toGateway = this.outerSendMode && this.gatewayDetails;
-                const fee = toGateway ? this.tx.amount.cloneWithTokens(toGateway.gatewayFee) : null;
                 const attachmentString = this.tx.attachment ? this.tx.attachment.toString() : '';
                 const tx = waves.node.transactions.createTransaction({
                     ...this.tx,
-                    recipient: toGateway ? this.gatewayDetails.address : this.tx.recipient,
-                    attachment: utils.stringToBytes(toGateway ? this.gatewayDetails.attachment : attachmentString),
-                    amount: toGateway ? this.tx.amount.add(fee) : this.tx.amount
+                    attachment: utils.stringToBytes(attachmentString)
                 });
 
                 const signable = ds.signature.getSignatureApi().makeSignable({
@@ -353,7 +188,7 @@
 
             onSignTx(signable) {
                 analytics.send({ name: 'Transfer Continue Click', target: 'ui' });
-                this.onContinue({ signable });
+                this.onSign({ signable });
             }
 
             fillMax() {
@@ -436,32 +271,16 @@
                 }
             }
 
-            /**
-             * @return {boolean}
-             */
-            isMoneroNotIntegratedAddress() {
-                const moneroAddressLength = 95;
-                const assetIsMonero = this.state.assetId === WavesApp.defaultAssets.XMR;
-                return assetIsMonero && this.tx.recipient.length === moneroAddressLength;
-            }
-
-            getGatewayDetails() {
-                this._onChangeAssetId();
-            }
-
             /**
              * @private
              */
             _updateWavesTxObject() {
-                const toGateway = this.outerSendMode && this.gatewayDetails;
-                const fee = toGateway ? this.tx.amount.cloneWithTokens(toGateway.gatewayFee) : null;
                 const attachmentString = this.tx.attachment ? this.tx.attachment.toString() : '';
                 const isWavesAddress = user.isValidAddress(this.tx.recipient);
                 this.wavesTx = {
                     ...this.wavesTx,
-                    recipient: toGateway ? this.gatewayDetails.address : isWavesAddress && this.tx.recipient || '',
-                    attachment: utils.stringToBytes(toGateway ? this.gatewayDetails.attachment : attachmentString),
-                    amount: toGateway ? this.tx.amount.add(fee) : this.tx.amount,
+                    recipient: isWavesAddress && this.tx.recipient || '',
+                    attachment: utils.stringToBytes(attachmentString),
                     assetId: this.assetId
                 };
             }
@@ -473,24 +292,12 @@
                 if (this.tx.amount.getTokens().gt(0) || this.tx.recipient) {
                     this.wavesSend.$setDirty(true);
                     this.wavesSend.$setSubmitted(true);
+                    if (this.wavesSend.amount) {
+                        this.wavesSend.amount.$setTouched(true);
+                    }
                 }
             }
 
-            /**
-             * @private
-             */
-            _onChangeBankMode() {
-                if (this.toBankMode && !this.isLira) {
-                    this.tx.recipient = BANK_RECIPIENT;
-                    this.termsIsPending = true;
-                } else {
-                    this.tx.recipient = '';
-                    this.termsIsPending = false;
-                }
-
-                this._updateGatewayPermisson();
-            }
-
             /**
              * @private
              */
@@ -525,13 +332,12 @@
 
                 this.tx.amount = this.moneyHash[this.assetId].cloneWithTokens('0');
                 this.mirror = this.moneyHash[this.mirrorId].cloneWithTokens('0');
-                this._updateGatewayPermisson();
             }
 
             /**
              * @private
              */
-            _onUpdateFee() {
+            _onChangeFee() {
                 this.feeList = [this.tx.fee];
 
                 const feeHash = utils.groupMoney(this.feeList);
@@ -551,15 +357,18 @@
                 if (this.assetId === this.mirrorId) {
                     this.noMirror = true;
                 } else {
-                    waves.utils.getRate(this.assetId, this.mirrorId).then((rate) => {
+                    waves.utils.getRate(this.assetId, this.mirrorId).then(rate => {
                         this.noMirror = rate.eq(0);
                     });
                 }
             }
 
+            /**
+             * @private
+             */
             _setMinAndMaxAmount() {
-                this.minAmount = this.state.moneyHash[this.state.assetId].cloneWithTokens('0');
-                this.maxAmount = this.moneyHash[this.assetId];
+                this.minAmount = this.balance.cloneWithTokens('0');
+                this.maxAmount = this.balance;
             }
 
             /**
@@ -569,7 +378,6 @@
                 if (!this.noMirror && this.focus === 'amount') {
                     this._fillMirror();
                 }
-
             }
 
             /**
@@ -590,7 +398,7 @@
                     return;
                 }
 
-                waves.utils.getRate(this.assetId, this.mirrorId).then((rate) => {
+                waves.utils.getRate(this.assetId, this.mirrorId).then(rate => {
                     this.mirror = this.tx.amount.convertTo(this.moneyHash[this.mirrorId].asset, rate);
                 });
             }
@@ -604,7 +412,7 @@
                     return null;
                 }
 
-                waves.utils.getRate(this.mirrorId, this.assetId).then((rate) => {
+                waves.utils.getRate(this.mirrorId, this.assetId).then(rate => {
                     this.tx.amount = this.mirror.convertTo(this.moneyHash[this.assetId].asset, rate);
                 });
             }
@@ -613,21 +421,21 @@
              * @private
              */
             _onUpdateRecipient() {
+                this._checkOuterBlockchains();
                 this._validateForm();
             }
 
             /**
              * @private
              */
-            _updateGatewayPermisson() {
-                this.gatewayDetailsError = this.outerSendMode ? !this.isGatewayAccepted : this.gatewayDetailsError;
-            }
-
-            /**
-             * @private
-             */
-            _updateGatewayError() {
-                this.gatewayError = this.gatewayAddressError || this.gatewayDetailsError || this.gatewayWrongAddress;
+            _checkOuterBlockchains() {
+                const outerChain = outerBlockchains[this.assetId];
+                const isValidWavesAddress = user.isValidAddress(this.tx.recipient);
+                const gatewayAddress = !isValidWavesAddress &&
+                                        outerChain && outerChain.isValidAddress(this.tx.recipient);
+                if (gatewayAddress) {
+                    this.setSendMode('gateway');
+                }
             }
 
         }
@@ -639,18 +447,15 @@
         'Base',
         '$scope',
         'utils',
-        'createPoll',
         'waves',
-        'configService',
-        'outerBlockchains',
         'user',
-        'gatewayService'
+        'outerBlockchains'
     ];
 
     angular.module('app.ui').component('wWavesSend', {
         bindings: {
             state: '<',
-            onContinue: '&',
+            onSign: '&',
             onChangeMode: '&'
         },
         templateUrl: 'modules/utils/modals/sendAsset/components/singleSend/wavesSend/waves-send.html',
@@ -658,11 +463,3 @@
         controller
     });
 })();
-
-/**
- * @typedef {object} ISendTx
- * @property {Money} fee
- * @property {Money} amount
- * @property {string} recipient
- * @property {string} attachment
- */
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
index 880a85252a..dcd9248899 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/waves-send.html
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/waves-send.html
@@ -19,7 +19,7 @@
             <div class="read-address-wrap">
                 <w-input type="text"
                          name="recipient"
-                         ng-model="$ctrl.state.singleSend.recipient"
+                         ng-model="$ctrl.tx.recipient"
                          placeholder="modal.send.placeholderRecipient"
                          w-i18n-attr="placeholder"
                          w-validate
@@ -44,13 +44,13 @@
 
             <w-balance-input name="amount"
                              input-classes="big"
-                             asset-id="$ctrl.state.assetId"
+                             asset-id="$ctrl.assetId"
                              max-balance="$ctrl.maxAmount"
                              fee="$ctrl.feeList"
                              min="$ctrl.minAmount"
                              on-focus="$ctrl.focus = 'amount'"
                              on-blur="$ctrl.focus = ''"
-                             amount="$ctrl.state.singleSend.amount">
+                             amount="$ctrl.tx.amount">
             </w-balance-input>
             <div class="amount-modal-icon"></div>
             <w-balance-input name="amountMirror"
@@ -60,14 +60,13 @@
                              on-focus="$ctrl.focus = 'mirror'"
                              on-blur="$ctrl.onBlurMirror()"
                              fill-max="$ctrl.fillMax()"
-                             fee="$ctrl.tx.fee"
+                             fee="$ctrl.feeList"
                              amount="$ctrl.mirror">
             </w-balance-input>
 
         </div>
 
-        <div class="like-input-error multiline"
-             ng-if="$ctrl.wavesSend.amount.$touched && $ctrl.wavesSend.amount.$invalid && $ctrl.focus !== 'amount'">
+        <div class="like-input-error multiline" ng-if="$ctrl.wavesSend.amount.$touched && $ctrl.wavesSend.amount.$invalid && $ctrl.focus !== 'amount'">
             <div class="error">
                 <span ng-if="$ctrl.wavesSend.amount.$error.required"
                       class="error-list-row"
@@ -78,7 +77,7 @@
                 <span ng-if="$ctrl.wavesSend.amount.$error.precision"
                       class="error-list-row"
                       w-i18n="modal.send.errors.precision"
-                      params="{precision: $ctrl.state.moneyHash[$ctrl.state.assetId].asset.precision}"></span>
+                      params="{precision: $ctrl.balance.asset.precision}"></span>
                 <span ng-if="$ctrl.wavesSend.amount.$error.lte"
                       class="error-list-row"
                       w-i18n="modal.send.errors.max"></span>
@@ -91,7 +90,7 @@
         <w-input-container>
             <w-input textarea="true"
                      name="attachment"
-                     ng-model="$ctrl.state.singleSend.attachment"
+                     ng-model="$ctrl.tx.attachment"
                      w-i18n-attr="placeholder"
                      w-validate
                      w-validator-byte-lte="140"
@@ -117,11 +116,9 @@
     </div>
 
     <div class="margin-top-3">
-        <w-sign-button
-                ng-if="!$ctrl.hasOuterError && !$ctrl.isBankPending && !($ctrl.toBankMode && $ctrl.isLira)"
-                on-click="$ctrl.createTx()"
-                on-success="$ctrl.onSignTx(signable)"
-                disabled="$ctrl.wavesSend.$invalid || !$ctrl.hasFee">
+        <w-sign-button on-click="$ctrl.createTx()"
+                       on-success="$ctrl.onSignTx(signable)"
+                       disabled="$ctrl.wavesSend.$invalid || !$ctrl.hasFee">
             <span w-i18n="button.continue"></span>
         </w-sign-button>
     </div>

From 1ad0d2fb9ac795c47811ee88637d11a88630202e Mon Sep 17 00:00:00 2001
From: okanishcheva <okanishcheva@wavesplatform.com>
Date: Wed, 21 Aug 2019 10:23:02 +0300
Subject: [PATCH 03/18] DEXW-1239: save

---
 .../singleSend/gatewaySend/GatewaySend.js       | 17 +++++------------
 .../singleSend/gatewaySend/gateway-send.html    |  2 +-
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
index ea7f286067..3e1dbb2dec 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
@@ -53,13 +53,6 @@
                 return this.moneyHash[this.assetId];
             }
 
-            /**
-             * @return {string}
-             */
-            get paymentId() {
-                return this.state.paymentId;
-            }
-
             /**
              * @type {Function}
              */
@@ -140,6 +133,7 @@
 
                     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._updateGatewayDetails, this);
 
                     this.observe('mirror', this._onChangeAmountMirror);
                     this.observe('gatewayDetails', this._onChangeGatewayDetails);
@@ -161,10 +155,7 @@
                     this._onChangeFee();
                 });
 
-                this._updateGatewayDetails()
-                    .then(() => {
-                        this._validateForm();
-                    });
+                this._updateGatewayDetails();
             }
 
             setSendMode(mode) {
@@ -302,7 +293,7 @@
                     this.gatewayWrongAddress = false;
                 }
 
-                return gatewayService.getWithdrawDetails(this.balance.asset, this.tx.recipient, this.paymentId)
+                return gatewayService.getWithdrawDetails(this.balance.asset, this.tx.recipient, this.state.paymentId)
                     .then(details => {
                         const max = BigNumber.min(
                             details.maximumAmount.add(details.gatewayFee),
@@ -334,6 +325,7 @@
              */
             _onUpdateRecipient() {
                 this._checkOuterBlockchains();
+                this._updateGatewayDetails();
             }
 
             /**
@@ -480,6 +472,7 @@
             _onChangeGatewayDetails() {
                 this._updateWavesTxObject();
                 this._onChangeFee();
+                this._validateForm();
             }
 
             /**
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
index 95ec37528c..dcaa7cbef2 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/gateway-send.html
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/gateway-send.html
@@ -76,7 +76,7 @@
             <div>
                 <w-input type="text"
                          name="payment-id"
-                         ng-model="$ctrl.paymentId"
+                         ng-model="$ctrl.state.paymentId"
                          placeholder="modal.send.moneroPaymentIdPlaceholder"
                          w-i18n-attr="placeholder"
                          ng-minlength="64"

From 4c8cbb57b3fd097e2face322b396c4dc365c69c4 Mon Sep 17 00:00:00 2001
From: okanishcheva <okanishcheva@wavesplatform.com>
Date: Wed, 21 Aug 2019 12:05:23 +0300
Subject: [PATCH 04/18] DEXW-1239: save

---
 .../singleSend/bankSend/BankSend.js           | 75 +++++++++++++++++--
 .../singleSend/bankSend/bank-send.html        | 62 ++++++++++++++-
 .../components/singleSend/single-send.html    |  3 +-
 .../singleSend/wavesSend/WavesSend.js         | 12 +--
 4 files changed, 133 insertions(+), 19 deletions(-)

diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
index 494813404f..c66ae530ec 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
@@ -1,12 +1,74 @@
 (function () {
     'use strict';
 
-    const controller = function () {
+    /**
+     * @param {Base} Base
+     * @param {ConfigService} configService
+     * @param {Waves} waves
+     */
+    const controller = function (Base,
+                                 configService) {
 
-        class BankSend {
+        class BankSend extends Base {
 
-            constructor() {
-                this.test = 0;
+            /**
+             * @return {string}
+             */
+            get assetId() {
+                return this.state.assetId;
+            }
+
+            set assetId(id) {
+                this.state.assetId = id;
+            }
+
+            /**
+             * @return {Money}
+             */
+            get balance() {
+                return this.moneyHash[this.assetId];
+            }
+
+            /**
+             * @return {Object<string, Money>}
+             */
+            get moneyHash() {
+                return this.state.moneyHash;
+            }
+
+            /**
+             * @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;
+
+            // constructor() {
+            // }
+
+            setSendMode(mode) {
+                this.onChangeMode({ mode });
             }
 
         }
@@ -14,12 +76,13 @@
         return new BankSend();
     };
 
-    controller.$inject = [];
+    controller.$inject = ['Base', 'configService'];
 
     angular.module('app.ui').component('wBankSend', {
         bindings: {
             state: '<',
-            onContinue: '&'
+            onContinue: '&',
+            onChangeMode: '&'
         },
         templateUrl: 'modules/utils/modals/sendAsset/components/singleSend/bankSend/bank-send.html',
         transclude: true,
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
index 103be5fa4a..f35851ff1d 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/bank-send.html
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/bank-send.html
@@ -1,2 +1,60 @@
-Bank send
-<ng-transclude></ng-transclude>
+<form class="send-form"
+      name="$ctrl.bankSend"
+      novalidate>
+
+    <ng-transclude></ng-transclude>
+
+    <div class="row">
+        <div ng-if="!$ctrl.isVerified && !$ctrl.isBankPendingOrError"
+             class="plate-error">
+            <div class="body-2 error-500 margin-05" w-i18n="modal.send.notVerifiedHeader"></div>
+            <div class="footnote-1 basic-500" w-i18n="modal.send.notVerifiedText"></div>
+        </div>
+    </div>
+
+    <div class="row margin-top-2">
+        <div class="flex-row-title">
+            <div class="body-2 margin-05" w-i18n="modal.send.recipient"></div>
+            <div class="toggle-mode-container">
+                <span class="link"
+                      ng-click="$ctrl.setSendMode('waves')"
+                      w-i18n="modal.send.toWaves"></span>
+            </div>
+        </div>
+
+        <div class="input-like big disabled">
+            <span w-i18n="modal.send.bankAccount"></span>
+        </div>
+    </div>
+
+    <div class="row relative" style="min-height: 60px;"
+         ng-if="$ctrl.termsIsPending && $ctrl.isBankAccepted">
+        <w-loader class="asd"></w-loader>
+    </div>
+
+    <div ng-if="!$ctrl.isBankPendingOrError && $ctrl.isVerified && $ctrl.isBankAccepted" class="margin-1">
+        <div class="plate-warning">
+            <div class="body-2 warning-500 margin-05" w-i18n="modal.send.coinomatWarningHeader"></div>
+            <div class="footnote-1 basic-500" w-i18n="modal.send.coinomatWarningText"></div>
+        </div>
+    </div>
+
+    <div ng-if="!$ctrl.isBankPendingOrError && $ctrl.isVerified && $ctrl.isBankAccepted" class="row">
+        <div class="plate-warning">
+            <div class="body-2 warning-500 margin-05" w-i18n="modal.send.coinomatLimits"></div>
+        </div>
+    </div>
+
+
+
+
+    <div ng-if="!$ctrl.isLira && $ctrl.isBankAccepted" class="margin-top-2">
+        <w-coinomat-terms force-show-terms="::false"
+                          terms-pending="$ctrl.termsIsPending"
+                          load-error="$ctrl.termsLoadError"
+                          show-accepted-checkbox="::false"
+                          is-verified="$ctrl.isVerified"
+                          terms-accepted="$ctrl.termsAccepted"></w-coinomat-terms>
+    </div>
+
+</form>
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/single-send.html b/src/modules/utils/modals/sendAsset/components/singleSend/single-send.html
index 1f8be38dc0..29a8d3897a 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/single-send.html
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/single-send.html
@@ -14,6 +14,7 @@
 
 <w-bank-send ng-if="$ctrl.sendMode === 'bank'"
              state="$ctrl.state"
-             on-sign="$ctrl.onSign(signable)">
+             on-sign="$ctrl.onSign(signable)"
+             on-change-mode="$ctrl.onChangeMode(mode)">
     <ng-transclude></ng-transclude>
 </w-bank-send>
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
index 3cbde3d414..0f7e330495 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
@@ -3,8 +3,7 @@
 
     const FIAT_ASSETS = {
         [WavesApp.defaultAssets.USD]: true,
-        [WavesApp.defaultAssets.EUR]: true,
-        [WavesApp.defaultAssets.TRY]: true
+        [WavesApp.defaultAssets.EUR]: true
     };
 
     const ds = require('data-service');
@@ -32,14 +31,7 @@
              * @return {boolean}
              */
             get canSendToBank() {
-                return (FIAT_ASSETS[this.assetId] && !this.isLira) || false;
-            }
-
-            /**
-             * @return {boolean}
-             */
-            get isLira() {
-                return this.assetId === WavesApp.defaultAssets.TRY;
+                return FIAT_ASSETS[this.assetId] || false;
             }
 
             /**

From 8b723e72c23a4e033823ceaf8f124edfe89a6085 Mon Sep 17 00:00:00 2001
From: okanishcheva <okanishcheva@wavesplatform.com>
Date: Wed, 21 Aug 2019 15:56:37 +0300
Subject: [PATCH 05/18] DEXW-1239: save

---
 .../singleSend/bankSend/BankSend.js           | 267 +++++++++++++++++-
 .../singleSend/bankSend/bank-send.html        |  67 ++++-
 .../singleSend/wavesSend/WavesSend.js         |   4 +-
 3 files changed, 330 insertions(+), 8 deletions(-)

diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
index c66ae530ec..f896a741b7 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
@@ -1,13 +1,22 @@
 (function () {
     'use strict';
 
+    const { Money } = require('@waves/data-entities');
+    const MIN_TOKEN_COUNT = 100;
+    const MAX_TOKEN_COUNT = 50000;
+
     /**
      * @param {Base} Base
+     * @param {$rootScope.Scope} $scope
      * @param {ConfigService} configService
      * @param {Waves} waves
+     * @param {app.utils} utils
      */
     const controller = function (Base,
-                                 configService) {
+                                 $scope,
+                                 configService,
+                                 waves,
+                                 utils) {
 
         class BankSend extends Base {
 
@@ -51,6 +60,20 @@
                 return this.termsLoadError || this.termsIsPending;
             }
 
+            /**
+             * @return {string}
+             */
+            get mirrorId() {
+                return this.state.mirrorId;
+            }
+
+            /**
+             * @return {ISingleSendTx}
+             */
+            get tx() {
+                return this.state.singleSend;
+            }
+
             /**
              * @type {boolean}
              */
@@ -63,20 +86,258 @@
              * @type {boolean}
              */
             termsAccepted = false;
+            /**
+             * @type {boolean}
+             */
+            noMirror = false;
+            /**
+             * @type {Money}
+             */
+            minAmount = null;
+            /**
+             * @type {Money}
+             */
+            maxAmount = null;
+            /**
+             * @type {Array}
+             */
+            feeList = [];
+            /**
+             * @type {boolean}
+             */
+            hasFee = true;
+            /**
+             * @type {string}
+             */
+            focus = '';
+            /**
+             * @type {Money | null}
+             */
+            mirror = null;
+            /**
+             * @type {Money | null}
+             */
+            maxCoinomatAmount = null;
+            /**
+             * @type {boolean}
+             */
+            canShowAmount = false;
+
+            $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);
+
+                    if (this.isBankAccepted) {
+                        this.observe(['termsLoadError', 'termsIsPending'], () => {
+                            this.canShowAmount = !this.termsLoadError && !this.termsIsPending;
+                            if (this.canShowAmount) {
+                                setTimeout(() => {
+                                    this._validateForm();
+                                    this._fillMirror();
+                                }, 0);
+                            }
+                        });
+                    }
+
+                    this._onChangeBaseAssets();
+                    this._setMinAndMaxAmount();
+                    this._onChangeFee();
+                };
+                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();
+                });
+            }
 
-            // constructor() {
+            // $doCheck() {
+            //     if (this.bankSend && this.bankSend.amount && !this.bankSend.amount.$touched) {
+            //         this._validateForm();
+            //     }
             // }
 
             setSendMode(mode) {
                 this.onChangeMode({ mode });
             }
 
+            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.mirror = amount.convertTo(this.moneyHash[this.mirrorId].asset, rate);
+                    this.tx.amount = amount;
+                    $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
+             */
+            _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;
+
+                this._validateForm();
+            }
+
+            /**
+             * @private
+             */
+            _validateForm() {
+                if (this.bankSend.amount && this.tx.amount.getTokens().gt(0)) {
+                    this.bankSend.amount.$setTouched(true);
+                }
+            }
+
+            /**
+             * @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
+             */
+            _onChangeAmount() {
+                if (!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);
+                });
+            }
+
+            /**
+             * @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);
+                });
+            }
+
+            /**
+             * @private
+             */
+            _onChangeAmountMirror() {
+                if (this.focus === 'mirror') {
+                    this._fillAmount();
+                }
+            }
+
         }
 
         return new BankSend();
     };
 
-    controller.$inject = ['Base', 'configService'];
+    controller.$inject = ['Base', '$scope', 'configService', 'waves', 'utils'];
 
     angular.module('app.ui').component('wBankSend', {
         bindings: {
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
index f35851ff1d..0b8d741f0f 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/bank-send.html
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/bank-send.html
@@ -27,8 +27,7 @@
         </div>
     </div>
 
-    <div class="row relative" style="min-height: 60px;"
-         ng-if="$ctrl.termsIsPending && $ctrl.isBankAccepted">
+    <div ng-if="$ctrl.termsIsPending && $ctrl.isBankAccepted" class="row relative" style="min-height: 60px;">
         <w-loader class="asd"></w-loader>
     </div>
 
@@ -45,10 +44,72 @@
         </div>
     </div>
 
+    <div ng-if="!$ctrl.isBankAccepted" class="row">
+        <div class="plate-warning server-error">
+            <div class="body-2 warning-500 margin-05"
+                 w-i18n="modal.receive.gatewayError">
+            </div>
+        </div>
+    </div>
+
+    <w-input-container ng-if="$ctrl.canShowAmount" class="margin-top-2">
+        <div class="body-2 margin-05" w-i18n="modal.send.amount"></div>
+        <div class="amount-wrap" ng-class="{'no-mirror': $ctrl.noMirror}">
 
+            <w-balance-input name="amount"
+                             asset-id="$ctrl.assetId"
+                             max-balance="$ctrl.maxAmount"
+                             fee="$ctrl.feeList"
+                             input-classes="big"
+                             disabled="!$ctrl.isVerified || !$ctrl.termsAccepted"
+                             min="$ctrl.minAmount"
+                             on-focus="$ctrl.focus = 'amount'"
+                             on-blur="$ctrl.focus = ''"
+                             amount="$ctrl.tx.amount">
+            </w-balance-input>
+            <div class="amount-modal-icon"></div>
+            <w-balance-input ng-if="!$ctrl.noMirror"
+                             on-focus="$ctrl.focus = 'mirror'"
+                             on-blur="$ctrl.onBlurMirror()"
+                             name="amountMirror"
+                             asset-id="$ctrl.mirrorId"
+                             fill-max="$ctrl.fillMax()"
+                             fee="$ctrl.feeList"
+                             input-classes="big"
+                             disabled="!$ctrl.isVerified || !$ctrl.termsAccepted"
+                             amount="$ctrl.mirror">
+            </w-balance-input>
 
+        </div>
+
+        <div class="like-input-error multiline" ng-if="$ctrl.bankSend.amount.$touched && $ctrl.bankSend.amount.$invalid && $ctrl.focus !== 'amount'">
+            <div class="error">
+                <span ng-if="$ctrl.bankSend.amount.$error.required"
+                      class="error-list-row"
+                      w-i18n="inputs.errors.required"></span>
+                <span ng-if="$ctrl.bankSend.amount.$error.gt && $ctrl.tx.amount.getTokens().eq(0)"
+                      class="error-list-row"
+                      w-i18n="inputs.errors.required"></span>
+                <span ng-if="$ctrl.bankSend.amount.$error.gt && $ctrl.tx.amount.getTokens().gt(0)"
+                      class="error-list-row"
+                      w-i18n="inputs.errors.gtGatewayMin"
+                      params="{min: $ctrl.minAmount.getTokens(), assetName: $ctrl.tx.amount.asset.displayName}"></span>
+                <span ng-if="$ctrl.bankSend.amount.$error.precision"
+                      class="error-list-row"
+                      w-i18n="modal.send.errors.precision"
+                      params="{precision: $ctrl.balance.asset.precision}"></span>
+                <span ng-if="$ctrl.bankSend.amount.$error.lte && !$ctrl.tx.amount.getTokens().gte($ctrl.maxCoinomatAmount)"
+                      class="error-list-row"
+                      w-i18n="modal.send.errors.max"></span>
+                <span ng-if="$ctrl.bankSend.amount.$error.lte && $ctrl.tx.amount.getTokens().gte($ctrl.maxCoinomatAmount)"
+                      params="{money: $ctrl.maxCoinomatAmount}"
+                      class="error-list-row"
+                      w-i18n="modal.send.errors.maxCoinomat"></span>
+            </div>
+        </div>
+    </w-input-container>
 
-    <div ng-if="!$ctrl.isLira && $ctrl.isBankAccepted" class="margin-top-2">
+    <div ng-if="$ctrl.isBankAccepted" class="margin-top-2">
         <w-coinomat-terms force-show-terms="::false"
                           terms-pending="$ctrl.termsIsPending"
                           load-error="$ctrl.termsLoadError"
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
index 0f7e330495..9b791d10b1 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
@@ -318,11 +318,11 @@
 
                 this._onChangeBaseAssets();
 
-                if (!this.moneyHash[this.assetId]) {
+                if (!this.balance) {
                     return null;
                 }
 
-                this.tx.amount = this.moneyHash[this.assetId].cloneWithTokens('0');
+                this.tx.amount = this.balance.cloneWithTokens('0');
                 this.mirror = this.moneyHash[this.mirrorId].cloneWithTokens('0');
             }
 

From 60d659350c5c08e7fefb7c04f558c427a7a1d34e Mon Sep 17 00:00:00 2001
From: okanishcheva <okanishcheva@wavesplatform.com>
Date: Wed, 21 Aug 2019 17:10:10 +0300
Subject: [PATCH 06/18] DEXW-1239: save

---
 .../singleSend/bankSend/BankSend.js           | 32 ++++++++++++++
 .../singleSend/bankSend/bank-send.html        | 44 +++++++++++++++++++
 2 files changed, 76 insertions(+)

diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
index f896a741b7..454b79170d 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
@@ -2,6 +2,7 @@
     'use strict';
 
     const { Money } = require('@waves/data-entities');
+    const { SIGN_TYPE } = require('@waves/signature-adapter');
     const MIN_TOKEN_COUNT = 100;
     const MAX_TOKEN_COUNT = 50000;
 
@@ -122,6 +123,17 @@
              * @type {boolean}
              */
             canShowAmount = false;
+            /**
+             * @type {ISingleSendTx}
+             */
+            wavesTx = {
+                type: SIGN_TYPE.TRANSFER,
+                amount: null,
+                attachment: '',
+                fee: null,
+                recipient: WavesApp.bankRecipient,
+                assetId: ''
+            };
 
             $postLink() {
 
@@ -146,15 +158,21 @@
                         });
                     }
 
+                    this.receive(utils.observe(this.tx, 'amount'), this._updateWavesTxObject, this);
+                    this.receive(utils.observe(this.tx, 'attachment'), this._updateWavesTxObject, this);
+
                     this._onChangeBaseAssets();
                     this._setMinAndMaxAmount();
                     this._onChangeFee();
+                    this._updateWavesTxObject();
                 };
+
                 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();
@@ -164,6 +182,7 @@
             // $doCheck() {
             //     if (this.bankSend && this.bankSend.amount && !this.bankSend.amount.$touched) {
             //         this._validateForm();
+            //         this._fillMirror();
             //     }
             // }
 
@@ -332,6 +351,19 @@
                 }
             }
 
+            /**
+             * @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
+                };
+            }
+
         }
 
         return new BankSend();
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
index 0b8d741f0f..b47e1b3475 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/bank-send.html
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/bank-send.html
@@ -109,6 +109,40 @@
         </div>
     </w-input-container>
 
+    <w-input-container ng-if="!$ctrl.isBankPendingOrError" class="margin-top-2">
+        <div class="body-2 margin-05">
+            <span w-i18n="modal.send.idNumberTitle"></span>
+            <w-help-icon>
+                <div w-i18n="modal.send.idNumber.helpIcon.title"
+                     class="help-icon__row headline-3"></div>
+                <div w-i18n="modal.send.idNumber.helpIcon.description"
+                     class="help-icon__row"></div>
+            </w-help-icon>
+        </div>
+        <w-input w-validate
+                 ng-disabled="!$ctrl.termsAccepted"
+                 w-validator-pattern="\d*"
+                 ng-model="$ctrl.tx.attachment"
+                 name="idNumber"
+                 type="text"
+                 required></w-input>
+        <w-input-error name="idNumber" message="required">
+            <span w-i18n="inputs.errors.required"></span>
+        </w-input-error>
+    </w-input-container>
+
+    <div class="fee margin-top-1 margin-1" ng-if="!$ctrl.termsLoadError && !$ctrl.termsIsPending && $ctrl.isBankAccepted">
+        <w-fee-list tx="$ctrl.wavesTx"
+                    disabled="!$ctrl.isVerified || !$ctrl.termsAccepted"
+                    balance-hash="$ctrl.state.moneyHash"
+                    fee="$ctrl.tx.fee"></w-fee-list>
+    </div>
+
+    <div ng-if="!$ctrl.hasFee" class="commission-error margin-top-1 margin-2 footnote error-500">
+        <span w-i18n="modal.send.validationError.notEnoughFunds"
+              params="{fee: $ctrl.tx.fee}"></span>
+    </div>
+
     <div ng-if="$ctrl.isBankAccepted" class="margin-top-2">
         <w-coinomat-terms force-show-terms="::false"
                           terms-pending="$ctrl.termsIsPending"
@@ -118,4 +152,14 @@
                           terms-accepted="$ctrl.termsAccepted"></w-coinomat-terms>
     </div>
 
+<!--    <div class="margin-top-3">-->
+<!--        <w-sign-button-->
+<!--                ng-if="!$ctrl.termsLoadError && !$ctrl.termsIsPending && !($ctrl.toBankMode && $ctrl.isLira)"-->
+<!--                on-click="$ctrl.createTx()"-->
+<!--                on-success="$ctrl.onSignTx(signable)"-->
+<!--                disabled="$ctrl.bankSend.$invalid || (!$ctrl.bankSend.$invalid && !$ctrl.hasFee) || (!$ctrl.termsAccepted)">-->
+<!--            <span w-i18n="button.continue"></span>-->
+<!--        </w-sign-button>-->
+<!--    </div>-->
+
 </form>

From ed6464d80c6b3fb7963fa0f6aabba4b73a4171f1 Mon Sep 17 00:00:00 2001
From: okanishcheva <okanishcheva@wavesplatform.com>
Date: Thu, 22 Aug 2019 12:48:41 +0300
Subject: [PATCH 07/18] DEXW-1239: save

---
 .../singleSend/bankSend/BankSend.js           | 32 ++++++++++++++++++-
 .../singleSend/bankSend/bank-send.html        | 21 ++++++------
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
index 454b79170d..9cc612b480 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
@@ -134,6 +134,14 @@
                 recipient: WavesApp.bankRecipient,
                 assetId: ''
             };
+            /**
+             * @type {Function}
+             */
+            onSign = null;
+            /**
+             * @type {Function}
+             */
+            onChangeMode = null;
 
             $postLink() {
 
@@ -217,6 +225,28 @@
                 this.focus = '';
             }
 
+            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;
+            }
+
+            onSignTx(signable) {
+                analytics.send({ name: 'Transfer Continue Click', target: 'ui' });
+                this.onSign({ signable });
+            }
+
             /**
              * @private
              */
@@ -374,7 +404,7 @@
     angular.module('app.ui').component('wBankSend', {
         bindings: {
             state: '<',
-            onContinue: '&',
+            onSign: '&',
             onChangeMode: '&'
         },
         templateUrl: 'modules/utils/modals/sendAsset/components/singleSend/bankSend/bank-send.html',
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
index b47e1b3475..96b4ce2bcf 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/bank-send.html
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/bank-send.html
@@ -82,7 +82,8 @@
 
         </div>
 
-        <div class="like-input-error multiline" ng-if="$ctrl.bankSend.amount.$touched && $ctrl.bankSend.amount.$invalid && $ctrl.focus !== 'amount'">
+        <div ng-if="$ctrl.isVerified && $ctrl.bankSend.amount.$touched && $ctrl.bankSend.amount.$invalid && $ctrl.focus !== 'amount'"
+             class="like-input-error multiline" >
             <div class="error">
                 <span ng-if="$ctrl.bankSend.amount.$error.required"
                       class="error-list-row"
@@ -152,14 +153,14 @@
                           terms-accepted="$ctrl.termsAccepted"></w-coinomat-terms>
     </div>
 
-<!--    <div class="margin-top-3">-->
-<!--        <w-sign-button-->
-<!--                ng-if="!$ctrl.termsLoadError && !$ctrl.termsIsPending && !($ctrl.toBankMode && $ctrl.isLira)"-->
-<!--                on-click="$ctrl.createTx()"-->
-<!--                on-success="$ctrl.onSignTx(signable)"-->
-<!--                disabled="$ctrl.bankSend.$invalid || (!$ctrl.bankSend.$invalid && !$ctrl.hasFee) || (!$ctrl.termsAccepted)">-->
-<!--            <span w-i18n="button.continue"></span>-->
-<!--        </w-sign-button>-->
-<!--    </div>-->
+    <div class="margin-top-3">
+        <w-sign-button
+                ng-if="!$ctrl.termsLoadError && !$ctrl.termsIsPending"
+                on-click="$ctrl.createTx()"
+                on-success="$ctrl.onSignTx(signable)"
+                disabled="$ctrl.bankSend.$invalid || !$ctrl.hasFee || !$ctrl.termsAccepted">
+            <span w-i18n="button.continue"></span>
+        </w-sign-button>
+    </div>
 
 </form>

From 38227de39cc4149b178c86facda4228e9492a3ab Mon Sep 17 00:00:00 2001
From: okanishcheva <okanishcheva@wavesplatform.com>
Date: Thu, 22 Aug 2019 15:03:57 +0300
Subject: [PATCH 08/18] DEXW-1239: save

---
 .../utils/modals/sendAsset/AssetSendCtrl.js   | 29 ++++++++-------
 .../components/singleSend/SingleSend.js       | 37 -------------------
 .../singleSend/gatewaySend/GatewaySend.js     |  1 -
 .../components/singleSend/single-send.html    | 20 ----------
 .../utils/modals/sendAsset/send.modal.html    | 32 +++++++++++++---
 5 files changed, 43 insertions(+), 76 deletions(-)
 delete mode 100644 src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js
 delete mode 100644 src/modules/utils/modals/sendAsset/components/singleSend/single-send.html

diff --git a/src/modules/utils/modals/sendAsset/AssetSendCtrl.js b/src/modules/utils/modals/sendAsset/AssetSendCtrl.js
index 340032d8cc..4a05671983 100644
--- a/src/modules/utils/modals/sendAsset/AssetSendCtrl.js
+++ b/src/modules/utils/modals/sendAsset/AssetSendCtrl.js
@@ -24,13 +24,6 @@
                 return this.state.moneyHash && this.state.moneyHash[this.state.assetId];
             }
 
-            /**
-             * @return {boolean}
-             */
-            get outerSendMode() {
-                return this.state.outerSendMode;
-            }
-
             /**
              * @return {IGatewayDetails}
              */
@@ -74,13 +67,17 @@
                 this.state = {
                     assetId: options.assetId || WavesApp.defaultAssets.WAVES,
                     mirrorId: user.getSetting('baseAssetId'),
-                    outerSendMode: false,
                     gatewayDetails: null,
                     moneyHash: null,
                     singleSend: utils.liteObject({ type: SIGN_TYPE.TRANSFER }),
-                    massSend: utils.liteObject({ type: SIGN_TYPE.MASS_TRANSFER }),
-                    toBankMode: false
+                    massSend: utils.liteObject({ type: SIGN_TYPE.MASS_TRANSFER })
                 };
+
+                /**
+                 * @type {ISendMode}
+                 */
+                this.sendMode = 'waves';
+
                 this.receive(balanceWatcher.change, this._updateBalanceList, this);
                 this._updateBalanceList();
                 /**
@@ -115,7 +112,7 @@
                     this.state.singleSend.recipient = options.recipient;
                     this.state.singleSend.attachment = options.attachment;
 
-                    const toGateway = this.outerSendMode && this.gatewayDetails;
+                    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);
@@ -166,6 +163,10 @@
                 }
             }
 
+            onChangeMode(mode) {
+                this.sendMode = mode;
+            }
+
             /**
              * @private
              */
@@ -274,8 +275,6 @@
  * @typedef {object} ISendState
  * @property {string} assetId
  * @property {string} mirrorId
- * @property {boolean} outerSendMode
- * @property {boolean} toBankMode
  * @property {IGatewayDetails} gatewayDetails
  * @property {Object.<string, Money>} moneyHash
  * @property {ISingleSendTx} singleSend
@@ -297,3 +296,7 @@
  * @property {boolean} [strict]
  * @property {string} [referrer]
  */
+
+/**
+ * @typedef {'waves' | 'bank' | 'gataway'} ISendMode
+ */
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 d59babc41b..0000000000
--- a/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js
+++ /dev/null
@@ -1,37 +0,0 @@
-(function () {
-    'use strict';
-
-    const controller = function () {
-
-        class SingleSend {
-
-            /**
-             * @type {ISendMode}
-             */
-            sendMode = 'waves';
-
-            onChangeMode(mode) {
-                this.sendMode = mode;
-            }
-
-            onSign(signable) {
-                this.onContinue({ signable });
-            }
-
-        }
-
-        return new SingleSend();
-    };
-
-    controller.$inject = [];
-
-    angular.module('app.ui').component('wSingleSend', {
-        bindings: {
-            state: '<',
-            onContinue: '&'
-        },
-        templateUrl: 'modules/utils/modals/sendAsset/components/singleSend/single-send.html',
-        transclude: true,
-        controller
-    });
-})();
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
index 3e1dbb2dec..6ed09f79bb 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
@@ -281,7 +281,6 @@
                     this.gatewayError = false;
                 }
                 if (this.gatewayDetailsError) {
-                    this.outerSendMode = false;
                     this.gatewayDetailsError = false;
                 }
 
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/single-send.html b/src/modules/utils/modals/sendAsset/components/singleSend/single-send.html
deleted file mode 100644
index 29a8d3897a..0000000000
--- a/src/modules/utils/modals/sendAsset/components/singleSend/single-send.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<w-waves-send ng-if="$ctrl.sendMode === 'waves'"
-              state="$ctrl.state"
-              on-sign="$ctrl.onSign(signable)"
-              on-change-mode="$ctrl.onChangeMode(mode)">
-    <ng-transclude></ng-transclude>
-</w-waves-send>
-
-<w-gateway-send ng-if="$ctrl.sendMode === 'gateway'"
-                state="$ctrl.state"
-                on-sign="$ctrl.onSign(signable)"
-                on-change-mode="$ctrl.onChangeMode(mode)">
-    <ng-transclude></ng-transclude>
-</w-gateway-send>
-
-<w-bank-send ng-if="$ctrl.sendMode === 'bank'"
-             state="$ctrl.state"
-             on-sign="$ctrl.onSign(signable)"
-             on-change-mode="$ctrl.onChangeMode(mode)">
-    <ng-transclude></ng-transclude>
-</w-bank-send>
diff --git a/src/modules/utils/modals/sendAsset/send.modal.html b/src/modules/utils/modals/sendAsset/send.modal.html
index 7e3965db00..fe7e40b4ce 100644
--- a/src/modules/utils/modals/sendAsset/send.modal.html
+++ b/src/modules/utils/modals/sendAsset/send.modal.html
@@ -3,15 +3,33 @@
         <div class="modal-content">
             <div class="btn icon-close ng-scope" w-modal-close></div>
             <w-step-by-step active-step="$ctrl.step" ng-if="!$ctrl.errorOccured">
+
                 <w-step class="send-form">
 
                     <w-tabs class="header" ng-model="$ctrl.tab">
                         <w-tab title-name="::'modal.send.sendTitle'" id="::'singleSend'">
                             <w-permit name="CAN_TRANSFER_TRANSACTION" mode="on">
-                                <w-single-send state="$ctrl.state"
-                                               on-continue="$ctrl.nextStep(signable)">
+
+                                <w-waves-send ng-if="$ctrl.sendMode === 'waves'"
+                                              state="$ctrl.state"
+                                              on-sign="$ctrl.nextStep(signable)"
+                                              on-change-mode="$ctrl.onChangeMode(mode)">
+                                    <ng-include src="::$ctrl.headerPath"></ng-include>
+                                </w-waves-send>
+
+                                <w-gateway-send ng-if="$ctrl.sendMode === 'gateway'"
+                                                state="$ctrl.state"
+                                                on-sign="$ctrl.nextStep(signable)"
+                                                on-change-mode="$ctrl.onChangeMode(mode)">
+                                    <ng-include src="::$ctrl.headerPath"></ng-include>
+                                </w-gateway-send>
+
+                                <w-bank-send ng-if="$ctrl.sendMode === 'bank'"
+                                             state="$ctrl.state"
+                                             on-sign="$ctrl.nextStep(signable)"
+                                             on-change-mode="$ctrl.onChangeMode(mode)">
                                     <ng-include src="::$ctrl.headerPath"></ng-include>
-                                </w-single-send>
+                                </w-bank-send>
                             </w-permit>
                             <w-permit name="CAN_TRANSFER_TRANSACTION" mode="off">
                                 <div class="center">
@@ -64,8 +82,9 @@
 
                     </w-tabs>
                 </w-step>
+
                 <w-step>
-                    <w-confirm-transaction ng-if="!$ctrl.outerSendMode"
+                    <w-confirm-transaction ng-if="$ctrl.sendMode !== 'gateway'"
                                            on-click-back="$ctrl.back()"
                                            no-back-button="$ctrl.strict"
                                            on-tx-sent="$ctrl.onTxSent(id)"
@@ -74,13 +93,15 @@
                                            show-validation-errors="$ctrl.strict"
                                            signable="$ctrl.signable"></w-confirm-transaction>
 
-                    <w-confirm-gateway-transaction ng-if="$ctrl.outerSendMode"
+                    <w-confirm-gateway-transaction ng-if="$ctrl.sendMode === 'gateway'"
                                                    on-click-back="$ctrl.back()"
                                                    gateway-details="$ctrl.state.gatewayDetails"
                                                    target-recipient="$ctrl.state.singleSend.recipient"
                                                    signable="$ctrl.signable"></w-confirm-gateway-transaction>
                 </w-step>
+
             </w-step-by-step>
+
             <div class="error-content" ng-if="$ctrl.errorOccured">
                 <div class="error-title headline-2">
                     <span w-i18n="modal.send.errors.title"></span>
@@ -96,6 +117,7 @@ <h3 class="text-center margin-4 basic-700">
                     <span w-i18n="modal.send.errors.button"></span>
                 </w-button>
             </div>
+
         </div>
     </md-dialog-content>
 </md-dialog>

From 1ac6a681a4fa5808d07f9576c4a8b45d97edb21b Mon Sep 17 00:00:00 2001
From: okanishcheva <okanishcheva@wavesplatform.com>
Date: Thu, 22 Aug 2019 15:58:48 +0300
Subject: [PATCH 09/18] DEXW-1239: save progress

---
 .../utils/modals/sendAsset/AssetSendCtrl.js   | 65 +++++++++++++++----
 .../singleSend/gatewaySend/GatewaySend.js     | 30 +--------
 .../singleSend/wavesSend/WavesSend.js         | 25 ++-----
 .../utils/modals/sendAsset/send.modal.html    |  7 +-
 4 files changed, 66 insertions(+), 61 deletions(-)

diff --git a/src/modules/utils/modals/sendAsset/AssetSendCtrl.js b/src/modules/utils/modals/sendAsset/AssetSendCtrl.js
index 4a05671983..2e787d39a7 100644
--- a/src/modules/utils/modals/sendAsset/AssetSendCtrl.js
+++ b/src/modules/utils/modals/sendAsset/AssetSendCtrl.js
@@ -2,6 +2,10 @@
     'use strict';
 
     const { SIGN_TYPE } = require('@waves/signature-adapter');
+    const FIAT_ASSETS = {
+        [WavesApp.defaultAssets.USD]: true,
+        [WavesApp.defaultAssets.EUR]: true
+    };
 
     /**
      * @param $scope
@@ -11,9 +15,10 @@
      * @param {User} user
      * @param {$mdDialog} $mdDialog
      * @param {BalanceWatcher} balanceWatcher
+     * @param {IOuterBlockchains} outerBlockchains
      * @return {AssetSendCtrl}
      */
-    const controller = function ($scope, waves, Base, utils, user, $mdDialog, balanceWatcher) {
+    const controller = function ($scope, waves, Base, utils, user, $mdDialog, balanceWatcher, outerBlockchains) {
 
         class AssetSendCtrl extends Base {
 
@@ -41,10 +46,6 @@
                  * @type {string}
                  */
                 this.headerPath = 'modules/utils/modals/sendAsset/send-header.html';
-                /**
-                 * @type {typeof WavesApp.defaultAssets}
-                 */
-                this.defaultAssets = WavesApp.defaultAssets;
                 /**
                  * @type {Array<Money>}
                  */
@@ -80,10 +81,13 @@
 
                 this.receive(balanceWatcher.change, this._updateBalanceList, this);
                 this._updateBalanceList();
-                /**
-                 * @type {*}
-                 */
-                this.txInfo = Object.create(null);
+
+                this.receive(utils.observe(this.state, 'assetId'), this.onChangeAssetId, this);
+                this.onChangeAssetId();
+
+                this.receive(utils.observe(this.state.singleSend, 'recipient'), this.onChangeRecipient, this);
+                this.onChangeRecipient();
+
                 /**
                  * @type {string}
                  */
@@ -163,7 +167,7 @@
                 }
             }
 
-            onChangeMode(mode) {
+            setMode(mode) {
                 this.sendMode = mode;
             }
 
@@ -215,6 +219,44 @@
                 });
             }
 
+            onChangeAssetId() {
+                if (this._isFiat()) {
+                    this.setMode('bank');
+                } else if (this._isOuterBlockchains()) {
+                    this.setMode('gateway');
+                } else {
+                    this.setMode('waves');
+                }
+            }
+
+            onChangeRecipient() {
+                if (this._isOuterBlockchains()) {
+                    this.setMode('gateway');
+                } else {
+                    this.setMode('waves');
+                }
+            }
+
+            /**
+             * @return {boolean}
+             * @private
+             */
+            _isFiat() {
+                return FIAT_ASSETS[this.state.assetId] || false;
+            }
+
+            /**
+             * @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;
+            }
+
             /**
              * @return {boolean}
              * @private
@@ -235,7 +277,8 @@
         'utils',
         'user',
         '$mdDialog',
-        'balanceWatcher'
+        'balanceWatcher',
+        'outerBlockchains'
     ];
 
     angular.module('app.utils')
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
index 6ed09f79bb..4131121738 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
@@ -11,10 +11,9 @@
      * @param {app.utils} utils
      * @param {User} user
      * @param {Waves} waves
-     * @param {IOuterBlockchains} outerBlockchains
      * @param {GatewayService} gatewayService
      */
-    const controller = function (Base, $scope, utils, user, waves, outerBlockchains, gatewayService) {
+    const controller = function (Base, $scope, utils, user, waves, gatewayService) {
 
         class GatewaySend extends Base {
 
@@ -57,10 +56,6 @@
              * @type {Function}
              */
             onSign = null;
-            /**
-             * @type {Function}
-             */
-            onChangeMode = null;
             /**
              * @type {ISingleSendTx}
              */
@@ -158,10 +153,6 @@
                 this._updateGatewayDetails();
             }
 
-            setSendMode(mode) {
-                this.onChangeMode({ mode });
-            }
-
             /**
              * @param {string} url
              * @return {null}
@@ -323,23 +314,10 @@
              * @private
              */
             _onUpdateRecipient() {
-                this._checkOuterBlockchains();
+                this.onChangeRecipient();
                 this._updateGatewayDetails();
             }
 
-            /**
-             * @private
-             */
-            _checkOuterBlockchains() {
-                const outerChain = outerBlockchains[this.assetId];
-                const isValidWavesAddress = user.isValidAddress(this.tx.recipient);
-                const gatewayAddress = !isValidWavesAddress &&
-                    outerChain && outerChain.isValidAddress(this.tx.recipient);
-                if (!gatewayAddress) {
-                    this.setSendMode('waves');
-                }
-            }
-
             /**
              * @private
              */
@@ -494,15 +472,13 @@
         'utils',
         'user',
         'waves',
-        'outerBlockchains',
         'gatewayService'
     ];
 
     angular.module('app.ui').component('wGatewaySend', {
         bindings: {
             state: '<',
-            onSign: '&',
-            onChangeMode: '&'
+            onSign: '&'
         },
         templateUrl: 'modules/utils/modals/sendAsset/components/singleSend/gatewaySend/gateway-send.html',
         transclude: true,
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
index 9b791d10b1..9f823169e7 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
@@ -16,14 +16,12 @@
      * @param {app.utils} utils
      * @param {User} user
      * @param {Waves} waves
-     * @param {IOuterBlockchains} outerBlockchains
      */
     const controller = function (Base,
                                  $scope,
                                  utils,
                                  waves,
-                                 user,
-                                 outerBlockchains) {
+                                 user) {
 
         class WavesSend extends Base {
 
@@ -413,23 +411,10 @@
              * @private
              */
             _onUpdateRecipient() {
-                this._checkOuterBlockchains();
+                this.onChangeRecipient();
                 this._validateForm();
             }
 
-            /**
-             * @private
-             */
-            _checkOuterBlockchains() {
-                const outerChain = outerBlockchains[this.assetId];
-                const isValidWavesAddress = user.isValidAddress(this.tx.recipient);
-                const gatewayAddress = !isValidWavesAddress &&
-                                        outerChain && outerChain.isValidAddress(this.tx.recipient);
-                if (gatewayAddress) {
-                    this.setSendMode('gateway');
-                }
-            }
-
         }
 
         return new WavesSend();
@@ -440,15 +425,15 @@
         '$scope',
         'utils',
         'waves',
-        'user',
-        'outerBlockchains'
+        'user'
     ];
 
     angular.module('app.ui').component('wWavesSend', {
         bindings: {
             state: '<',
             onSign: '&',
-            onChangeMode: '&'
+            onChangeMode: '&',
+            onChangeRecipient: '&'
         },
         templateUrl: 'modules/utils/modals/sendAsset/components/singleSend/wavesSend/waves-send.html',
         transclude: true,
diff --git a/src/modules/utils/modals/sendAsset/send.modal.html b/src/modules/utils/modals/sendAsset/send.modal.html
index fe7e40b4ce..93f135857d 100644
--- a/src/modules/utils/modals/sendAsset/send.modal.html
+++ b/src/modules/utils/modals/sendAsset/send.modal.html
@@ -13,21 +13,22 @@
                                 <w-waves-send ng-if="$ctrl.sendMode === 'waves'"
                                               state="$ctrl.state"
                                               on-sign="$ctrl.nextStep(signable)"
-                                              on-change-mode="$ctrl.onChangeMode(mode)">
+                                              on-change-mode="$ctrl.setMode(mode)"
+                                              on-change-recipient="$ctrl.onChangeRecipient()">
                                     <ng-include src="::$ctrl.headerPath"></ng-include>
                                 </w-waves-send>
 
                                 <w-gateway-send ng-if="$ctrl.sendMode === 'gateway'"
                                                 state="$ctrl.state"
                                                 on-sign="$ctrl.nextStep(signable)"
-                                                on-change-mode="$ctrl.onChangeMode(mode)">
+                                                on-change-recipient="$ctrl.onChangeRecipient()">
                                     <ng-include src="::$ctrl.headerPath"></ng-include>
                                 </w-gateway-send>
 
                                 <w-bank-send ng-if="$ctrl.sendMode === 'bank'"
                                              state="$ctrl.state"
                                              on-sign="$ctrl.nextStep(signable)"
-                                             on-change-mode="$ctrl.onChangeMode(mode)">
+                                             on-change-mode="$ctrl.setMode(mode)">
                                     <ng-include src="::$ctrl.headerPath"></ng-include>
                                 </w-bank-send>
                             </w-permit>

From 9975a3f17edd4311202599e9c18c51cc8ca60a28 Mon Sep 17 00:00:00 2001
From: okanishcheva <okanishcheva@wavesplatform.com>
Date: Thu, 22 Aug 2019 16:24:14 +0300
Subject: [PATCH 10/18] DEXW-1239: set gateway details

---
 .../components/singleSend/bankSend/BankSend.js    |  4 ++++
 .../singleSend/gatewaySend/GatewaySend.js         | 15 +++++++++++----
 .../components/singleSend/wavesSend/WavesSend.js  |  4 ++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
index 9cc612b480..3e8beadf19 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
@@ -181,6 +181,10 @@
                     onHasMoneyHash();
                 }
 
+                if (this.state.gatewayDetails) {
+                    this.state.gatewayDetails = null;
+                }
+
                 this.receive(utils.observe(this.state, 'moneyHash'), () => {
                     this._onChangeBaseAssets();
                     this._onChangeFee();
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
index 4131121738..60eadc53f6 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
@@ -52,6 +52,17 @@
                 return this.moneyHash[this.assetId];
             }
 
+            /**
+             * @return {IGatewayDetails|*|null}
+             */
+            get gatewayDetails() {
+                return this.state.gatewayDetails;
+            }
+
+            set gatewayDetails(value) {
+                this.state.gatewayDetails = value;
+            }
+
             /**
              * @type {Function}
              */
@@ -67,10 +78,6 @@
                 recipient: '',
                 assetId: ''
             };
-            /**
-             * @type {IGatewayDetails}
-             */
-            gatewayDetails = null;
             /**
              * @type {boolean}
              */
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
index 9f823169e7..e090181aec 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
@@ -146,6 +146,10 @@
                     onHasMoneyHash();
                 }
 
+                if (this.state.gatewayDetails) {
+                    this.state.gatewayDetails = null;
+                }
+
                 this.receive(utils.observe(this.state, 'moneyHash'), () => {
                     this._onChangeFee();
                     this._setMinAndMaxAmount();

From f5e492b4c46bd4c5b06427523d5837c3f39fb6ef Mon Sep 17 00:00:00 2001
From: okanishcheva <okanishcheva@wavesplatform.com>
Date: Thu, 22 Aug 2019 18:47:17 +0300
Subject: [PATCH 11/18] DEXW-1239: save progress

---
 .../components/singleSend/SingleSend.js       | 315 ++++++++++++++++++
 .../singleSend/bankSend/BankSend.js           | 264 ++-------------
 .../singleSend/gatewaySend/GatewaySend.js     | 256 +-------------
 .../singleSend/wavesSend/WavesSend.js         | 295 +---------------
 4 files changed, 360 insertions(+), 770 deletions(-)
 create mode 100644 src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js

diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js
new file mode 100644
index 0000000000..a0f2e4dcb5
--- /dev/null
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js
@@ -0,0 +1,315 @@
+(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<string, Money>}
+             */
+            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 {$rootScope.Scope}
+             * @private
+             */
+            __$scope = null;
+
+            constructor($scope) {
+                super($scope);
+                this.test = 'test';
+                this.__$scope = $scope;
+            }
+
+            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.mirror = amount.convertTo(this.moneyHash[this.mirrorId].asset, rate);
+                    this.tx.amount = amount;
+                    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.focus === 'mirror') {
+                    this._fillAmount();
+                }
+            }
+
+            /**
+             * @private
+             */
+            _onChangeAmount() {
+                if (!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);
+                });
+            }
+
+            /**
+             * @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);
+                });
+            }
+
+        }
+
+        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
index 3e8beadf19..be509d424a 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
@@ -2,49 +2,20 @@
     'use strict';
 
     const { Money } = require('@waves/data-entities');
-    const { SIGN_TYPE } = require('@waves/signature-adapter');
+
     const MIN_TOKEN_COUNT = 100;
     const MAX_TOKEN_COUNT = 50000;
 
     /**
-     * @param {Base} Base
+     * @param {SingleSend} SingleSend
      * @param {$rootScope.Scope} $scope
      * @param {ConfigService} configService
      * @param {Waves} waves
      * @param {app.utils} utils
      */
-    const controller = function (Base,
-                                 $scope,
-                                 configService,
-                                 waves,
-                                 utils) {
+    const controller = function (SingleSend, $scope, configService, waves, utils) {
 
-        class BankSend extends Base {
-
-            /**
-             * @return {string}
-             */
-            get assetId() {
-                return this.state.assetId;
-            }
-
-            set assetId(id) {
-                this.state.assetId = id;
-            }
-
-            /**
-             * @return {Money}
-             */
-            get balance() {
-                return this.moneyHash[this.assetId];
-            }
-
-            /**
-             * @return {Object<string, Money>}
-             */
-            get moneyHash() {
-                return this.state.moneyHash;
-            }
+        class BankSend extends SingleSend {
 
             /**
              * @return {boolean}
@@ -61,20 +32,6 @@
                 return this.termsLoadError || this.termsIsPending;
             }
 
-            /**
-             * @return {string}
-             */
-            get mirrorId() {
-                return this.state.mirrorId;
-            }
-
-            /**
-             * @return {ISingleSendTx}
-             */
-            get tx() {
-                return this.state.singleSend;
-            }
-
             /**
              * @type {boolean}
              */
@@ -87,34 +44,6 @@
              * @type {boolean}
              */
             termsAccepted = false;
-            /**
-             * @type {boolean}
-             */
-            noMirror = false;
-            /**
-             * @type {Money}
-             */
-            minAmount = null;
-            /**
-             * @type {Money}
-             */
-            maxAmount = null;
-            /**
-             * @type {Array}
-             */
-            feeList = [];
-            /**
-             * @type {boolean}
-             */
-            hasFee = true;
-            /**
-             * @type {string}
-             */
-            focus = '';
-            /**
-             * @type {Money | null}
-             */
-            mirror = null;
             /**
              * @type {Money | null}
              */
@@ -123,28 +52,18 @@
              * @type {boolean}
              */
             canShowAmount = false;
-            /**
-             * @type {ISingleSendTx}
-             */
-            wavesTx = {
-                type: SIGN_TYPE.TRANSFER,
-                amount: null,
-                attachment: '',
-                fee: null,
-                recipient: WavesApp.bankRecipient,
-                assetId: ''
-            };
-            /**
-             * @type {Function}
-             */
-            onSign = null;
             /**
              * @type {Function}
              */
             onChangeMode = null;
 
-            $postLink() {
+            constructor(props) {
+                super(props);
+                this.test = 'test';
+                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);
@@ -170,7 +89,6 @@
                     this.receive(utils.observe(this.tx, 'attachment'), this._updateWavesTxObject, this);
 
                     this._onChangeBaseAssets();
-                    this._setMinAndMaxAmount();
                     this._onChangeFee();
                     this._updateWavesTxObject();
                 };
@@ -188,6 +106,7 @@
                 this.receive(utils.observe(this.state, 'moneyHash'), () => {
                     this._onChangeBaseAssets();
                     this._onChangeFee();
+                    this._setMinAndMaxAmount();
                 });
             }
 
@@ -202,33 +121,6 @@
                 this.onChangeMode({ mode });
             }
 
-            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.mirror = amount.convertTo(this.moneyHash[this.mirrorId].asset, rate);
-                    this.tx.amount = amount;
-                    $scope.$apply();
-                });
-            }
-
-            onBlurMirror() {
-                if (!this.mirror) {
-                    this._fillMirror();
-                }
-                this.focus = '';
-            }
-
             createTx() {
                 const attachmentString = this.tx.attachment ? this.tx.attachment.toString() : '';
                 const tx = waves.node.transactions.createTransaction({
@@ -246,24 +138,6 @@
                 return signable;
             }
 
-            onSignTx(signable) {
-                analytics.send({ name: 'Transfer Continue Click', target: 'ui' });
-                this.onSign({ signable });
-            }
-
-            /**
-             * @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
              */
@@ -287,104 +161,6 @@
                 }
             }
 
-            /**
-             * @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
-             */
-            _onChangeAmount() {
-                if (!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);
-                });
-            }
-
-            /**
-             * @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);
-                });
-            }
-
-            /**
-             * @private
-             */
-            _onChangeAmountMirror() {
-                if (this.focus === 'mirror') {
-                    this._fillAmount();
-                }
-            }
-
             /**
              * @private
              */
@@ -398,12 +174,26 @@
                 };
             }
 
+            /**
+             * @private
+             */
+            _onChangeAssetId() {
+                super._onChangeAssetId();
+                this._setMinAndMaxAmount();
+            }
+
         }
 
-        return new BankSend();
+        return new BankSend($scope);
     };
 
-    controller.$inject = ['Base', '$scope', 'configService', 'waves', 'utils'];
+    controller.$inject = [
+        'SingleSend',
+        '$scope',
+        'configService',
+        'waves',
+        'utils'
+    ];
 
     angular.module('app.ui').component('wBankSend', {
         bindings: {
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
index 60eadc53f6..841f4d4b52 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
@@ -1,56 +1,20 @@
 (function () {
     'use strict';
 
-    const { SIGN_TYPE } = require('@waves/signature-adapter');
     const { Money } = require('@waves/data-entities');
     const { BigNumber } = require('@waves/bignumber');
 
     /**
-     * @param {Base} Base
+     * @param {SingleSend} SingleSend
      * @param {$rootScope.Scope} $scope
      * @param {app.utils} utils
      * @param {User} user
      * @param {Waves} waves
      * @param {GatewayService} gatewayService
      */
-    const controller = function (Base, $scope, utils, user, waves, gatewayService) {
+    const controller = function (SingleSend, $scope, utils, user, waves, gatewayService) {
 
-        class GatewaySend extends Base {
-
-            /**
-             * @return {ISingleSendTx}
-             */
-            get tx() {
-                return this.state.singleSend;
-            }
-
-            /**
-             * @return {string}
-             */
-            get assetId() {
-                return this.state.assetId;
-            }
-
-            /**
-             * @return {string}
-             */
-            get mirrorId() {
-                return this.state.mirrorId;
-            }
-
-            /**
-             * @return {Object<string, Money>}
-             */
-            get moneyHash() {
-                return this.state.moneyHash;
-            }
-
-            /**
-             * @return {Money}
-             */
-            get balance() {
-                return this.moneyHash[this.assetId];
-            }
+        class GatewaySend extends SingleSend {
 
             /**
              * @return {IGatewayDetails|*|null}
@@ -63,21 +27,6 @@
                 this.state.gatewayDetails = value;
             }
 
-            /**
-             * @type {Function}
-             */
-            onSign = null;
-            /**
-             * @type {ISingleSendTx}
-             */
-            wavesTx = {
-                type: SIGN_TYPE.TRANSFER,
-                amount: null,
-                attachment: '',
-                fee: null,
-                recipient: '',
-                assetId: ''
-            };
             /**
              * @type {boolean}
              */
@@ -94,30 +43,6 @@
              * @type {boolean}
              */
             gatewayWrongAddress = false;
-            /**
-             * @type {Money | null}
-             */
-            mirror = null;
-            /**
-             * @type {string}
-             */
-            focus = '';
-            /**
-             * @type {boolean}
-             */
-            hasFee = true;
-            /**
-             * @type {Array}
-             */
-            feeList = [];
-            /**
-             * @type {Money}
-             */
-            minAmount = null;
-            /**
-             * @type {Money}
-             */
-            maxAmount = null;
             /**
              * @type {Money}
              */
@@ -160,59 +85,6 @@
                 this._updateGatewayDetails();
             }
 
-            /**
-             * @param {string} url
-             * @return {null}
-             */
-            onReadQrCode(url) {
-                if (!url.includes('https://')) {
-                    this.tx.recipient = url;
-                    $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.moneyHash[this.assetId].cloneWithTokens(result.amount);
-                            this._fillMirror();
-                        }
-                        $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();
-                    }
-                }
-            }
-
             /**
              * @return {boolean}
              */
@@ -222,33 +94,6 @@
                 return assetIsMonero && this.tx.recipient.length === moneroAddressLength;
             }
 
-            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.mirror = amount.convertTo(this.moneyHash[this.mirrorId].asset, rate);
-                    this.tx.amount = amount;
-                    $scope.$apply();
-                });
-            }
-
-            onBlurMirror() {
-                if (!this.mirror) {
-                    this._fillMirror();
-                }
-                this.focus = '';
-            }
-
             createTx() {
                 const fee = this.tx.amount.cloneWithTokens(this.gatewayDetails.gatewayFee);
                 const tx = waves.node.transactions.createTransaction({
@@ -266,18 +111,10 @@
                 return signable;
             }
 
-            onSignTx(signable) {
-                analytics.send({ name: 'Transfer Continue Click', target: 'ui' });
-                this.onSign({ signable });
-            }
-
             /**
              * @private
              */
             _updateGatewayDetails() {
-                if (this.gatewayError) {
-                    this.gatewayError = false;
-                }
                 if (this.gatewayDetailsError) {
                     this.gatewayDetailsError = false;
                 }
@@ -332,84 +169,6 @@
                 this.gatewayError = this.gatewayAddressError || this.gatewayDetailsError || this.gatewayWrongAddress;
             }
 
-            /**
-             * @private
-             */
-            _onChangeMirrorId() {
-                if (!this.mirrorId) {
-                    throw new Error('Has no asset id!');
-                }
-
-                if (!this.moneyHash[this.mirrorId]) {
-                    return null;
-                }
-
-                this.mirror = this.balance.cloneWithTokens('0');
-                this._onChangeAmount();
-            }
-
-            /**
-             * @private
-             */
-            _onChangeAssetId() {
-                if (!this.assetId) {
-                    throw new Error('Has no asset id!');
-                }
-
-                if (!this.balance) {
-                    return null;
-                }
-
-                this.tx.amount = this.balance.cloneWithTokens('0');
-                this.mirror = this.moneyHash[this.mirrorId].cloneWithTokens('0');
-            }
-
-            /**
-             * @private
-             */
-            _onChangeAmount() {
-                if (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);
-                });
-            }
-
-            /**
-             * @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.moneyHash[this.assetId].asset, rate);
-                });
-            }
-
-            /**
-             * @private
-             */
-            _onChangeAmountMirror() {
-                if (this.focus === 'mirror') {
-                    this._fillAmount();
-                }
-            }
-
             /**
              * @private
              */
@@ -430,9 +189,6 @@
                     const gatewayFee = this.balance.cloneWithTokens(details.gatewayFee);
                     this.feeList = [this.tx.fee, gatewayFee];
                     check(this.feeList.concat(this.balance.cloneWithTokens(details.minimumAmount)));
-                } else {
-                    this.feeList = [this.tx.fee];
-                    check(this.feeList);
                 }
             }
 
@@ -445,7 +201,7 @@
                     ...this.wavesTx,
                     recipient: this.gatewayDetails.address,
                     attachment: utils.stringToBytes(this.gatewayDetails.attachment),
-                    amount: this.tx.amount ? this.tx.amount.add(fee) : null,
+                    amount: this.tx.amount.add(fee),
                     assetId: this.assetId
                 };
             }
@@ -470,11 +226,11 @@
 
         }
 
-        return new GatewaySend();
+        return new GatewaySend($scope);
     };
 
     controller.$inject = [
-        'Base',
+        'SingleSend',
         '$scope',
         'utils',
         'user',
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
index e090181aec..8bfbdd5fd2 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
@@ -7,23 +7,17 @@
     };
 
     const ds = require('data-service');
-    const { SIGN_TYPE } = require('@waves/signature-adapter');
-    const analytics = require('@waves/event-sender');
 
     /**
-     * @param {Base} Base
+     * @param {SingleSend} SingleSend
      * @param {$rootScope.Scope} $scope
      * @param {app.utils} utils
      * @param {User} user
      * @param {Waves} waves
      */
-    const controller = function (Base,
-                                 $scope,
-                                 utils,
-                                 waves,
-                                 user) {
+    const controller = function (SingleSend, $scope, utils, waves, user) {
 
-        class WavesSend extends Base {
+        class WavesSend extends SingleSend {
 
             /**
              * @return {boolean}
@@ -32,88 +26,10 @@
                 return FIAT_ASSETS[this.assetId] || false;
             }
 
-            /**
-             * @return {ISingleSendTx}
-             */
-            get tx() {
-                return this.state.singleSend;
-            }
-
-            /**
-             * @return {string}
-             */
-            get assetId() {
-                return this.state.assetId;
-            }
-
-            /**
-             * @return {string}
-             */
-            get mirrorId() {
-                return this.state.mirrorId;
-            }
-
-            /**
-             * @return {Object<string, Money>}
-             */
-            get moneyHash() {
-                return this.state.moneyHash;
-            }
-
-            /**
-             * @return {Money}
-             */
-            get balance() {
-                return this.moneyHash[this.assetId];
-            }
-
-            /**
-             * @type {Function}
-             */
-            onSign = null;
             /**
              * @type {Function}
              */
             onChangeMode = null;
-            /**
-             * @type {string}
-             */
-            focus = '';
-            /**
-             * @type {Money | null}
-             */
-            mirror = null;
-            /**
-             * @type {boolean}
-             */
-            noMirror = false;
-            /**
-             * @type {boolean}
-             */
-            hasFee = true;
-            /**
-             * @type {Array}
-             */
-            feeList = [];
-            /**
-             * @type {Money | null}
-             */
-            minAmount = null;
-            /**
-             * @type {Money}
-             */
-            maxAmount = null;
-            /**
-             * @type {ISingleSendTx}
-             */
-            wavesTx = {
-                type: SIGN_TYPE.TRANSFER,
-                amount: null,
-                attachment: '',
-                fee: null,
-                recipient: '',
-                assetId: ''
-            };
 
             $postLink() {
                 this.receive(utils.observe(this.tx, 'recipient'), this._onUpdateRecipient, this);
@@ -180,91 +96,6 @@
                 return signable;
             }
 
-            onSignTx(signable) {
-                analytics.send({ name: 'Transfer Continue Click', target: 'ui' });
-                this.onSign({ signable });
-            }
-
-            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.moneyHash[this.assetId].cloneWithTokens('0');
-                }
-
-                waves.utils.getRate(this.assetId, this.mirrorId).then(rate => {
-                    this.mirror = amount.convertTo(this.moneyHash[this.mirrorId].asset, rate);
-                    this.tx.amount = amount;
-                    $scope.$apply();
-                });
-            }
-
-            onBlurMirror() {
-                if (!this.mirror) {
-                    this._fillMirror();
-                }
-                this.focus = '';
-            }
-
-            /**
-             * @param {string} url
-             * @return {null}
-             */
-            onReadQrCode(url) {
-                if (!url.includes('https://')) {
-                    this.tx.recipient = url;
-                    $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.moneyHash[this.assetId].cloneWithTokens(result.amount);
-                            this._fillMirror();
-                        }
-                        $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();
-                    }
-                }
-            }
-
             /**
              * @private
              */
@@ -275,6 +106,7 @@
                     ...this.wavesTx,
                     recipient: isWavesAddress && this.tx.recipient || '',
                     attachment: utils.stringToBytes(attachmentString),
+                    amount: this.tx.amount,
                     assetId: this.assetId
                 };
             }
@@ -292,71 +124,6 @@
                 }
             }
 
-            /**
-             * @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
-             */
-            _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
-             */
-            _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
-             */
-            _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
              */
@@ -368,64 +135,26 @@
             /**
              * @private
              */
-            _onChangeAmount() {
-                if (!this.noMirror && this.focus === 'amount') {
-                    this._fillMirror();
-                }
-            }
-
-            /**
-             * @private
-             */
-            _onChangeAmountMirror() {
-                if (this.focus === 'mirror') {
-                    this._fillAmount();
-                }
-            }
-
-            /**
-             * @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);
-                });
-            }
-
-            /**
-             * @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.moneyHash[this.assetId].asset, rate);
-                });
+            _onUpdateRecipient() {
+                this.onChangeRecipient();
+                this._validateForm();
             }
 
             /**
              * @private
              */
-            _onUpdateRecipient() {
-                this.onChangeRecipient();
-                this._validateForm();
+            _onChangeAssetId() {
+                super._onChangeAssetId();
+                this._setMinAndMaxAmount();
             }
 
         }
 
-        return new WavesSend();
+        return new WavesSend($scope);
     };
 
     controller.$inject = [
-        'Base',
+        'SingleSend',
         '$scope',
         'utils',
         'waves',

From ef3e09afd3de86f675c82b3c8d94ada06afa6171 Mon Sep 17 00:00:00 2001
From: okanishcheva <okanishcheva@wavesplatform.com>
Date: Fri, 23 Aug 2019 14:42:03 +0300
Subject: [PATCH 12/18] DEXW-1239: save

---
 .../utils/modals/sendAsset/AssetSendCtrl.js   | 42 ++-------
 .../singleSend/bankSend/BankSend.js           |  2 +-
 .../singleSend/gatewaySend/GatewaySend.js     | 88 +++++++++++--------
 .../utils/modals/sendAsset/send.modal.html    |  1 +
 4 files changed, 61 insertions(+), 72 deletions(-)

diff --git a/src/modules/utils/modals/sendAsset/AssetSendCtrl.js b/src/modules/utils/modals/sendAsset/AssetSendCtrl.js
index 2e787d39a7..5c01efbec5 100644
--- a/src/modules/utils/modals/sendAsset/AssetSendCtrl.js
+++ b/src/modules/utils/modals/sendAsset/AssetSendCtrl.js
@@ -2,10 +2,6 @@
     'use strict';
 
     const { SIGN_TYPE } = require('@waves/signature-adapter');
-    const FIAT_ASSETS = {
-        [WavesApp.defaultAssets.USD]: true,
-        [WavesApp.defaultAssets.EUR]: true
-    };
 
     /**
      * @param $scope
@@ -36,6 +32,11 @@
                 return this.state.gatewayDetails;
             }
 
+            /**
+             * @type {ISendMode}
+             */
+            sendMode;
+
             /**
              * @param {IAssetSendCtrl.IOptions} options
              */
@@ -74,19 +75,12 @@
                     massSend: utils.liteObject({ type: SIGN_TYPE.MASS_TRANSFER })
                 };
 
-                /**
-                 * @type {ISendMode}
-                 */
-                this.sendMode = 'waves';
-
                 this.receive(balanceWatcher.change, this._updateBalanceList, this);
                 this._updateBalanceList();
 
-                this.receive(utils.observe(this.state, 'assetId'), this.onChangeAssetId, this);
-                this.onChangeAssetId();
-
-                this.receive(utils.observe(this.state.singleSend, 'recipient'), this.onChangeRecipient, this);
-                this.onChangeRecipient();
+                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}
@@ -219,17 +213,7 @@
                 });
             }
 
-            onChangeAssetId() {
-                if (this._isFiat()) {
-                    this.setMode('bank');
-                } else if (this._isOuterBlockchains()) {
-                    this.setMode('gateway');
-                } else {
-                    this.setMode('waves');
-                }
-            }
-
-            onChangeRecipient() {
+            checkSendMode() {
                 if (this._isOuterBlockchains()) {
                     this.setMode('gateway');
                 } else {
@@ -237,14 +221,6 @@
                 }
             }
 
-            /**
-             * @return {boolean}
-             * @private
-             */
-            _isFiat() {
-                return FIAT_ASSETS[this.state.assetId] || false;
-            }
-
             /**
              * @return {boolean}
              * @private
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
index be509d424a..0718172a66 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
@@ -59,7 +59,6 @@
 
             constructor(props) {
                 super(props);
-                this.test = 'test';
                 this.wavesTx.recipient = WavesApp.bankRecipient;
             }
 
@@ -91,6 +90,7 @@
                     this._onChangeBaseAssets();
                     this._onChangeFee();
                     this._updateWavesTxObject();
+                    this._setMinAndMaxAmount();
                 };
 
                 if (!this.state.moneyHash) {
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
index 841f4d4b52..47d13160d2 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
@@ -17,7 +17,7 @@
         class GatewaySend extends SingleSend {
 
             /**
-             * @return {IGatewayDetails|*|null}
+             * @return {IGatewayDetails|null}
              */
             get gatewayDetails() {
                 return this.state.gatewayDetails;
@@ -27,6 +27,17 @@
                 this.state.gatewayDetails = value;
             }
 
+            /**
+             * @return {string}
+             */
+            get paymentId() {
+                return this.state.paymentId;
+            }
+
+            set paymentId(value) {
+                this.state.paymentId = value;
+            }
+
             /**
              * @type {boolean}
              */
@@ -115,43 +126,38 @@
              * @private
              */
             _updateGatewayDetails() {
-                if (this.gatewayDetailsError) {
-                    this.gatewayDetailsError = false;
-                }
-
-                if (this.gatewayAddressError) {
-                    this.gatewayAddressError = false;
+                this.gatewayDetailsError = false;
+                this.gatewayAddressError = false;
+                this.gatewayWrongAddress = false;
+
+                if (gatewayService.hasSupportOf(this.balance.asset, 'deposit')) {
+                    return gatewayService
+                        .getWithdrawDetails(this.balance.asset, this.tx.recipient, this.state.paymentId)
+                        .then(details => {
+                            const max = BigNumber.min(
+                                details.maximumAmount.add(details.gatewayFee),
+                                this.balance.getTokens()
+                            );
+
+                            this.gatewayDetails = details;
+                            this.minAmount = this.balance.cloneWithTokens(details.minimumAmount);
+                            this.maxAmount = this.balance.cloneWithTokens(max);
+                            this.maxGatewayAmount = Money.fromTokens(details.maximumAmount, this.balance.asset);
+                            $scope.$apply();
+                        }, e => {
+                            this.gatewayDetails = null;
+                            if (e.message === gatewayService.getAddressErrorMessage(this.balance.asset,
+                                this.tx.recipient, 'errorAddressMessage')) {
+                                this.gatewayAddressError = true;
+                            } else if (e.message === gatewayService.getWrongAddressMessage(this.balance.asset,
+                                this.tx.recipient, 'wrongAddressMessage')) {
+                                this.gatewayWrongAddress = true;
+                            } else {
+                                this.gatewayDetailsError = true;
+                            }
+                            $scope.$apply();
+                        });
                 }
-
-                if (this.gatewayWrongAddress) {
-                    this.gatewayWrongAddress = false;
-                }
-
-                return gatewayService.getWithdrawDetails(this.balance.asset, this.tx.recipient, this.state.paymentId)
-                    .then(details => {
-                        const max = BigNumber.min(
-                            details.maximumAmount.add(details.gatewayFee),
-                            this.balance.getTokens()
-                        );
-
-                        this.gatewayDetails = details;
-                        this.minAmount = this.balance.cloneWithTokens(details.minimumAmount);
-                        this.maxAmount = this.balance.cloneWithTokens(max);
-                        this.maxGatewayAmount = Money.fromTokens(details.maximumAmount, this.balance.asset);
-                        $scope.$apply();
-                    }, e => {
-                        this.gatewayDetails = null;
-                        if (e.message === gatewayService.getAddressErrorMessage(this.balance.asset,
-                            this.tx.recipient, 'errorAddressMessage')) {
-                            this.gatewayAddressError = true;
-                        } else if (e.message === gatewayService.getWrongAddressMessage(this.balance.asset,
-                            this.tx.recipient, 'wrongAddressMessage')) {
-                            this.gatewayWrongAddress = true;
-                        } else {
-                            this.gatewayDetailsError = true;
-                        }
-                        $scope.$apply();
-                    });
             }
 
             /**
@@ -224,6 +230,11 @@
                 }
             }
 
+            _onChangeAssetId() {
+                super._onChangeAssetId();
+                this._updateGatewayDetails();
+            }
+
         }
 
         return new GatewaySend($scope);
@@ -241,7 +252,8 @@
     angular.module('app.ui').component('wGatewaySend', {
         bindings: {
             state: '<',
-            onSign: '&'
+            onSign: '&',
+            onChangeRecipient: '&'
         },
         templateUrl: 'modules/utils/modals/sendAsset/components/singleSend/gatewaySend/gateway-send.html',
         transclude: true,
diff --git a/src/modules/utils/modals/sendAsset/send.modal.html b/src/modules/utils/modals/sendAsset/send.modal.html
index 93f135857d..f96cc0968a 100644
--- a/src/modules/utils/modals/sendAsset/send.modal.html
+++ b/src/modules/utils/modals/sendAsset/send.modal.html
@@ -31,6 +31,7 @@
                                              on-change-mode="$ctrl.setMode(mode)">
                                     <ng-include src="::$ctrl.headerPath"></ng-include>
                                 </w-bank-send>
+
                             </w-permit>
                             <w-permit name="CAN_TRANSFER_TRANSACTION" mode="off">
                                 <div class="center">

From 521f7cf4e0b43da50deee49bd7274b213c8be95e Mon Sep 17 00:00:00 2001
From: okanishcheva <okanishcheva@wavesplatform.com>
Date: Fri, 23 Aug 2019 15:08:22 +0300
Subject: [PATCH 13/18] DEXW-1239: fix fillMAX

---
 .../utils/modals/sendAsset/AssetSendCtrl.js      | 16 ++++++++--------
 .../components/singleSend/SingleSend.js          | 13 +++++++++++--
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/modules/utils/modals/sendAsset/AssetSendCtrl.js b/src/modules/utils/modals/sendAsset/AssetSendCtrl.js
index 5c01efbec5..c1db0199c8 100644
--- a/src/modules/utils/modals/sendAsset/AssetSendCtrl.js
+++ b/src/modules/utils/modals/sendAsset/AssetSendCtrl.js
@@ -165,6 +165,14 @@
                 this.sendMode = mode;
             }
 
+            checkSendMode() {
+                if (this._isOuterBlockchains()) {
+                    this.setMode('gateway');
+                } else {
+                    this.setMode('waves');
+                }
+            }
+
             /**
              * @private
              */
@@ -213,14 +221,6 @@
                 });
             }
 
-            checkSendMode() {
-                if (this._isOuterBlockchains()) {
-                    this.setMode('gateway');
-                } else {
-                    this.setMode('waves');
-                }
-            }
-
             /**
              * @return {boolean}
              * @private
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js
index a0f2e4dcb5..d92f574370 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js
@@ -101,6 +101,11 @@
              * @private
              */
             __$scope = null;
+            /**
+             * @type {boolean}
+             * @private
+             */
+            _noCurrentRate = false;
 
             constructor($scope) {
                 super($scope);
@@ -180,8 +185,10 @@
                 }
 
                 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();
                 });
             }
@@ -262,7 +269,7 @@
              * @private
              */
             _onChangeAmountMirror() {
-                if (this.focus === 'mirror') {
+                if (!this._noCurrentRate && this.focus === 'mirror') {
                     this._fillAmount();
                 }
             }
@@ -271,7 +278,7 @@
              * @private
              */
             _onChangeAmount() {
-                if (!this.noMirror && this.focus === 'amount') {
+                if (!this._noCurrentRate && !this.noMirror && this.focus === 'amount') {
                     this._fillMirror();
                 }
             }
@@ -287,6 +294,7 @@
 
                 waves.utils.getRate(this.assetId, this.mirrorId).then(rate => {
                     this.mirror = this.tx.amount.convertTo(this.moneyHash[this.mirrorId].asset, rate);
+                    this.__$scope.$digest();
                 });
             }
 
@@ -301,6 +309,7 @@
 
                 waves.utils.getRate(this.mirrorId, this.assetId).then(rate => {
                     this.tx.amount = this.mirror.convertTo(this.balance.asset, rate);
+                    this.__$scope.$digest();
                 });
             }
 

From 0b453e0934d1c5c7cc38a0ee20f9c5668a7c96e8 Mon Sep 17 00:00:00 2001
From: okanishcheva <okanishcheva@wavesplatform.com>
Date: Fri, 23 Aug 2019 15:40:01 +0300
Subject: [PATCH 14/18] DEXW-1239: fix gateway accepted

---
 .../singleSend/gatewaySend/GatewaySend.js        | 14 ++++++++++++--
 .../singleSend/gatewaySend/gateway-send.html     | 16 +++++++++-------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
index 47d13160d2..516175b17e 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
@@ -11,8 +11,9 @@
      * @param {User} user
      * @param {Waves} waves
      * @param {GatewayService} gatewayService
+     * @param {ConfigService} configService
      */
-    const controller = function (SingleSend, $scope, utils, user, waves, gatewayService) {
+    const controller = function (SingleSend, $scope, utils, user, waves, gatewayService, configService) {
 
         class GatewaySend extends SingleSend {
 
@@ -38,6 +39,14 @@
                 this.state.paymentId = value;
             }
 
+            /**
+             * @return {boolean}
+             */
+            get isGatewayAccepted() {
+                return !configService
+                    .get('PERMISSIONS.CANT_TRANSFER_GATEWAY').includes(this.balance.asset.id);
+            }
+
             /**
              * @type {boolean}
              */
@@ -246,7 +255,8 @@
         'utils',
         'user',
         'waves',
-        'gatewayService'
+        'gatewayService',
+        'configService'
     ];
 
     angular.module('app.ui').component('wGatewaySend', {
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
index dcaa7cbef2..0ad684ba48 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/gateway-send.html
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/gateway-send.html
@@ -26,7 +26,7 @@
         </w-input-container>
     </div>
 
-    <div ng-if="!$ctrl.gatewayError" class="row">
+    <div ng-if="!$ctrl.gatewayError && $ctrl.isGatewayAccepted" class="row">
         <div class="plate-warning margin-2">
             <div class="body-2 warning-500"
                  w-i18n="modal.send.coinomat.feeTitle"
@@ -46,7 +46,7 @@
         </div>
     </div>
 
-    <div ng-if="$ctrl.gatewayDetailsError" class="row">
+    <div ng-if="$ctrl.gatewayDetailsError || !$ctrl.isGatewayAccepted" class="row">
         <div class="plate-warning server-error">
             <div class="body-2 warning-500 margin-05"
                  w-i18n="modal.receive.gatewayError">
@@ -70,7 +70,7 @@
         </div>
     </div>
 
-    <div ng-if="$ctrl.isMoneroNotIntegratedAddress() && !$ctrl.gatewayError">
+    <div ng-if="$ctrl.isMoneroNotIntegratedAddress() && !$ctrl.gatewayError && $ctrl.isGatewayAccepted">
         <div class="body-2 margin-05" w-i18n="modal.send.moneroPaymentId"></div>
         <w-input-container class="row">
             <div>
@@ -101,7 +101,7 @@
         </w-input-container>
     </div>
 
-    <w-input-container ng-if="!$ctrl.gatewayError" class="margin-top-2">
+    <w-input-container ng-if="!$ctrl.gatewayError && $ctrl.isGatewayAccepted" class="margin-top-2">
         <div class="body-2 margin-05" w-i18n="modal.send.amount"></div>
         <div class="amount-wrap">
 
@@ -156,13 +156,14 @@
     </w-input-container>
 
     <div class="fee margin-top-1 margin-1">
-        <w-fee-list tx="$ctrl.wavesTx"
+        <w-fee-list ng-if="$ctrl.isGatewayAccepted && !$ctrl.gatewayError"
+                    tx="$ctrl.wavesTx"
                     balance-hash="$ctrl.moneyHash"
                     fee="$ctrl.tx.fee"></w-fee-list>
     </div>
 
     <div class="commission-error margin-top-1 margin-2 footnote error-500"
-         ng-if="!$ctrl.hasFee && !$ctrl.gatewayError">
+         ng-if="!$ctrl.hasFee && !$ctrl.gatewayError && $ctrl.isGatewayAccepted">
         <span w-i18n="modal.send.validationError.notEnoughFundsWithdraw"
               params="{
                         fee: $ctrl.state.singleSend.fee,
@@ -174,7 +175,8 @@
     </div>
 
     <div class="margin-top-3">
-        <w-sign-button on-click="$ctrl.createTx()"
+        <w-sign-button ng-if="$ctrl.isGatewayAccepted && !ctrl.gatewayError"
+                       on-click="$ctrl.createTx()"
                        on-success="$ctrl.onSignTx(signable)"
                        disabled="$ctrl.gatewaySend.$invalid || !$ctrl.hasFee">
             <span w-i18n="button.continue"></span>

From 6adcd42fdceeb8c097167badbb23dce35056fe03 Mon Sep 17 00:00:00 2001
From: okanishcheva <okanishcheva@wavesplatform.com>
Date: Mon, 26 Aug 2019 10:47:20 +0300
Subject: [PATCH 15/18] DEXW-1239: save

---
 .../modals/sendAsset/components/singleSend/SingleSend.js  | 1 -
 .../sendAsset/components/singleSend/bankSend/BankSend.js  | 5 +++--
 .../components/singleSend/gatewaySend/GatewaySend.js      | 2 +-
 .../components/singleSend/wavesSend/WavesSend.js          | 8 ++------
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js
index d92f574370..bcc6af1e53 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/SingleSend.js
@@ -109,7 +109,6 @@
 
             constructor($scope) {
                 super($scope);
-                this.test = 'test';
                 this.__$scope = $scope;
             }
 
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
index 0718172a66..e0a296c853 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
@@ -91,6 +91,7 @@
                     this._onChangeFee();
                     this._updateWavesTxObject();
                     this._setMinAndMaxAmount();
+                    this._validateForm();
                 };
 
                 if (!this.state.moneyHash) {
@@ -107,6 +108,7 @@
                     this._onChangeBaseAssets();
                     this._onChangeFee();
                     this._setMinAndMaxAmount();
+                    this._validateForm();
                 });
             }
 
@@ -148,8 +150,6 @@
                 this.maxAmount = Money.min(maxCoinomatAmount, this.balance);
                 this.minAmount = minCoinomatAmount;
                 this.maxCoinomatAmount = maxCoinomatAmount;
-
-                this._validateForm();
             }
 
             /**
@@ -180,6 +180,7 @@
             _onChangeAssetId() {
                 super._onChangeAssetId();
                 this._setMinAndMaxAmount();
+                this._validateForm();
             }
 
         }
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
index 516175b17e..177828d9d5 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
@@ -234,7 +234,7 @@
              * @private
              */
             _validateForm() {
-                if (this.tx.amount.getTokens().gt(0)) {
+                if (this.tx.amount && this.tx.amount.getTokens().gt(0)) {
                     this.gatewaySend.amount.$setTouched(true);
                 }
             }
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
index 8bfbdd5fd2..2c7b2f5a05 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
@@ -115,12 +115,8 @@
              * @private
              */
             _validateForm() {
-                if (this.tx.amount.getTokens().gt(0) || this.tx.recipient) {
-                    this.wavesSend.$setDirty(true);
-                    this.wavesSend.$setSubmitted(true);
-                    if (this.wavesSend.amount) {
-                        this.wavesSend.amount.$setTouched(true);
-                    }
+                if ((this.wavesSend.amount && this.tx.amount.getTokens().gt(0)) || this.tx.recipient) {
+                    this.wavesSend.amount.$setTouched(true);
                 }
             }
 

From 1b509d0418596ab6c819e74a5506f58881073e66 Mon Sep 17 00:00:00 2001
From: okanishcheva <okanishcheva@wavesplatform.com>
Date: Tue, 27 Aug 2019 12:24:27 +0300
Subject: [PATCH 16/18] DEXW-1239: refactor

---
 .../utils/modals/sendAsset/AssetSendCtrl.js   | 51 ++++++++++-
 .../singleSend/bankSend/BankSend.js           |  4 -
 .../singleSend/gatewaySend/GatewaySend.js     | 84 ++++++++-----------
 .../singleSend/gatewaySend/gateway-send.html  |  2 +-
 .../singleSend/wavesSend/WavesSend.js         |  6 +-
 .../utils/modals/sendAsset/send.modal.html    |  5 +-
 6 files changed, 89 insertions(+), 63 deletions(-)

diff --git a/src/modules/utils/modals/sendAsset/AssetSendCtrl.js b/src/modules/utils/modals/sendAsset/AssetSendCtrl.js
index c1db0199c8..e8e72f5976 100644
--- a/src/modules/utils/modals/sendAsset/AssetSendCtrl.js
+++ b/src/modules/utils/modals/sendAsset/AssetSendCtrl.js
@@ -12,9 +12,11 @@
      * @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) {
+    const controller = function ($scope, waves, Base, utils, user, $mdDialog, balanceWatcher, outerBlockchains,
+                                 gatewayService) {
 
         class AssetSendCtrl extends Base {
 
@@ -29,7 +31,7 @@
              * @return {IGatewayDetails}
              */
             get gatewayDetails() {
-                return this.state.gatewayDetails;
+                return this.state.gatewayData.details;
             }
 
             /**
@@ -69,7 +71,11 @@
                 this.state = {
                     assetId: options.assetId || WavesApp.defaultAssets.WAVES,
                     mirrorId: user.getSetting('baseAssetId'),
-                    gatewayDetails: null,
+                    gatewayData: {
+                        details: null,
+                        error: null
+                    },
+                    paymentId: '',
                     moneyHash: null,
                     singleSend: utils.liteObject({ type: SIGN_TYPE.TRANSFER }),
                     massSend: utils.liteObject({ type: SIGN_TYPE.MASS_TRANSFER })
@@ -78,6 +84,8 @@
                 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();
@@ -173,6 +181,26 @@
                 }
             }
 
+            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
              */
@@ -233,6 +261,20 @@
                 return isGatewayAddress;
             }
 
+            /**
+             * @private
+             */
+            _onChangeSendMode() {
+                if (this.sendMode === 'gateway') {
+                    this.updateGatewayData();
+                } else {
+                    this.gatewayData = {
+                        details: null,
+                        error: null
+                    };
+                }
+            }
+
             /**
              * @return {boolean}
              * @private
@@ -254,7 +296,8 @@
         'user',
         '$mdDialog',
         'balanceWatcher',
-        'outerBlockchains'
+        'outerBlockchains',
+        'gatewayService'
     ];
 
     angular.module('app.utils')
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
index e0a296c853..a7d123f88a 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
@@ -100,10 +100,6 @@
                     onHasMoneyHash();
                 }
 
-                if (this.state.gatewayDetails) {
-                    this.state.gatewayDetails = null;
-                }
-
                 this.receive(utils.observe(this.state, 'moneyHash'), () => {
                     this._onChangeBaseAssets();
                     this._onChangeFee();
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
index 177828d9d5..ba5f657e44 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
@@ -21,11 +21,7 @@
              * @return {IGatewayDetails|null}
              */
             get gatewayDetails() {
-                return this.state.gatewayDetails;
-            }
-
-            set gatewayDetails(value) {
-                this.state.gatewayDetails = value;
+                return this.state.gatewayData.details;
             }
 
             /**
@@ -35,10 +31,6 @@
                 return this.state.paymentId;
             }
 
-            set paymentId(value) {
-                this.state.paymentId = value;
-            }
-
             /**
              * @return {boolean}
              */
@@ -80,7 +72,8 @@
 
                     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._updateGatewayDetails, 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.observe('gatewayDetails', this._onChangeGatewayDetails);
@@ -101,8 +94,6 @@
                 this.receive(utils.observe(this.state, 'moneyHash'), () => {
                     this._onChangeFee();
                 });
-
-                this._updateGatewayDetails();
             }
 
             /**
@@ -134,39 +125,37 @@
             /**
              * @private
              */
-            _updateGatewayDetails() {
-                this.gatewayDetailsError = false;
-                this.gatewayAddressError = false;
-                this.gatewayWrongAddress = false;
-
-                if (gatewayService.hasSupportOf(this.balance.asset, 'deposit')) {
-                    return gatewayService
-                        .getWithdrawDetails(this.balance.asset, this.tx.recipient, this.state.paymentId)
-                        .then(details => {
-                            const max = BigNumber.min(
-                                details.maximumAmount.add(details.gatewayFee),
-                                this.balance.getTokens()
-                            );
-
-                            this.gatewayDetails = details;
-                            this.minAmount = this.balance.cloneWithTokens(details.minimumAmount);
-                            this.maxAmount = this.balance.cloneWithTokens(max);
-                            this.maxGatewayAmount = Money.fromTokens(details.maximumAmount, this.balance.asset);
-                            $scope.$apply();
-                        }, e => {
-                            this.gatewayDetails = null;
-                            if (e.message === gatewayService.getAddressErrorMessage(this.balance.asset,
-                                this.tx.recipient, 'errorAddressMessage')) {
-                                this.gatewayAddressError = true;
-                            } else if (e.message === gatewayService.getWrongAddressMessage(this.balance.asset,
-                                this.tx.recipient, 'wrongAddressMessage')) {
-                                this.gatewayWrongAddress = true;
-                            } else {
-                                this.gatewayDetailsError = true;
-                            }
-                            $scope.$apply();
-                        });
+            _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);
+                } 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();
             }
 
             /**
@@ -174,7 +163,7 @@
              */
             _onUpdateRecipient() {
                 this.onChangeRecipient();
-                this._updateGatewayDetails();
+                this.updateGatewayData();
             }
 
             /**
@@ -241,7 +230,7 @@
 
             _onChangeAssetId() {
                 super._onChangeAssetId();
-                this._updateGatewayDetails();
+                this.updateGatewayData();
             }
 
         }
@@ -263,7 +252,8 @@
         bindings: {
             state: '<',
             onSign: '&',
-            onChangeRecipient: '&'
+            onChangeRecipient: '&',
+            updateGatewayData: '&'
         },
         templateUrl: 'modules/utils/modals/sendAsset/components/singleSend/gatewaySend/gateway-send.html',
         transclude: true,
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
index 0ad684ba48..5e0e18f535 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/gateway-send.html
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/gateway-send.html
@@ -178,7 +178,7 @@
         <w-sign-button ng-if="$ctrl.isGatewayAccepted && !ctrl.gatewayError"
                        on-click="$ctrl.createTx()"
                        on-success="$ctrl.onSignTx(signable)"
-                       disabled="$ctrl.gatewaySend.$invalid || !$ctrl.hasFee">
+                       disabled="$ctrl.gatewaySend.$invalid || !$ctrl.hasFee || $ctrl.gatewayError">
             <span w-i18n="button.continue"></span>
         </w-sign-button>
     </div>
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
index 2c7b2f5a05..00b197f887 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
@@ -62,10 +62,6 @@
                     onHasMoneyHash();
                 }
 
-                if (this.state.gatewayDetails) {
-                    this.state.gatewayDetails = null;
-                }
-
                 this.receive(utils.observe(this.state, 'moneyHash'), () => {
                     this._onChangeFee();
                     this._setMinAndMaxAmount();
@@ -115,7 +111,7 @@
              * @private
              */
             _validateForm() {
-                if ((this.wavesSend.amount && this.tx.amount.getTokens().gt(0)) || this.tx.recipient) {
+                if (this.wavesSend.amount && (this.tx.amount.getTokens().gt(0) || this.tx.recipient)) {
                     this.wavesSend.amount.$setTouched(true);
                 }
             }
diff --git a/src/modules/utils/modals/sendAsset/send.modal.html b/src/modules/utils/modals/sendAsset/send.modal.html
index f96cc0968a..48c7da5640 100644
--- a/src/modules/utils/modals/sendAsset/send.modal.html
+++ b/src/modules/utils/modals/sendAsset/send.modal.html
@@ -21,7 +21,8 @@
                                 <w-gateway-send ng-if="$ctrl.sendMode === 'gateway'"
                                                 state="$ctrl.state"
                                                 on-sign="$ctrl.nextStep(signable)"
-                                                on-change-recipient="$ctrl.onChangeRecipient()">
+                                                on-change-recipient="$ctrl.onChangeRecipient()"
+                                                update-gateway-data="$ctrl.updateGatewayData()">
                                     <ng-include src="::$ctrl.headerPath"></ng-include>
                                 </w-gateway-send>
 
@@ -97,7 +98,7 @@
 
                     <w-confirm-gateway-transaction ng-if="$ctrl.sendMode === 'gateway'"
                                                    on-click-back="$ctrl.back()"
-                                                   gateway-details="$ctrl.state.gatewayDetails"
+                                                   gateway-details="$ctrl.gatewayDetails"
                                                    target-recipient="$ctrl.state.singleSend.recipient"
                                                    signable="$ctrl.signable"></w-confirm-gateway-transaction>
                 </w-step>

From 8568059079964764e3fa906cf5441477e6b22e91 Mon Sep 17 00:00:00 2001
From: okanishcheva <okanishcheva@wavesplatform.com>
Date: Tue, 27 Aug 2019 15:00:20 +0300
Subject: [PATCH 17/18] DEXW-1239: save

---
 .../singleSend/bankSend/BankSend.js           | 25 ++-----------------
 .../singleSend/bankSend/bank-send.html        |  2 +-
 .../singleSend/gatewaySend/GatewaySend.js     |  3 ++-
 .../singleSend/wavesSend/WavesSend.js         | 17 +++++--------
 4 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
index a7d123f88a..9d305aed8a 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/BankSend.js
@@ -48,10 +48,6 @@
              * @type {Money | null}
              */
             maxCoinomatAmount = null;
-            /**
-             * @type {boolean}
-             */
-            canShowAmount = false;
             /**
              * @type {Function}
              */
@@ -72,18 +68,6 @@
 
                     this.observe('mirror', this._onChangeAmountMirror);
 
-                    if (this.isBankAccepted) {
-                        this.observe(['termsLoadError', 'termsIsPending'], () => {
-                            this.canShowAmount = !this.termsLoadError && !this.termsIsPending;
-                            if (this.canShowAmount) {
-                                setTimeout(() => {
-                                    this._validateForm();
-                                    this._fillMirror();
-                                }, 0);
-                            }
-                        });
-                    }
-
                     this.receive(utils.observe(this.tx, 'amount'), this._updateWavesTxObject, this);
                     this.receive(utils.observe(this.tx, 'attachment'), this._updateWavesTxObject, this);
 
@@ -106,14 +90,9 @@
                     this._setMinAndMaxAmount();
                     this._validateForm();
                 });
-            }
 
-            // $doCheck() {
-            //     if (this.bankSend && this.bankSend.amount && !this.bankSend.amount.$touched) {
-            //         this._validateForm();
-            //         this._fillMirror();
-            //     }
-            // }
+                $scope.$watch('$ctrl.bankSend.amount', () => this._validateForm());
+            }
 
             setSendMode(mode) {
                 this.onChangeMode({ mode });
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
index 96b4ce2bcf..c12e91c1fc 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/bank-send.html
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/bankSend/bank-send.html
@@ -52,7 +52,7 @@
         </div>
     </div>
 
-    <w-input-container ng-if="$ctrl.canShowAmount" class="margin-top-2">
+    <w-input-container ng-if="!$ctrl.termsLoadError && !$ctrl.termsIsPending" class="margin-top-2">
         <div class="body-2 margin-05" w-i18n="modal.send.amount"></div>
         <div class="amount-wrap" ng-class="{'no-mirror': $ctrl.noMirror}">
 
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
index ba5f657e44..b4a13299ad 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
@@ -76,7 +76,6 @@
                     this.receive(utils.observe(this.state, 'gatewayData'), this._onUpdateGatewayData, this);
 
                     this.observe('mirror', this._onChangeAmountMirror);
-                    this.observe('gatewayDetails', this._onChangeGatewayDetails);
 
                     this.receive(utils.observe(this.tx, 'amount'), this._updateWavesTxObject, this);
                     this.receive(utils.observe(this.tx, 'recipient'), this._updateWavesTxObject, this);
@@ -141,6 +140,8 @@
                     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')) {
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
index 00b197f887..5017a55b05 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
@@ -32,7 +32,7 @@
             onChangeMode = null;
 
             $postLink() {
-                this.receive(utils.observe(this.tx, 'recipient'), this._onUpdateRecipient, this);
+                this.receive(utils.observe(this.tx, 'recipient'), this.onChangeRecipient, this);
 
                 const onHasMoneyHash = () => {
                     this.tx.amount = this.tx.amount || this.balance.cloneWithTokens('0');
@@ -48,7 +48,7 @@
                     this.receive(utils.observe(this.tx, 'recipient'), this._updateWavesTxObject, this);
                     this.receive(utils.observe(this.tx, 'attachment'), this._updateWavesTxObject, this);
 
-                    this._onUpdateRecipient();
+                    this.onChangeRecipient();
                     this._onChangeFee();
                     this._setMinAndMaxAmount();
                     this._onChangeBaseAssets();
@@ -68,6 +68,8 @@
                     this._onChangeBaseAssets();
                 });
 
+                $scope.$watch('$ctrl.wavesSend.amount', () => this._validateForm());
+
             }
 
             setSendMode(mode) {
@@ -111,7 +113,8 @@
              * @private
              */
             _validateForm() {
-                if (this.wavesSend.amount && (this.tx.amount.getTokens().gt(0) || this.tx.recipient)) {
+                const amountGtZero = this.tx.amount && this.tx.amount.getTokens().gt(0);
+                if (this.wavesSend.amount && (amountGtZero || this.tx.recipient)) {
                     this.wavesSend.amount.$setTouched(true);
                 }
             }
@@ -124,14 +127,6 @@
                 this.maxAmount = this.balance;
             }
 
-            /**
-             * @private
-             */
-            _onUpdateRecipient() {
-                this.onChangeRecipient();
-                this._validateForm();
-            }
-
             /**
              * @private
              */

From 8469c2cf180bef994aa0cbc2154df6399e9140ce Mon Sep 17 00:00:00 2001
From: okanishcheva <okanishcheva@wavesplatform.com>
Date: Tue, 27 Aug 2019 15:36:00 +0300
Subject: [PATCH 18/18] DEXW-1239: add recipient focus

---
 .../components/singleSend/gatewaySend/GatewaySend.js        | 6 ++++++
 .../sendAsset/components/singleSend/wavesSend/WavesSend.js  | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
index b4a13299ad..96661ca800 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/gatewaySend/GatewaySend.js
@@ -93,6 +93,12 @@
                 this.receive(utils.observe(this.state, 'moneyHash'), () => {
                     this._onChangeFee();
                 });
+
+                $scope.$watch('$ctrl.gatewaySend.recipient', () => {
+                    if (this.tx.recipient) {
+                        this.gatewaySend.recipient.$$element.focus();
+                    }
+                });
             }
 
             /**
diff --git a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
index 5017a55b05..779e9b8d2c 100644
--- a/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
+++ b/src/modules/utils/modals/sendAsset/components/singleSend/wavesSend/WavesSend.js
@@ -69,7 +69,11 @@
                 });
 
                 $scope.$watch('$ctrl.wavesSend.amount', () => this._validateForm());
-
+                $scope.$watch('$ctrl.wavesSend.recipient', () => {
+                    if (this.tx.recipient) {
+                        this.wavesSend.recipient.$$element.focus();
+                    }
+                });
             }
 
             setSendMode(mode) {