From 702697a9dcb74e197949af65f0fdeb6dcd7de28d Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 12 Oct 2016 11:45:11 -0400 Subject: [PATCH 01/17] prelim send screen styling --- src/js/controllers/confirm.js | 11 ++++ src/js/routes.js | 2 +- src/sass/buttons.scss | 3 +- src/sass/views/confirm.scss | 60 +++++++++---------- src/sass/views/includes/txp-details.scss | 5 +- www/views/confirm.html | 74 +++++++++++++++++++++++- 6 files changed, 119 insertions(+), 36 deletions(-) diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index d8dc250c0..7c1289967 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -40,6 +40,8 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.toAmount = parseInt($scope.toAmount); $scope.amountStr = txFormatService.formatAmountStr($scope.toAmount); + $scope.displayAmount = getDisplayAmount($scope.amountStr); + $scope.displayUnit = getDisplayUnit($scope.amountStr); var networkName = (new bitcore.Address($scope.toAddress)).network.name; $scope.network = networkName; @@ -75,6 +77,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( if (++index == wallets.length) { if (!lodash.isEmpty(filteredWallets)) { $scope.wallets = lodash.clone(filteredWallets); + setWallet($scope.wallets[0]); } else { if (!enoughFunds) @@ -123,6 +126,14 @@ angular.module('copayApp.controllers').controller('confirmController', function( }); }; + function getDisplayAmount(amountStr) { + return amountStr.split(' ')[0]; + } + + function getDisplayUnit(amountStr) { + return amountStr.split(' ')[1]; + } + var setFromPayPro = function(uri, cb) { if (!cb) cb = function() {}; diff --git a/src/js/routes.js b/src/js/routes.js index ed29cd0a0..d04fcfef1 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -986,7 +986,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr profileService.storeProfileIfDirty(); $log.debug('Profile loaded ... Starting UX.'); scannerService.gentleInitialize(); - $state.go('tabs.home'); + //$state.go('tabs.home'); } }); }); diff --git a/src/sass/buttons.scss b/src/sass/buttons.scss index 5c0c05713..0978eb2bd 100644 --- a/src/sass/buttons.scss +++ b/src/sass/buttons.scss @@ -19,7 +19,8 @@ $button-secondary-border: transparent; $button-secondary-active-bg: darken($subtle-gray, 5%); $button-secondary-active-border: transparent; -%button-standard { +%button-standard, +click-to-accept { width: 85%; max-width: 300px; margin-left: auto; diff --git a/src/sass/views/confirm.scss b/src/sass/views/confirm.scss index 667184165..00f4f0f20 100644 --- a/src/sass/views/confirm.scss +++ b/src/sass/views/confirm.scss @@ -1,30 +1,30 @@ -#view-confirm { - .icon-bitpay-card { - background-image: url("../img/icon-bitpay.svg"); - } - .slide-to-pay{ - bottom: 149px; - } - .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 { +// .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; +// } +// } diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss index 76f48336d..4cce40298 100644 --- a/src/sass/views/includes/txp-details.scss +++ b/src/sass/views/includes/txp-details.scss @@ -1,4 +1,5 @@ -#txp-details { +#txp-details, +#view-confirm { $item-lateral-padding: 20px; $item-vertical-padding: 10px; $item-border-color: #EFEFEF; @@ -8,7 +9,7 @@ background: #f5f5f5; } .slide-to-pay { - bottom: 100px; + bottom: 92px; } .head { padding: 30px $item-lateral-padding 4rem; diff --git a/www/views/confirm.html b/www/views/confirm.html index cb2a3063b..d772c9164 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -7,7 +7,77 @@ - + +
+
+
+ + Sending +
+
+
{{displayAmount}} {{displayUnit}}
+
{{alternativeAmountStr}}
+
+
+
+
+ To + + + {{toAddress}} + + +
+
+ From +
+ + + +
{{wallet.name}}
+
+
+
+ {{'Memo'|translate}} + + {{description}} + +
+
+ Fee + + {{fee}} + +
+
+
+ + + Slide to pay + + + Payment Sent + Proposal Created + + + From d10e0bfcc9254fbd2120246209c371ee8b29f65a Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 12 Oct 2016 12:15:24 -0400 Subject: [PATCH 02/17] make send screen items clickable --- src/sass/views/includes/txp-details.scss | 31 ++++++++++++++++-------- www/views/confirm.html | 17 +++++++------ 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss index 4cce40298..498665c31 100644 --- a/src/sass/views/includes/txp-details.scss +++ b/src/sass/views/includes/txp-details.scss @@ -51,7 +51,13 @@ } .item { color: #4A4A4A; - padding: $item-vertical-padding $item-lateral-padding; + padding-top: $item-vertical-padding; + padding-bottom: $item-vertical-padding; + padding-left: $item-lateral-padding; + + &:not(.item-icon-right) { + padding-right: $item-lateral-padding; + } .label { font-size: 14px; @@ -62,7 +68,8 @@ &.single-line { display: flex; align-items: center; - padding: 17px $item-lateral-padding; + padding-top: 17px; + padding-bottom: 17px; .label { margin: 0; @@ -113,15 +120,19 @@ display: flex; align-items: center; padding: .2rem 0; - i { + margin-bottom: 5px; + + > i { padding: 0; - } - img { - height: 24px; - width: 24px; - padding: 2px; - margin-right: .7rem; - box-shadow: none; + position: static; + + > img { + height: 24px; + width: 24px; + padding: 2px; + margin-right: .7rem; + box-shadow: none; + } } } diff --git a/www/views/confirm.html b/www/views/confirm.html index d772c9164..411fe4b63 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -29,7 +29,7 @@ Multiple recipients --> -
+ From
@@ -37,19 +37,22 @@
{{wallet.name}}
-
-
- {{'Memo'|translate}} + + + + {{'Add Memo'|translate}} {{description}} -
-
+ + + Fee {{fee}} -
+ + From 7f180d1335924d38114dcd674e75f54480daa3d9 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 12 Oct 2016 12:31:38 -0400 Subject: [PATCH 03/17] lighten arrows --- src/sass/icons.scss | 1 + src/sass/views/includes/txp-details.scss | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/sass/icons.scss b/src/sass/icons.scss index fd352e9ca..2cb69734f 100644 --- a/src/sass/icons.scss +++ b/src/sass/icons.scss @@ -1,5 +1,6 @@ .icon.bp-arrow-right { @extend .ion-ios-arrow-right; + color: #bfbfbf; } .icon.bp-arrow-down { diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss index 498665c31..f03cc201c 100644 --- a/src/sass/views/includes/txp-details.scss +++ b/src/sass/views/includes/txp-details.scss @@ -122,6 +122,10 @@ padding: .2rem 0; margin-bottom: 5px; + ~ .bp-arrow-right { + top: 14px; + } + > i { padding: 0; position: static; From d56504b2537e3f6664e1d46e9dee5624c2dd9e9d Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 12 Oct 2016 13:48:32 -0400 Subject: [PATCH 04/17] add click to accept component to send screen --- www/views/confirm.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/www/views/confirm.html b/www/views/confirm.html index 411fe4b63..a17a8d3b9 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -55,6 +55,12 @@ + + Click to pay + Date: Wed, 12 Oct 2016 14:04:23 -0400 Subject: [PATCH 05/17] handle insufficient funds case --- src/sass/views/includes/txp-details.scss | 4 ++++ www/views/confirm.html | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss index f03cc201c..c5d216e8f 100644 --- a/src/sass/views/includes/txp-details.scss +++ b/src/sass/views/includes/txp-details.scss @@ -49,6 +49,10 @@ span { display: block; } + .badge { + border-radius: 0; + padding: .5rem; + } .item { color: #4A4A4A; padding-top: $item-vertical-padding; diff --git a/www/views/confirm.html b/www/views/confirm.html index a17a8d3b9..0fbffddb9 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -29,7 +29,10 @@ Multiple recipients --> - +
+ Insufficient funds +
+ From
@@ -39,14 +42,14 @@
- + {{'Add Memo'|translate}} {{description}} - + Fee {{fee}} From ce298fdfb69588faf87702a4c3de051283b02a5e Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 12 Oct 2016 15:01:48 -0400 Subject: [PATCH 06/17] prelim action sheet directive --- src/js/controllers/confirm.js | 5 ++++ src/js/directives/actionSheet.js | 23 +++++++++++++++ src/sass/views/includes/actionSheet.scss | 37 ++++++++++++++++++++++++ src/sass/views/views.scss | 1 + www/views/confirm.html | 5 +++- www/views/includes/actionSheet.html | 8 +++++ 6 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 src/js/directives/actionSheet.js create mode 100644 src/sass/views/includes/actionSheet.scss create mode 100644 www/views/includes/actionSheet.html diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 7c1289967..7eeab75be 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -111,6 +111,11 @@ angular.module('copayApp.controllers').controller('confirmController', function( setWallet(wallet, true); }); + $scope.showWalletSelector = function() { + console.log('showWalletSelector called'); + $scope.showWallets = true; + }; + $scope.showDescriptionPopup = function() { var message = gettextCatalog.getString('Add description'); diff --git a/src/js/directives/actionSheet.js b/src/js/directives/actionSheet.js new file mode 100644 index 000000000..d2697e930 --- /dev/null +++ b/src/js/directives/actionSheet.js @@ -0,0 +1,23 @@ +'use strict'; + +angular.module('copayApp.directives') + .directive('actionSheet', function() { + return { + restrict: 'E', + templateUrl: 'views/includes/actionSheet.html', + transclude: true, + scope: { + show: '=actionSheetShow', + }, + link: function(scope, element, attrs) { + console.log('action sheet instantiated'); + scope.$watch('show', function() { + console.log('show called', scope.show); + }); + + scope.hide = function() { + scope.show = false; + }; + } + }; + }); diff --git a/src/sass/views/includes/actionSheet.scss b/src/sass/views/includes/actionSheet.scss new file mode 100644 index 000000000..9d2b1e173 --- /dev/null +++ b/src/sass/views/includes/actionSheet.scss @@ -0,0 +1,37 @@ +action-sheet { + .bp-action-sheet { + + &__sheet { + background: #fff; + height: 300px; + width: 100%; + position: fixed; + bottom: 0; + left: 0; + transform: translateY(100%); + transition: transform 250ms ease; + z-index: 100; + + &.slide-up { + transform: translateY(0); + } + } + + &__backdrop { + height: 100%; + width: 100%; + position: fixed; + top: 0; + left: 0; + background: rgba(0, 0, 0, 0); + transition: background 250ms ease; + pointer-events: none; + z-index: 99; + + &.fade-in { + background: rgba(0, 0, 0, .5); + pointer-events: all; + } + } + } +} diff --git a/src/sass/views/views.scss b/src/sass/views/views.scss index 8b1319ac0..8bf09e6df 100644 --- a/src/sass/views/views.scss +++ b/src/sass/views/views.scss @@ -17,6 +17,7 @@ @import "address-book"; @import "zero-state"; @import "onboarding/onboarding"; +@import "includes/actionSheet"; @import "includes/walletActivity"; @import "includes/wallets"; @import "includes/modals/modals"; diff --git a/www/views/confirm.html b/www/views/confirm.html index 0fbffddb9..dcbf0ce33 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -32,7 +32,7 @@
Insufficient funds
- + From
@@ -79,6 +79,9 @@ Payment Sent Proposal Created + + + + controls-ico-back + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/www/views/includes/actionSheet.html b/www/views/includes/actionSheet.html index 41cd68a57..b4abfffae 100644 --- a/www/views/includes/actionSheet.html +++ b/www/views/includes/actionSheet.html @@ -4,5 +4,5 @@ ng-click="hide()">
- +
From b42bf01f6a2e8b2fb30f1387b97a9b213d355c8c Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 12 Oct 2016 17:20:06 -0400 Subject: [PATCH 08/17] populate wallet list --- src/sass/views/confirm.scss | 31 ++++++++++++++++++++++++ src/sass/views/includes/actionSheet.scss | 19 ++++++++++++--- www/views/confirm.html | 21 ++++++++++++++-- www/views/includes/actionSheet.html | 2 ++ 4 files changed, 67 insertions(+), 6 deletions(-) diff --git a/src/sass/views/confirm.scss b/src/sass/views/confirm.scss index 00f4f0f20..127a13c5e 100644 --- a/src/sass/views/confirm.scss +++ b/src/sass/views/confirm.scss @@ -28,3 +28,34 @@ // margin-right: 20px; // } // } + +#view-confirm { + $border-color: #EFEFEF; + height: auto; + .wallet-selector { + .wallet { + border: 0; + padding-right: 0; + padding-top: 0; + padding-bottom: 0; + margin-bottom: 1px; + } + .wallet-details { + position: relative; + padding-top: 16px; + padding-bottom: 16px; + + &::after { + display: block; + position: absolute; + width: 100%; + height: 1px; + //background: rgba(221, 221, 221, 0.3); + background: $border-color; + bottom: 0; + right: 0; + content: ''; + } + } + } +} diff --git a/src/sass/views/includes/actionSheet.scss b/src/sass/views/includes/actionSheet.scss index 174c63671..9b482cac0 100644 --- a/src/sass/views/includes/actionSheet.scss +++ b/src/sass/views/includes/actionSheet.scss @@ -1,9 +1,10 @@ action-sheet { .bp-action-sheet { + $border-color: #EFEFEF; &__sheet { background: #fff; - height: 300px; + //height: 300px; width: 100%; position: fixed; bottom: 0; @@ -11,6 +12,11 @@ action-sheet { transform: translateY(100%); transition: transform 250ms cubic-bezier(0.4, 0.0, 0.2, 1); z-index: 100; + padding-top: 1.75rem; + padding-left: 2rem; + padding-right: .75rem; + color: #2f2f2f; + padding-bottom: 2rem; &.slide-up { transform: translateY(0); @@ -18,11 +24,16 @@ action-sheet { } .back-arrow { - padding: 1rem; - padding-top: 1.5rem; - padding-left: 2rem; + padding-bottom: 1rem; cursor: pointer; } + + .header { + font-weight: 600; + padding-bottom: 1rem; + border-bottom: 1px solid $border-color; + margin-bottom: 1px; + } } &__backdrop { diff --git a/www/views/confirm.html b/www/views/confirm.html index dcbf0ce33..4fb7dbc1b 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -79,8 +79,25 @@ Payment Sent Proposal Created - - + + + + + + +
+ + {{wallet.name}} + +

+ + 0.00 BTC + +   +

+
+ + + 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 @@ - + - + -
-
- {{wallet.name}} +
+
+
+ {{w.name}} +
+

+ + Incomplete + + + {{w.status.availableBalanceStr}} + [Balance Hidden] + + +   +

-

- - Incomplete - - - {{wallet.status.availableBalanceStr}} - [Balance Hidden] - - -   -

+
From 54530ed04aa52199569f287586e1d3108cc00fdd Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 12 Oct 2016 19:09:54 -0400 Subject: [PATCH 12/17] better handle wide screens --- src/js/routes.js | 2 +- src/sass/views/confirm.scss | 1 + src/sass/views/includes/actionSheet.scss | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/js/routes.js b/src/js/routes.js index d04fcfef1..ed29cd0a0 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -986,7 +986,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr profileService.storeProfileIfDirty(); $log.debug('Profile loaded ... Starting UX.'); scannerService.gentleInitialize(); - //$state.go('tabs.home'); + $state.go('tabs.home'); } }); }); diff --git a/src/sass/views/confirm.scss b/src/sass/views/confirm.scss index fef6505f4..c7e5e80f2 100644 --- a/src/sass/views/confirm.scss +++ b/src/sass/views/confirm.scss @@ -9,6 +9,7 @@ padding-left: 65px; padding-bottom: 0; margin-bottom: 1px; + overflow: visible; > i { padding: 0; diff --git a/src/sass/views/includes/actionSheet.scss b/src/sass/views/includes/actionSheet.scss index c07612749..b686e7c17 100644 --- a/src/sass/views/includes/actionSheet.scss +++ b/src/sass/views/includes/actionSheet.scss @@ -7,8 +7,8 @@ action-sheet { width: 100%; position: fixed; bottom: 0; - left: 0; - transform: translateY(100%); + left: 50%; + transform: translateY(100%) translateX(-50%); transition: transform 250ms cubic-bezier(0.4, 0.0, 0.2, 1); z-index: 100; padding-top: 1.75rem; @@ -16,9 +16,10 @@ action-sheet { padding-right: .75rem; color: #2f2f2f; padding-bottom: 3.5rem; + max-width: 550px; &.slide-up { - transform: translateY(0); + transform: translateY(0) translateX(-50%); box-shadow: 0px 2px 13px 3px rgba(0, 0, 0, .3); } From f9e4d731f47dbbec5010b2988e95fa85b25a5451 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 12 Oct 2016 19:19:35 -0400 Subject: [PATCH 13/17] handle really long lists of wallets in selector --- src/sass/views/includes/actionSheet.scss | 2 ++ www/views/confirm.html | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/sass/views/includes/actionSheet.scss b/src/sass/views/includes/actionSheet.scss index b686e7c17..942e9ffc9 100644 --- a/src/sass/views/includes/actionSheet.scss +++ b/src/sass/views/includes/actionSheet.scss @@ -17,6 +17,8 @@ action-sheet { color: #2f2f2f; padding-bottom: 3.5rem; max-width: 550px; + max-height: 100vh; + overflow: scroll; &.slide-up { transform: translateY(0) translateX(-50%); diff --git a/www/views/confirm.html b/www/views/confirm.html index cc76c8577..b1f28c7b3 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -7,7 +7,7 @@ - +
From d726b39b47d11b36efc0445891922ab6c2e0af81 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 12 Oct 2016 19:24:57 -0400 Subject: [PATCH 14/17] give 1 extra pixel to ensure there is no space on the right side --- src/sass/views/includes/actionSheet.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sass/views/includes/actionSheet.scss b/src/sass/views/includes/actionSheet.scss index 942e9ffc9..a0137618c 100644 --- a/src/sass/views/includes/actionSheet.scss +++ b/src/sass/views/includes/actionSheet.scss @@ -4,7 +4,7 @@ action-sheet { &__sheet { background: #fff; - width: 100%; + width: calc(100% + 1px); position: fixed; bottom: 0; left: 50%; From ec3fca4cda6691e589474d212cd6f1d807a286ef Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 12 Oct 2016 20:13:28 -0400 Subject: [PATCH 15/17] make wallet selector a standalone directive --- src/js/controllers/confirm.js | 9 +-- src/js/directives/actionSheet.js | 5 -- src/js/directives/walletSelector.js | 27 +++++++++ src/sass/views/confirm.scss | 59 +------------------- src/sass/views/includes/walletSelector.scss | 62 +++++++++++++++++++++ src/sass/views/views.scss | 1 + www/views/confirm.html | 41 +++----------- www/views/includes/walletSelector.html | 30 ++++++++++ 8 files changed, 132 insertions(+), 102 deletions(-) create mode 100644 src/js/directives/walletSelector.js create mode 100644 src/sass/views/includes/walletSelector.scss create mode 100644 www/views/includes/walletSelector.html diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 662e48329..3fa1febeb 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -113,16 +113,11 @@ angular.module('copayApp.controllers').controller('confirmController', function( }); $scope.showWalletSelector = function() { - console.log('showWalletSelector called'); - console.log('$scope.wallets', $scope.wallets); $scope.showWallets = true; }; - $scope.selectWallet = function(w) { - $timeout(function() { - $scope.showWallets = false; - }, 100); - setWallet(w); + $scope.onWalletSelect = function(wallet) { + setWallet(wallet); }; diff --git a/src/js/directives/actionSheet.js b/src/js/directives/actionSheet.js index d2697e930..4ca9fddb0 100644 --- a/src/js/directives/actionSheet.js +++ b/src/js/directives/actionSheet.js @@ -10,11 +10,6 @@ angular.module('copayApp.directives') show: '=actionSheetShow', }, link: function(scope, element, attrs) { - console.log('action sheet instantiated'); - scope.$watch('show', function() { - console.log('show called', scope.show); - }); - scope.hide = function() { scope.show = false; }; diff --git a/src/js/directives/walletSelector.js b/src/js/directives/walletSelector.js new file mode 100644 index 000000000..97149d528 --- /dev/null +++ b/src/js/directives/walletSelector.js @@ -0,0 +1,27 @@ +'use strict'; + +angular.module('copayApp.directives') + .directive('walletSelector', function($timeout) { + return { + restrict: 'E', + templateUrl: 'views/includes/walletSelector.html', + transclude: true, + scope: { + show: '=walletSelectorShow', + wallets: '=walletSelectorWallets', + selectedWallet: '=walletSelectorSelectedWallet', + onSelect: '=walletSelectorOnSelect' + }, + link: function(scope, element, attrs) { + scope.hide = function() { + scope.show = false; + }; + scope.selectWallet = function(wallet) { + $timeout(function() { + scope.hide(); + }, 100); + scope.onSelect(wallet); + }; + } + }; + }); diff --git a/src/sass/views/confirm.scss b/src/sass/views/confirm.scss index c7e5e80f2..b8500593e 100644 --- a/src/sass/views/confirm.scss +++ b/src/sass/views/confirm.scss @@ -1,60 +1,3 @@ #view-confirm { - $border-color: #EFEFEF; - height: auto; - .wallet-selector { - .wallet { - border: 0; - padding-right: 0; - padding-top: 0; - padding-left: 65px; - padding-bottom: 0; - margin-bottom: 1px; - overflow: visible; - - > i { - padding: 0; - margin-left: -5px; - - > img { - height: 39px; - width: 39px; - padding: 4px; - } - } - } - .wallet-inner { - display: flex; - position: relative; - padding-top: 16px; - padding-bottom: 16px; - - &::after { - display: block; - position: absolute; - width: 100%; - height: 1px; - background: $border-color; - bottom: 0; - 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/src/sass/views/includes/walletSelector.scss b/src/sass/views/includes/walletSelector.scss new file mode 100644 index 000000000..d0990b71b --- /dev/null +++ b/src/sass/views/includes/walletSelector.scss @@ -0,0 +1,62 @@ +wallet-selector { + + $border-color: #EFEFEF; + + .wallet-selector { + .wallet { + border: 0; + padding-right: 0; + padding-top: 0; + padding-left: 65px; + padding-bottom: 0; + margin-bottom: 1px; + overflow: visible; + + > i { + padding: 0; + margin-left: -5px; + + > img { + height: 39px; + width: 39px; + padding: 4px; + } + } + } + .wallet-inner { + display: flex; + position: relative; + padding-top: 16px; + padding-bottom: 16px; + + &::after { + display: block; + position: absolute; + width: 100%; + height: 1px; + background: $border-color; + bottom: 0; + 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/src/sass/views/views.scss b/src/sass/views/views.scss index 8bf09e6df..10e818bd6 100644 --- a/src/sass/views/views.scss +++ b/src/sass/views/views.scss @@ -27,4 +27,5 @@ @import "includes/tx-details"; @import "includes/txp-details"; @import "includes/tx-status"; +@import "includes/walletSelector"; @import "integrations/coinbase.scss"; diff --git a/www/views/confirm.html b/www/views/confirm.html index b1f28c7b3..65cd83729 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -79,38 +79,15 @@ Payment Sent Proposal Created - - - - - - -
-
-
- {{w.name}} -
-

- - Incomplete - - - {{w.status.availableBalanceStr}} - [Balance Hidden] - - -   -

-
- -
- - - + + + + From 7b1f7c35c7e0a7db5c00a343f56e275e181147fe Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 12 Oct 2016 20:28:58 -0400 Subject: [PATCH 17/17] remove color --- src/sass/views/confirm.scss | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/sass/views/confirm.scss b/src/sass/views/confirm.scss index 877973f38..172f82173 100644 --- a/src/sass/views/confirm.scss +++ b/src/sass/views/confirm.scss @@ -1,5 +1,3 @@ #view-confirm { - .bp-arrow-right { - color: #bfbfbf; - } + }