From fde06ae18877a30968fc210b1622fcfe59dae00a Mon Sep 17 00:00:00 2001
From: Max Axenov <maksenov@wavesplatform.com>
Date: Tue, 5 Nov 2019 16:06:10 +0300
Subject: [PATCH 1/3] DEXW-2298: add withdraw by gateway support

---
 src/modules/utils/services/gateways/CoinomatService.js     | 3 +--
 src/modules/utils/services/gateways/WavesGatewayService.js | 2 +-
 src/modules/utils/services/outerBlockchains.js             | 4 +++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/modules/utils/services/gateways/CoinomatService.js b/src/modules/utils/services/gateways/CoinomatService.js
index 30c850b49f..3173166cfd 100644
--- a/src/modules/utils/services/gateways/CoinomatService.js
+++ b/src/modules/utils/services/gateways/CoinomatService.js
@@ -2,7 +2,6 @@
     'use strict';
 
     const GATEWAYS = {
-        [WavesApp.defaultAssets.BTC]: { waves: 'WBTC', gateway: 'BTC' },
         [WavesApp.defaultAssets.BSV]: { waves: 'WBSV', gateway: 'BSV' },
         [WavesApp.defaultAssets.LTC]: { waves: 'WLTC', gateway: 'LTC' },
         [WavesApp.defaultAssets.ZEC]: { waves: 'WZEC', gateway: 'ZEC' },
@@ -91,7 +90,7 @@
             getSupportMap(asset) {
                 if (GATEWAYS[asset.id]) {
                     return {
-                        deposit: asset.id !== WavesApp.defaultAssets.BTC,
+                        deposit: true,
                         withdraw: true,
                         errorAddressMessage: true
                     };
diff --git a/src/modules/utils/services/gateways/WavesGatewayService.js b/src/modules/utils/services/gateways/WavesGatewayService.js
index 0fd39bff4e..71030eaa63 100644
--- a/src/modules/utils/services/gateways/WavesGatewayService.js
+++ b/src/modules/utils/services/gateways/WavesGatewayService.js
@@ -31,7 +31,7 @@
                 if (GATEWAYS[asset.id]) {
                     return {
                         deposit: true,
-                        withdraw: asset.id !== WavesApp.defaultAssets.BTC,
+                        withdraw: true,
                         errorAddressMessage: true,
                         wrongAddressMessage: true
                     };
diff --git a/src/modules/utils/services/outerBlockchains.js b/src/modules/utils/services/outerBlockchains.js
index 9e6c89ef06..02517dba90 100644
--- a/src/modules/utils/services/outerBlockchains.js
+++ b/src/modules/utils/services/outerBlockchains.js
@@ -4,7 +4,9 @@
     const factory = function (waves) {
 
         const VALIDATOR = {
-            [WavesApp.defaultAssets.BTC]: /^([13][a-km-zA-HJ-NP-Z1-9]{25,34}|(bc1)[a-z0-9]{25,90})$/,
+            [WavesApp.defaultAssets.BTC]: WavesApp.network.code === 'W' ?
+                /^([13][a-km-zA-HJ-NP-Z1-9]{25,34}|(bc1)[a-z0-9]{25,90})$/ :
+                /^[2mn][1-9A-HJ-NP-Za-km-z]{26,35}/,
             [WavesApp.defaultAssets.ETH]: /^0x[0-9a-f]{40}$/i,
             [WavesApp.defaultAssets.LTC]: /^[LM3][a-km-zA-HJ-NP-Z1-9]{26,33}$/,
             [WavesApp.defaultAssets.ZEC]: /^t[0-9a-z]{34}$/i,

From 45a0e33bfbf08f9308caac9ecd1189b56e6577e3 Mon Sep 17 00:00:00 2001
From: Max Axenov <maksenov@wavesplatform.com>
Date: Wed, 6 Nov 2019 12:07:24 +0300
Subject: [PATCH 2/3] DEXW-2298: add in send list

---
 .../confirmGatewayTransaction/ConfirmGatewayTransaction.js     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/ui/directives/confirmGatewayTransaction/ConfirmGatewayTransaction.js b/src/modules/ui/directives/confirmGatewayTransaction/ConfirmGatewayTransaction.js
index dc8e22d33a..47908e543e 100644
--- a/src/modules/ui/directives/confirmGatewayTransaction/ConfirmGatewayTransaction.js
+++ b/src/modules/ui/directives/confirmGatewayTransaction/ConfirmGatewayTransaction.js
@@ -8,7 +8,8 @@
         WavesApp.defaultAssets.WEST,
         WavesApp.defaultAssets.ERGO,
         WavesApp.defaultAssets.BNT,
-        WavesApp.defaultAssets.ETH
+        WavesApp.defaultAssets.ETH,
+        WavesApp.defaultAssets.BTC
     ];
 
     /**

From db327db147af4595cb90bd4bb196dde20c2c1b8b Mon Sep 17 00:00:00 2001
From: Grigory Ivanov <givanov@web3tech.ru>
Date: Wed, 6 Nov 2019 14:38:35 +0300
Subject: [PATCH 3/3] DEXW-2307: Up version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8ef99e5de7..20d8d7e865 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "waves-client",
-  "version": "1.4.9",
+  "version": "1.4.10",
   "description": "The official client application for the Waves platform",
   "private": true,
   "repository": {