From b405510db3d4f12336ac34929fdcfae56268f1c2 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 9 Feb 2016 16:48:53 -0500 Subject: [PATCH 1/8] Improvement open TX modal --- Gruntfile.js | 1 - public/index.html | 25 ++-- public/views/includes/tx-details.html | 158 ++++++++++++++++++++++++++ public/views/walletHome.html | 16 ++- src/css/main.css | 9 +- src/css/mobile.css | 2 + src/js/controllers/index.js | 7 ++ src/js/controllers/tx.js | 67 +++++++++++ src/js/controllers/walletHome.js | 4 + src/js/directives/directives.js | 69 ++++++++++- src/js/routes.js | 1 - 11 files changed, 341 insertions(+), 18 deletions(-) create mode 100644 public/views/includes/tx-details.html create mode 100644 src/js/controllers/tx.js diff --git a/Gruntfile.js b/Gruntfile.js index f08be00c4..bf463a00b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -46,7 +46,6 @@ module.exports = function(grunt) { }, angular: { src: [ - 'bower_components/fastclick/lib/fastclick.js', 'bower_components/qrcode-generator/js/qrcode.js', 'bower_components/qrcode-decoder-js/lib/qrcode-decoder.js', 'bower_components/moment/min/moment-with-locales.js', diff --git a/public/index.html b/public/index.html index a385dbe5e..6522699c5 100644 --- a/public/index.html +++ b/public/index.html @@ -3,7 +3,7 @@ - + @@ -14,20 +14,19 @@ -
- -
+
+
+
+
+
+
+ +
- -
-
-
-
+ + + +
+
+
+ sync +

Received

+
+
+ sync +

Sent

+
+
+ sync +

Moved

+
+ +
+ +-{{index.showTx.amountStr}} +
+
+ + {{alternativeAmountStr}} + + + {{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}}) + +
+
+
+ - +
+
+ +

Details

+ +
    + +
  • + To + + + {{index.showTx.merchant.domain}} + {{index.showTx.merchant.domain}} + + + {{index.showTx.labelTo}} + + + +
    • + +
  • + Recipients + {{index.showTx.recipientCount}} + + + +
    • + +
    +
    + +
  • + Note + {{index.showTx.message}} +
    • + +
  • + + This transaction has become invalid; possibly due to a double spend attempt. + +
  • + Date + + + + +
    • +
  • + Fee + {{index.showTx.feeStr}} +
    • +
  • + Note + {{index.showTx.message}} +
    • +
  • + Merchant message + + {{index.showTx.merchant.pr.pd.memo}} + +
    • +
  • + Confirmations + + + Unconfirmed + + + {{index.showTx.confirmations}} + + + {{index.showTx.safeConfirmed}} + + + +
    • +
+ +
+

Participants

+
    +
  • + + + + + + {{c.copayerName}} ({{'Me'|translate}}) +
    • +
+
+ +
+
+ +
+
+ +
+
diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 89d0a8005..a2adaac87 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -199,7 +199,21 @@
diff --git a/src/css/main.css b/src/css/main.css index 3dd261ed8..f03714489 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -1399,7 +1399,14 @@ input.ng-invalid-match, input.ng-invalid-match:focus { border-top-right-radius: 5px; } -/*******************/ +.txModal { + background: #FFFFFF; + border-radius: 5px; + position: absolute; + width: 100%; + height: 100%; + z-index: 1100; +} .alertModal { background: #FFFFFF; diff --git a/src/css/mobile.css b/src/css/mobile.css index fcdc3af21..e0d5f6cf0 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -644,6 +644,8 @@ body.modal-open { .reveal-modal.animated.slideInRight, .reveal-modal.animated.slideOutRight, +.txModal.animated.slideInRight, +.txModal.animated.slideOutRight, .reveal-modal.animated.fadeOutUp, .reveal-modal.animated.slideInUp, .reveal-modal.animated.slideInDown { diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index d256afeda..a8b33cb97 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -1344,6 +1344,13 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); }); + $rootScope.$on('Local/TxModal', function(event, tx) { + self.showTx = tx; + $timeout(function() { + $rootScope.$apply(); + }); + }); + $rootScope.$on('NewIncomingTx', function() { self.newTx = true; self.updateAll({ diff --git a/src/js/controllers/tx.js b/src/js/controllers/tx.js new file mode 100644 index 000000000..93f70aec9 --- /dev/null +++ b/src/js/controllers/tx.js @@ -0,0 +1,67 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('txController', + function($rootScope, $scope, $timeout, profileService, notification, go, gettext, isCordova, nodeWebkit) { + + var fc = profileService.focusedClient; + this.color = fc.backgroundColor; + this.copayerId = fc.credentials.copayerId; + this.isShared = fc.credentials.n > 1; + + if (isCordova) { + $scope.modalOpening = true; + $timeout(function() { + $scope.modalOpening = false; + }, 300); + } + + this.getAlternativeAmount = function(btx) { +console.log('[tx.js:18]',btx); //TODO + var satToBtc = 1 / 100000000; + fc.getFiatRate({ + code: self.alternativeIsoCode, + ts: btx.time * 1000 + }, function(err, res) { +console.log('[tx.js:24]',res); //TODO + if (err) { + $log.debug('Could not get historic rate'); + return; + } + if (res && res.rate) { + var alternativeAmountBtc = (btx.amount * satToBtc).toFixed(8); + $scope.rateDate = res.fetchedOn; + $scope.rateStr = res.rate + ' ' + self.alternativeIsoCode; + $scope.alternativeAmountStr = $filter('noFractionNumber')(alternativeAmountBtc * res.rate, 2) + ' ' + self.alternativeIsoCode; + $scope.$apply(); + } + }); + }; + + this.getShortNetworkName = function() { + var n = fc.credentials.network; + return n.substring(0, 4); + }; + + this.copyAddress = function(addr) { + if (!addr) return; + if (isCordova) { + window.cordova.plugins.clipboard.copy(addr); + window.plugins.toast.showShortCenter(gettextCatalog.getString('Copied to clipboard')); + } else if (nodeWebkit.isDefined()) { + nodeWebkit.writeToClipboard(addr); + } + }; + + this.cancel = function() { + if (isCordova) { + $scope.modalClosing = true; + $timeout(function() { + $scope.modalClosing = false; + $rootScope.$emit('Local/TxModal', null); + }, 300); + } else { + $rootScope.$emit('Local/TxModal', null); + } + }; + + }); diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 7eff987b6..d2f13f912 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -1149,6 +1149,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi return this.alternativeIsoCode; }; + this.openNewTxModal = function(tx) { + $rootScope.$emit('Local/TxModal', tx); + }; + this.openTxModal = function(btx) { $rootScope.modalOpened = true; var self = this; diff --git a/src/js/directives/directives.js b/src/js/directives/directives.js index f09f8bd23..3aa66d5b6 100644 --- a/src/js/directives/directives.js +++ b/src/js/directives/directives.js @@ -317,4 +317,71 @@ angular.module('copayApp.directives') replace: true, templateUrl: 'views/includes/available-balance.html' } - }); + }) + .directive('fastClick', [ 'isCordova', '$timeout', function(isCordova, $timeout) { + return { + scope: { someCtrlFn: '&callbackFn'}, + link: function(scope, element, attrs) { + + if (!isCordova) { + element.on('click', function(){ + scope.someCtrlFn(); + console.log('click real'); + }); + } else { + var trackingClick = false; + var targetElement = null; + var touchStartX = 0; + var touchStartY = 0; + var touchBoundary = 10; + + element.on('touchstart', function(event) { + + trackingClick = true; + targetElement = event.target; + touchStartX = event.targetTouches[0].pageX; + touchStartY = event.targetTouches[0].pageY; + + console.log('PRIMER CLICKKKKKK!!'); + + return true; + }); + + element.on('touchend', function(event) { + if (trackingClick) { + scope.someCtrlFn(); + event.preventDefault(); + } + trackingClick = false; + console.log('SOLTANDO EL CLICKKKKKK!!'); + return false; + }); + + element.on('touchmove', function(event) { +console.log('[directives.js:357] MOVING 1', trackingClick); //TODO + if (!trackingClick) { + return true; + } +console.log('[directives.js:361] MOVING 2', trackingClick); //TODO + + // If the touch has moved, cancel the click tracking + if (targetElement !== event.target + || (Math.abs(event.changedTouches[0].pageX - touchStartX) > touchBoundary + || (Math.abs(event.changedTouches[0].pageY - touchStartY) > touchBoundary))) { + trackingClick = false; + targetElement = null; + } + + return true; + }); + + element.on('touchcancel', function() { + trackingClick = false; + targetElement = null; + }); + } + } + } + }]); + +; diff --git a/src/js/routes.js b/src/js/routes.js index 469d7aeb5..1e0fe8283 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -511,7 +511,6 @@ angular }); }) .run(function($rootScope, $state, $log, uriHandler, isCordova, profileService, $timeout, nodeWebkit, uxLanguage, animationService) { - FastClick.attach(document.body); uxLanguage.init(); From c25a592d1cc2f4a939749f5c1b477d5fe5672ccf Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 9 Feb 2016 16:51:00 -0500 Subject: [PATCH 2/8] Fix typo --- src/js/controllers/tx.js | 2 -- src/js/directives/directives.js | 5 ----- 2 files changed, 7 deletions(-) diff --git a/src/js/controllers/tx.js b/src/js/controllers/tx.js index 93f70aec9..5d4de53ba 100644 --- a/src/js/controllers/tx.js +++ b/src/js/controllers/tx.js @@ -16,13 +16,11 @@ angular.module('copayApp.controllers').controller('txController', } this.getAlternativeAmount = function(btx) { -console.log('[tx.js:18]',btx); //TODO var satToBtc = 1 / 100000000; fc.getFiatRate({ code: self.alternativeIsoCode, ts: btx.time * 1000 }, function(err, res) { -console.log('[tx.js:24]',res); //TODO if (err) { $log.debug('Could not get historic rate'); return; diff --git a/src/js/directives/directives.js b/src/js/directives/directives.js index 3aa66d5b6..d3be47c24 100644 --- a/src/js/directives/directives.js +++ b/src/js/directives/directives.js @@ -342,8 +342,6 @@ angular.module('copayApp.directives') touchStartX = event.targetTouches[0].pageX; touchStartY = event.targetTouches[0].pageY; - console.log('PRIMER CLICKKKKKK!!'); - return true; }); @@ -353,16 +351,13 @@ angular.module('copayApp.directives') event.preventDefault(); } trackingClick = false; - console.log('SOLTANDO EL CLICKKKKKK!!'); return false; }); element.on('touchmove', function(event) { -console.log('[directives.js:357] MOVING 1', trackingClick); //TODO if (!trackingClick) { return true; } -console.log('[directives.js:361] MOVING 2', trackingClick); //TODO // If the touch has moved, cancel the click tracking if (targetElement !== event.target From 9fedae1a674699bd516b95b806e1df2216446fd0 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 10 Feb 2016 15:35:26 -0500 Subject: [PATCH 3/8] Updates tx modal --- public/views/includes/tx-details.html | 1 - public/views/walletHome.html | 16 +----- src/css/main.css | 6 +-- src/js/controllers/tx.js | 33 ++++++++---- src/js/controllers/walletHome.js | 75 +-------------------------- src/js/directives/directives.js | 1 - 6 files changed, 27 insertions(+), 105 deletions(-) diff --git a/public/views/includes/tx-details.html b/public/views/includes/tx-details.html index ad356c598..86315a5a2 100644 --- a/public/views/includes/tx-details.html +++ b/public/views/includes/tx-details.html @@ -1,7 +1,6 @@
diff --git a/public/views/walletHome.html b/public/views/walletHome.html index a2adaac87..d3558256d 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -199,21 +199,7 @@
diff --git a/src/css/main.css b/src/css/main.css index f03714489..07083ee56 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -73,7 +73,7 @@ h4.title a { } -.preferences h4, .modal-content h4, .glidera h4 { +.preferences h4, .modal-content h4, .glidera h4, .txModal h4 { background: #F6F7F9; padding: 25px 0px 5px 10px; text-transform: uppercase; @@ -88,7 +88,7 @@ h4.title a { } -.preferences ul, .modal-content ul { +.preferences ul, .modal-content ul, .txModal ul { font-size:14px; background: white; } @@ -1400,7 +1400,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus { } .txModal { - background: #FFFFFF; + background: #f6f7f9; border-radius: 5px; position: absolute; width: 100%; diff --git a/src/js/controllers/tx.js b/src/js/controllers/tx.js index 5d4de53ba..f39ab69ab 100644 --- a/src/js/controllers/tx.js +++ b/src/js/controllers/tx.js @@ -1,21 +1,31 @@ 'use strict'; angular.module('copayApp.controllers').controller('txController', - function($rootScope, $scope, $timeout, profileService, notification, go, gettext, isCordova, nodeWebkit) { + function($rootScope, $scope, $timeout, $filter, lodash, profileService, isCordova, nodeWebkit, configService, animationService) { var fc = profileService.focusedClient; + var config = configService.getSync(); + var configWallet = config.wallet; + var walletSettings = configWallet.settings; + var m = angular.element(document.getElementsByClassName('txModal')); + m.addClass(animationService.modalAnimated.slideRight); + + this.alternativeIsoCode = walletSettings.alternativeIsoCode; this.color = fc.backgroundColor; this.copayerId = fc.credentials.copayerId; this.isShared = fc.credentials.n > 1; + if (isCordova) { - $scope.modalOpening = true; - $timeout(function() { - $scope.modalOpening = false; - }, 300); + $rootScope.modalOpened = true; + var self = this; + var disableCloseModal = $rootScope.$on('closeModal', function() { + self.cancel(); + }); } this.getAlternativeAmount = function(btx) { + var self = this; var satToBtc = 1 / 100000000; fc.getFiatRate({ code: self.alternativeIsoCode, @@ -48,18 +58,19 @@ angular.module('copayApp.controllers').controller('txController', } else if (nodeWebkit.isDefined()) { nodeWebkit.writeToClipboard(addr); } - }; + }; - this.cancel = function() { + this.cancel = lodash.debounce(function() { + m.addClass(animationService.modalAnimated.slideOutRight); if (isCordova) { - $scope.modalClosing = true; + $rootScope.modalOpened = false; + disableCloseModal(); $timeout(function() { - $scope.modalClosing = false; $rootScope.$emit('Local/TxModal', null); - }, 300); + }, 350); } else { $rootScope.$emit('Local/TxModal', null); } - }; + }, 0, 1000); }); diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index d2f13f912..5bbb9ae88 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -1149,83 +1149,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi return this.alternativeIsoCode; }; - this.openNewTxModal = function(tx) { + this.openTxModal = function(tx) { $rootScope.$emit('Local/TxModal', tx); }; - this.openTxModal = function(btx) { - $rootScope.modalOpened = true; - var self = this; - var fc = profileService.focusedClient; - var ModalInstanceCtrl = function($scope, $filter, $log, $modalInstance) { - $scope.btx = btx; - $scope.settings = walletSettings; - $scope.color = fc.backgroundColor; - $scope.copayerId = fc.credentials.copayerId; - $scope.isShared = fc.credentials.n > 1; - - $scope.getAlternativeAmount = function() { - var satToBtc = 1 / 100000000; - fc.getFiatRate({ - code: self.alternativeIsoCode, - ts: btx.time * 1000 - }, function(err, res) { - if (err) { - $log.debug('Could not get historic rate'); - return; - } - if (res && res.rate) { - var alternativeAmountBtc = (btx.amount * satToBtc).toFixed(8); - $scope.rateDate = res.fetchedOn; - $scope.rateStr = res.rate + ' ' + self.alternativeIsoCode; - $scope.alternativeAmountStr = $filter('noFractionNumber')(alternativeAmountBtc * res.rate, 2) + ' ' + self.alternativeIsoCode; - $scope.$apply(); - } - }); - }; - - $scope.getAmount = function(amount) { - return self.getAmount(amount); - }; - - $scope.getUnitName = function() { - return self.getUnitName(); - }; - - $scope.getShortNetworkName = function() { - var n = fc.credentials.network; - return n.substring(0, 4); - }; - - $scope.copyToClipboard = function(addr) { - if (!addr) return; - self.copyToClipboard(addr); - }; - - $scope.cancel = lodash.debounce(function() { - $modalInstance.dismiss('cancel'); - }, 0, 1000); - - }; - - var modalInstance = $modal.open({ - templateUrl: 'views/modals/tx-details.html', - windowClass: animationService.modalAnimated.slideRight, - controller: ModalInstanceCtrl, - }); - - var disableCloseModal = $rootScope.$on('closeModal', function() { - modalInstance.dismiss('cancel'); - }); - - modalInstance.result.finally(function() { - $rootScope.modalOpened = false; - disableCloseModal(); - var m = angular.element(document.getElementsByClassName('reveal-modal')); - m.addClass(animationService.modalAnimated.slideOutRight); - }); - }; - this.hasAction = function(actions, action) { return actions.hasOwnProperty('create'); }; diff --git a/src/js/directives/directives.js b/src/js/directives/directives.js index d3be47c24..f3f725538 100644 --- a/src/js/directives/directives.js +++ b/src/js/directives/directives.js @@ -326,7 +326,6 @@ angular.module('copayApp.directives') if (!isCordova) { element.on('click', function(){ scope.someCtrlFn(); - console.log('click real'); }); } else { var trackingClick = false; From 39341b037b4c6e2710e8a01390404041408bf368 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 10 Feb 2016 16:49:55 -0500 Subject: [PATCH 4/8] Improves more clicks --- public/index.html | 2 +- public/views/includes/sidebar.html | 2 +- public/views/includes/topbar.html | 8 +- public/views/includes/transaction.html | 2 +- public/views/includes/tx-details.html | 254 ++++++++++--------- public/views/modals/destination-address.html | 8 +- public/views/walletHome.html | 2 +- src/css/main.css | 7 + 8 files changed, 146 insertions(+), 139 deletions(-) diff --git a/public/index.html b/public/index.html index 6522699c5..efb6bba99 100644 --- a/public/index.html +++ b/public/index.html @@ -35,7 +35,7 @@ }">
- +
diff --git a/public/views/includes/sidebar.html b/public/views/includes/sidebar.html index 282e14a8f..67169ee12 100644 --- a/public/views/includes/sidebar.html +++ b/public/views/includes/sidebar.html @@ -9,7 +9,7 @@ ng-repeat="item in sidebar.wallets track by $index" ng-class="{'selected': item.id == index.walletId}" class="nav-item"> - +
diff --git a/public/views/includes/topbar.html b/public/views/includes/topbar.html index 1a7f28d40..59908279f 100644 --- a/public/views/includes/topbar.html +++ b/public/views/includes/topbar.html @@ -3,21 +3,21 @@ ng-style="{'background-color': noColor ? '#4B6178' : index.backgroundColor}">
+ fast-click callback-fn="index.openMenu()"> + fast-click callback-fn="$root.go(goBackToState); goBackToState = null"> {{'Back'|translate}} + fast-click callback-fn="topbar.goHome(); index.setCompactTxHistory(); closeToHome = null"> {{'Close'|translate}}
- +
diff --git a/public/views/includes/transaction.html b/public/views/includes/transaction.html index 4b3fa3fcb..9c37a6534 100644 --- a/public/views/includes/transaction.html +++ b/public/views/includes/transaction.html @@ -1,6 +1,6 @@
+ fast-click callback-fn="home.openTxpModal(tx, index.copayers, !!index.glideraStatus)">
diff --git a/public/views/includes/tx-details.html b/public/views/includes/tx-details.html index 86315a5a2..701ddc54c 100644 --- a/public/views/includes/tx-details.html +++ b/public/views/includes/tx-details.html @@ -1,6 +1,6 @@
@@ -18,140 +18,142 @@ -
-
-
- sync -

Received

+
+
+
+
+ sync +

Received

+
+
+ sync +

Sent

+
+
+ sync +

Moved

+
+ +
+ +-{{index.showTx.amountStr}} +
+
+ + {{alternativeAmountStr}} + + + {{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}}) + +
-
- sync -

Sent

-
-
- sync -

Moved

+
+ - +
+
+ +

Details

+ +
    + +
  • + To + + + {{index.showTx.merchant.domain}} + {{index.showTx.merchant.domain}} + + + {{index.showTx.labelTo}} + + + +
    • + +
  • + Recipients + {{index.showTx.recipientCount}} + + + +
    • + +
    + +
  • + Note + {{index.showTx.message}} +
    • -
    - +-{{index.showTx.amountStr}} -
    -
    - - {{alternativeAmountStr}} +
  • + + This transaction has become invalid; possibly due to a double spend attempt. + +
  • + Date + + + + +
    • +
  • + Fee + {{index.showTx.feeStr}} +
    • +
  • + Note + {{index.showTx.message}} +
    • +
  • + Merchant message + + {{index.showTx.merchant.pr.pd.memo}} + +
    • +
  • + Confirmations + + + Unconfirmed - - {{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}}) + + {{index.showTx.confirmations}} -
    • -
-
- - -
-
- -

Details

- -
    - -
  • - To - - - {{index.showTx.merchant.domain}} - {{index.showTx.merchant.domain}} - - - {{index.showTx.labelTo}} - - - -
    • - -
  • - Recipients - {{index.showTx.recipientCount}} - - - -
    • - -
    -
    - -
  • - Note - {{index.showTx.message}} -
    • - -
  • - - This transaction has become invalid; possibly due to a double spend attempt. - -
  • - Date - - - - -
    • -
  • - Fee - {{index.showTx.feeStr}} -
    • -
  • - Note - {{index.showTx.message}} -
    • -
  • - Merchant message - - {{index.showTx.merchant.pr.pd.memo}} - -
    • -
  • - Confirmations - - - Unconfirmed - - - {{index.showTx.confirmations}} - - - {{index.showTx.safeConfirmed}} - - - -
    • -
- -
-

Participants

-
    -
  • - - - - + + {{index.showTx.safeConfirmed}} - {{c.copayerName}} ({{'Me'|translate}}) + +
-
-
-
- +
+

Participants

+
    +
  • + + + + + + {{c.copayerName}} ({{'Me'|translate}}) +
    • +
-
-
+
+
+ +
+
+ +
+
diff --git a/public/views/modals/destination-address.html b/public/views/modals/destination-address.html index c62bf4a55..a7959b2bc 100644 --- a/public/views/modals/destination-address.html +++ b/public/views/modals/destination-address.html @@ -1,7 +1,7 @@
My contacts + ng-style="{'color':!selectedWalletsOpt ? color : 'inherit'}" translate>My contacts
diff --git a/public/views/walletHome.html b/public/views/walletHome.html index d3558256d..d33459be6 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -404,7 +404,7 @@
+ fast-click callback-fn="home.openDestinationAddressModal(index.otherWallets, _address)">
diff --git a/src/css/main.css b/src/css/main.css index 07083ee56..649380454 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -1379,6 +1379,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus { } } +<<<<<<< a4ed15ab6f9cb6ec415196f24ddee81005a8f3d6 /* Confirmation popup */ .confirmTxModal { @@ -1399,6 +1400,12 @@ input.ng-invalid-match, input.ng-invalid-match:focus { border-top-right-radius: 5px; } +.txModal-content { + overflow: auto; + height: 100%; + padding-bottom: 50px; +} + .txModal { background: #f6f7f9; border-radius: 5px; From 2384ebcf2557345ce465c45aacd069401f6cc710 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 15 Feb 2016 10:50:06 -0500 Subject: [PATCH 5/8] Fix rebase --- src/css/main.css | 1 - 1 file changed, 1 deletion(-) diff --git a/src/css/main.css b/src/css/main.css index 649380454..773895d46 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -1379,7 +1379,6 @@ input.ng-invalid-match, input.ng-invalid-match:focus { } } -<<<<<<< a4ed15ab6f9cb6ec415196f24ddee81005a8f3d6 /* Confirmation popup */ .confirmTxModal { From 55e5ca031c8eb7b63dd01ffabc06d02d32aef345 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 15 Feb 2016 11:07:54 -0500 Subject: [PATCH 6/8] Removes fastclick --- bower.json | 1 - 1 file changed, 1 deletion(-) diff --git a/bower.json b/bower.json index dce25dbc1..43c388f13 100644 --- a/bower.json +++ b/bower.json @@ -16,7 +16,6 @@ "angular-ui-router": "0.2.15", "angular-ui-switch": "0.1.1", "animate.css": "3.4.0", - "fastclick": "1.0.6", "foundation": "5.5.2", "foundation-icon-fonts": "*", "moment": "2.10.3", From 0239dc187a8a1fb365a3f89a074d853019deeb9b Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 17 Feb 2016 15:13:15 -0500 Subject: [PATCH 7/8] Fix and updates tx details --- public/views/includes/tx-details.html | 30 +++++++++++++-------------- src/js/controllers/tx.js | 9 ++++---- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/public/views/includes/tx-details.html b/public/views/includes/tx-details.html index 701ddc54c..d7a507a10 100644 --- a/public/views/includes/tx-details.html +++ b/public/views/includes/tx-details.html @@ -34,8 +34,10 @@

Moved

-
- +-{{index.showTx.amountStr}} +
+ + + - + {{index.showTx.amountStr}}
@@ -56,7 +58,7 @@
  • + ng-click="txc.copyToClipboard(index.showTx.addressTo)"> To @@ -83,11 +85,6 @@ ng-repeat="output in index.showTx.outputs" ng-include="'views/includes/output.html'">
- -
  • - Note - {{index.showTx.message}} -
  • @@ -95,22 +92,25 @@
  • Date - +
    • -
  • +
  • Fee - {{index.showTx.feeStr}} + {{index.showTx.feeStr}}
    • -
  • +
  • Note - {{index.showTx.message}} + {{index.showTx.message}}
    • -
  • +
  • Merchant message - + {{index.showTx.merchant.pr.pd.memo}}
    • diff --git a/src/js/controllers/tx.js b/src/js/controllers/tx.js index f39ab69ab..93cf26111 100644 --- a/src/js/controllers/tx.js +++ b/src/js/controllers/tx.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('txController', - function($rootScope, $scope, $timeout, $filter, lodash, profileService, isCordova, nodeWebkit, configService, animationService) { + function($rootScope, $scope, $timeout, $filter, lodash, profileService, isCordova, nodeWebkit, configService, animationService, gettextCatalog) { var fc = profileService.focusedClient; var config = configService.getSync(); @@ -50,13 +50,12 @@ angular.module('copayApp.controllers').controller('txController', return n.substring(0, 4); }; - this.copyAddress = function(addr) { - if (!addr) return; + this.copyToClipboard = function(value) { if (isCordova) { - window.cordova.plugins.clipboard.copy(addr); + window.cordova.plugins.clipboard.copy(value); window.plugins.toast.showShortCenter(gettextCatalog.getString('Copied to clipboard')); } else if (nodeWebkit.isDefined()) { - nodeWebkit.writeToClipboard(addr); + nodeWebkit.writeToClipboard(value); } }; From ff0578627f5a375bb036333a5fc1c4ea53c6b610 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 17 Feb 2016 15:47:13 -0500 Subject: [PATCH 8/8] Fix scrolling on mobile --- src/css/main.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/css/main.css b/src/css/main.css index 773895d46..68355d572 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -1407,10 +1407,11 @@ input.ng-invalid-match, input.ng-invalid-match:focus { .txModal { background: #f6f7f9; - border-radius: 5px; position: absolute; width: 100%; - height: 100%; + top: 0; + bottom: 0; + overflow: hidden; z-index: 1100; }