Merge pull request #170 from cmgustavo/one-view-02

scroll

public/views/includes/topbar.html

@@ -1,4 +1,4 @@
-<nav ng-controller="topbarController as topbar" class="tab-bar">
+<nav ng-controller="topbarController as topbar" class="tab-bar animated fadeIn">
   <section class="left-small">
     <a class="p10" ng-show="!goBackToState && !index.noFocusedWallet" 
       ng-click="index.openMenu()"><i class="fi-list size-24"></i>

src/css/main.css

@@ -144,6 +144,7 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
 .main {
   background-color: #fff;
   padding: 45px 0 80px 0;
+  position: relative;
 }
 
 .logo-setup {
@@ -1113,7 +1114,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
   top:auto;
   left:0;
   right:0;
-  bottom:90px;
+  bottom: 130px;
   margin: auto;
   border-radius: 3px;     
   color: #fff;

src/css/mobile.css

@@ -642,24 +642,22 @@ a.pin-button:active {
 
 .animation-left.ng-enter, .animation-left.ng-leave, 
 .animation-right.ng-enter, .animation-right.ng-leave { 
-  -webkit-transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 250ms;
-  -moz-transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 250ms;
-  -ms-transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 250ms;
-  -o-transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 250ms;
-  transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 250ms;
+  -webkit-transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 300ms;
+  -moz-transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 300ms;
+  -ms-transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 300ms;
+  -o-transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 300ms;
+  transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 300ms;
 }
 
 .animation-left.ng-enter {
   -webkit-transform: translate3d(100%, 0, 0);
   transform: translate3d(100%, 0, 0);
-  -webkit-transition-delay: 0.05s;
-  opacity: 0;
+  opacity: 0.6;
 }
 .animation-right.ng-enter {
   -webkit-transform: translate3d(-100%, 0, 0);
   transform: translate3d(-100%, 0, 0);
-  -webkit-transition-delay: 0.05s;
-  opacity: 0;
+  opacity: 0.6;
 }
 .animation-left.ng-enter.ng-enter-active,
 .animation-right.ng-enter.ng-enter-active {
@@ -672,19 +670,17 @@ a.pin-button:active {
 .animation-right.ng-leave {
   -webkit-transform: translate3d(0, 0, 0);
   transform: translate3d(0, 0, 0);
-  opacity: 0;
+  opacity: 0.6;
 }
 .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;
+  opacity: 0.6;
 }
 .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;
+  opacity: 0.6;
 }
 
 .tab-view {
@@ -692,6 +688,8 @@ a.pin-button:active {
   transform: translate3d(-100%, 0, 0);
   width:100%;
   position: absolute;
+  margin-bottom: 50px;
+  height: 100%;
 }
 
 .tab-in {

src/js/controllers/walletHome.js

@@ -403,6 +403,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
   };
 
   this.setError = function(err) {
+    var fc = profileService.focusedClient;
     $log.warn(err);
     var errMessage = 'The transaction' + (fc.credentials.m > 1 ? ' proposal' : '') +
 
@@ -425,6 +426,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
   };
 
   this.submitForm = function(form) {
+    var fc = profileService.focusedClient;
     var unitToSat = this.unitToSatoshi;
 
     if (form.$invalid) {
@@ -489,6 +491,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
 
 
   this.signAndBroadcast = function(txp, cb) {
+    var fc = profileService.focusedClient;
     self.setOngoingProcess('Signing');
     fc.signTxProposal(txp, function(err, signedTx) {
       profileService.lockFC();
@@ -584,6 +587,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
 
   this.openPPModal = function(paypro) {
     var ModalInstanceCtrl = function($scope, $modalInstance) {
+      var fc = profileService.focusedClient;
       var satToUnit = 1 / self.unitToSatoshi;
       $scope.paypro = paypro;
       $scope.alternative = self.alternativeAmount;
@@ -605,6 +609,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
   };
 
   this.setFromPayPro = function(uri, form) {
+    var fc = profileService.focusedClient;
     if (isChromeApp) {
       this.error = 'Payment Protocol not supported on Chrome App';
       return;