-
Could not update Wallet
Tap to retry
-
+
Scan status finished with error
Tap to retry
-
+
{{index.totalBalanceStr}}
@@ -32,31 +31,27 @@
-
-
-
-
{{index.walletName | limitTo: 1}}
-
-
-
-
- {{index.m}} of {{index.n}}
-
-
- Multisignature wallet
- Personal Wallet
- - Testnet
-
-
+
+
{{index.walletName | limitTo: 1}}
+
+
+
+ {{index.m}} of {{index.n}}
+
+
+ Multisignature wallet
+ Personal Wallet
+ - Testnet
+
+
@@ -77,21 +72,21 @@
-
+
-
- WARNING: Wallet not registered
-
-
-
- This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information.
-
-
- Recreate
-
-
+
+ WARNING: Wallet not registered
+
+
+
+ This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information.
+
+
+
+ Recreate
+
+
diff --git a/src/css/mobile.css b/src/css/mobile.css
index 3bd3bf162..21404d8da 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -652,13 +652,13 @@ a.pin-button:active {
.animation-left.ng-enter {
-webkit-transform: translate3d(100%, 0, 0);
transform: translate3d(100%, 0, 0);
- -webkit-transition-delay: 0.1s;
+ -webkit-transition-delay: 0.05s;
opacity: 0;
}
.animation-right.ng-enter {
-webkit-transform: translate3d(-100%, 0, 0);
transform: translate3d(-100%, 0, 0);
- -webkit-transition-delay: 0.1s;
+ -webkit-transition-delay: 0.05s;
opacity: 0;
}
.animation-left.ng-enter.ng-enter-active,
@@ -672,15 +672,18 @@ a.pin-button:active {
.animation-right.ng-leave {
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
+ opacity: 0;
}
.animation-left.ng-leave.animation-left.ng-leave-active {
-webkit-transform: translate3d(-100%, 0, 0);
transform: translate3d(-100%, 0, 0);
+ -webkit-transition-delay: 0.05s;
opacity: 0;
}
.animation-right.ng-leave.animation-right.ng-leave-active {
-webkit-transform: translate3d(100%, 0, 0);
transform: translate3d(100%, 0, 0);
+ -webkit-transition-delay: 0.05s;
opacity: 0;
}
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index d18581154..ee699b1c1 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -6,12 +6,28 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.onGoingProcess = {};
self.limitHistory = 5;
- self.hideMenuBar = false;
-
function strip(number) {
return (parseFloat(number.toPrecision(12)));
};
+ self.menu = [{
+ 'title': 'Home',
+ 'icon': 'icon-home',
+ 'link': 'walletHome'
+ }, {
+ 'title': 'Receive',
+ 'icon': 'icon-receive',
+ 'link': 'receive'
+ }, {
+ 'title': 'Send',
+ 'icon': 'icon-paperplane',
+ 'link': 'send'
+ }, {
+ 'title': 'History',
+ 'icon': 'icon-history',
+ 'link': 'history'
+ }];
+
self.setOngoingProcess = function(processName, isOn) {
$log.debug('onGoingProcess', processName, isOn);
self[processName] = isOn;
@@ -193,6 +209,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.openWallet = function() {
var fc = profileService.focusedClient;
self.updateColor();
+ $rootScope.$apply();
$timeout(function() {
self.setOngoingProcess('openingWallet', true);
self.updateError = false;
diff --git a/src/js/controllers/menu.js b/src/js/controllers/menu.js
deleted file mode 100644
index 53e9a0525..000000000
--- a/src/js/controllers/menu.js
+++ /dev/null
@@ -1,27 +0,0 @@
-'use strict';
-
-angular.module('copayApp.controllers').controller('menuController', function($state) {
-
- this.menu = [{
- 'title': 'Home',
- 'icon': 'icon-home',
- 'link': 'walletHome'
- }, {
- 'title': 'Receive',
- 'icon': 'icon-receive',
- 'link': 'receive'
- }, {
- 'title': 'Send',
- 'icon': 'icon-paperplane',
- 'link': 'send'
- }, {
- 'title': 'History',
- 'icon': 'icon-history',
- 'link': 'history'
- }];
-
- this.go = function(state) {
- $state.go(state);
- };
-
-});
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index dbb0aa999..2450616cb 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -194,7 +194,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
};
$scope.cancel = function() {
- $modalInstance.close();
+ $modalInstance.dismiss('cancel');
};
};