diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 256bd4f98..662e48329 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -118,6 +118,13 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.showWallets = true; }; + $scope.selectWallet = function(w) { + $timeout(function() { + $scope.showWallets = false; + }, 100); + setWallet(w); + }; + $scope.showDescriptionPopup = function() { var message = gettextCatalog.getString('Add description'); diff --git a/src/sass/views/confirm.scss b/src/sass/views/confirm.scss index 53134841c..fef6505f4 100644 --- a/src/sass/views/confirm.scss +++ b/src/sass/views/confirm.scss @@ -1,34 +1,3 @@ -// #view-confirm { -// .icon-bitpay-card { -// background-image: url("../img/icon-bitpay.svg"); -// } -// .slide-to-pay{ -// bottom: 92px; -// } -// .send-gravatar { -// left: 11px; -// position: absolute; -// top: 10px; -// } -// .accept-slide { -// position: fixed; -// bottom: 0; -// width: 100%; -// height: 100px; -// background-color: #647CE8; -// color: #ffffff; -// font-size: 25px; -// text-align: center; -// padding-top: 34px; -// line-height: 32px; -// } -// .accept-slide i { -// float: right; -// font-size: 32px; -// margin-right: 20px; -// } -// } - #view-confirm { $border-color: #EFEFEF; height: auto; @@ -52,20 +21,12 @@ } } } - .wallet-details { + .wallet-inner { + display: flex; position: relative; padding-top: 16px; padding-bottom: 16px; - .wallet-name { - padding-bottom: 5px; - } - - .wallet-balance { - color: #3A3A3A; - font-family: "Roboto-Light"; - } - &::after { display: block; position: absolute; @@ -76,6 +37,23 @@ right: 0; content: ''; } + + .check { + padding: 0 1.2rem; + } + } + .wallet-details { + flex-grow: 1; + + .wallet-name { + padding-bottom: 5px; + } + + .wallet-balance { + color: #3A3A3A; + font-family: "Roboto-Light"; + } + } } } diff --git a/www/img/icon-check-selected.svg b/www/img/icon-check-selected.svg new file mode 100644 index 000000000..e68f11eb4 --- /dev/null +++ b/www/img/icon-check-selected.svg @@ -0,0 +1,24 @@ + + + + Icons/Check/Green + Created with Sketch. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/www/views/confirm.html b/www/views/confirm.html index 81718fb60..cc76c8577 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -81,25 +81,32 @@ - + - + -
-