diff --git a/src/js/controllers/walletToWalletController.js b/src/js/controllers/walletToWalletController.js new file mode 100644 index 000000000..7cb467b67 --- /dev/null +++ b/src/js/controllers/walletToWalletController.js @@ -0,0 +1,14 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('walletToWalletController', function($scope, $rootScope, $log, profileService, configService) { + + $scope.$on("$ionicView.enter", function(event, data) { + $scope.walletsBch = profileService.getWallets({coin: 'bch'}); + $scope.walletsBtc = profileService.getWallets({coin: 'btc'}); + configService.whenAvailable(function(config) { + $scope.selectedPriceDisplay = config.wallet.settings.priceDisplay; + }); + }); + + +}); \ No newline at end of file diff --git a/src/js/routes.js b/src/js/routes.js index 8277314e5..72397d872 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -295,6 +295,15 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } } }) + .state('tabs.send.wallet-to-wallet', { + url: '/wallet-to-wallet', + views: { + 'tab-send@tabs': { + controller: 'walletToWalletController', + templateUrl: 'views/wallet-to-wallet-transfer.html' + } + } + }) .state('tabs.send.confirm', { url: '/confirm/:recipientType/:toAddress/:toName/:toAmount/:toEmail/:toColor/:description/:coin/:useSendMax/:fromWalletId/:displayAddress/:requiredFeeRate', views: { diff --git a/src/sass/views/views.scss b/src/sass/views/views.scss index d4ed735ed..538787901 100644 --- a/src/sass/views/views.scss +++ b/src/sass/views/views.scss @@ -8,6 +8,7 @@ @import "tab-receive"; @import "tab-scan"; @import "tab-send"; +@import "wallet-to-wallet-transfer"; @import "tab-settings"; @import "wallet-colors"; @import "walletBalance"; diff --git a/src/sass/views/wallet-to-wallet-transfer.scss b/src/sass/views/wallet-to-wallet-transfer.scss new file mode 100644 index 000000000..e909258cf --- /dev/null +++ b/src/sass/views/wallet-to-wallet-transfer.scss @@ -0,0 +1,18 @@ +#wallet-to-wallet-transfer { + .header, .list { + font-size: 12px; + margin: 20px 14px; + + .title { + font-size: 20px; + font-weight: bold; + color: $v-dark-gray; + } + .subtitle { + font-size: 12px; + line-height: 1.5em; + font-weight: 300; + color: $v-dark-gray; + } + } +} \ No newline at end of file diff --git a/www/views/tab-send.html b/www/views/tab-send.html index 8b39808db..b5d556214 100644 --- a/www/views/tab-send.html +++ b/www/views/tab-send.html @@ -22,7 +22,7 @@
- diff --git a/www/views/wallet-to-wallet-transfer.html b/www/views/wallet-to-wallet-transfer.html new file mode 100644 index 000000000..2eb2bcb11 --- /dev/null +++ b/www/views/wallet-to-wallet-transfer.html @@ -0,0 +1,43 @@ + + + {{'Wallet to wallet transfer' | translate}} + + +
+
+ Choose your origin wallet +
+
+ This is where the Bitcoin will be taken out from. +
+
+
+
+
Bitcoin Cash (BCH)
+
Instant transactions with low fees
+ +
+
+ + + +
+
+ +
+
+
Bitcoin Core (BTC)
+ +
+
+ + + +
+
+
+
\ No newline at end of file