From 75fea8d29c7d93e53fa5cde8b4c76fdffb531d6f Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Sat, 6 Dec 2014 14:26:33 -0300
Subject: [PATCH 1/7] fixes https://github.com/bitpay/copay/issues/2005

---
 views/createProfile.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/createProfile.html b/views/createProfile.html
index 6a40342d6..6745d6fd6 100644
--- a/views/createProfile.html
+++ b/views/createProfile.html
@@ -64,7 +64,7 @@
           </tab>
           <tab style="width: 50%;" select="selectStorage('local')">
             <tab-heading>
-              <div class="m5t text-bold">In this Device </div>
+              <div class="m5t text-bold">On this Device </div>
             </tab-heading>
               <div class="content-item">
                 <div class="bg-circle"><i class="icon-locked"></i>
@@ -86,7 +86,7 @@
 
         <button  translate class="button primary radius expand m0" ng-click="goToEmail()">
           <span ng-if="!useLocalstorage"> Create in the cloud</span>
-          <span ng-if="useLocalstorage"> Create in this device</span>
+          <span ng-if="useLocalstorage"> Create on this device</span>
         </button>
 
         <div class="box-setup-footer">
@@ -113,8 +113,8 @@
           <img src="img/clipo-signup2.png" alt="clipo" width="373">
         </div>
 
-        <h2 ng-if="useLocalstorage"> Creating in this device </h2>
         <h2 ng-if="!useLocalstorage"> Creating in the cloud </h2>
+        <h2 ng-if="useLocalstorage"> Creating on this device </h2>
 
         <div class="input" ng-if="useEmail">
           <input type="email" ng-model="email" class="form-control fi-email" name="email" placeholder="Email" required auto-focus="!isMobile">
@@ -158,7 +158,7 @@
           <img src="img/clipo-signup3.png" alt="clipo" width="380">
         </div>
 
-        <h2 ng-if="useLocalstorage"> Creating in this device </h2>
+        <h2 ng-if="useLocalstorage"> Creating on this device </h2>
         <h2 ng-if="!useLocalstorage"> Creating in the cloud </h2>
         <div class="text-gray text-center m20b"> {{userOrEmail}} </div>
 

From 6f721574073ee609367370da60ccf97132b7e0da Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Sat, 6 Dec 2014 14:31:18 -0300
Subject: [PATCH 2/7] fixes https://github.com/bitpay/copay/issues/2015

---
 views/createProfile.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/createProfile.html b/views/createProfile.html
index 6745d6fd6..cd5b6706d 100644
--- a/views/createProfile.html
+++ b/views/createProfile.html
@@ -21,7 +21,7 @@
   </div>
 
   <div class="large-4 large-centered medium-6 medium-centered columns m20b" ng-show="!loading  && !askForPin">
-    <div class="logo-setup">
+    <div class="logo-setup hide-for-small-only">
       <img src="img/logo-negative-beta.svg" alt="Copay" width="100">
       <div ng-include="'views/includes/version.html'"></div>
     </div>

From de54f3aac8859d1a432e7f3feb64aa57be46ba1a Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Sat, 6 Dec 2014 15:30:32 -0300
Subject: [PATCH 3/7] fixes https://github.com/bitpay/copay/issues/2016

---
 index.html                           |  4 ++--
 js/controllers/home.js               | 19 -------------------
 js/controllers/homeWallet.js         |  2 +-
 js/services/identityService.js       | 13 +++++++++----
 views/home.html                      |  2 +-
 views/includes/walletbar-mobile.html |  5 -----
 6 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/index.html b/index.html
index b349ec383..73e813b51 100644
--- a/index.html
+++ b/index.html
@@ -62,7 +62,7 @@
             <section class="left-small">
               <a class="left-off-canvas-toggle menu-icon" ><span></span></a>
             </section>
-            <section class="right-small">
+            <section class="right-small" ng-if="$root.iden && $root.iden.listWallets().length >1">
               <a class="right-off-canvas-toggle p10"><i class="icon-wallet size-24"></i></a>
             </section>
 
@@ -77,7 +77,7 @@
             <div ng-include="'views/includes/sidebar-mobile.html'"></div>
           </aside>
 
-          <aside class="right-off-canvas-menu">
+          <aside class="right-off-canvas-menu" ng-if="$root.iden && $root.iden.listWallets().length >1">
             <div ng-include="'views/includes/walletbar-mobile.html'"></div>
           </aside>
           <div 
diff --git a/js/controllers/home.js b/js/controllers/home.js
index e75fe7638..630a7515b 100644
--- a/js/controllers/home.js
+++ b/js/controllers/home.js
@@ -56,21 +56,6 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
     }
   });
 
-  $scope.done = function() {
-    $rootScope.starting = false;
-    $rootScope.$digest();
-  };
-
-
-  $scope.$on("$destroy", function() {
-    var iden = $rootScope.iden;
-    if (iden) {
-      iden.removeListener('newWallet', $scope.done);
-      iden.removeListener('noWallets', $scope.done);
-    }
-  });
-
-
   $scope.openWithPin = function(pin) {
 
     if (!pin) {
@@ -92,11 +77,8 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
   $scope.openWallets = function() {
     preconditions.checkState($rootScope.iden);
     var iden = $rootScope.iden;
-
     $rootScope.hideNavigation = false;
     $rootScope.starting = true;
-    iden.on('newWallet', $scope.done);
-    iden.on('noWallets', $scope.done);
     iden.openWallets();
   };
 
@@ -169,7 +151,6 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
 
         // mobile
         if ($scope.isMobile && !$rootScope.hasPin) {
-          $scope.done();
           _credentials = {
             email: email,
             password: password,
diff --git a/js/controllers/homeWallet.js b/js/controllers/homeWallet.js
index 55c4a00bb..408872684 100644
--- a/js/controllers/homeWallet.js
+++ b/js/controllers/homeWallet.js
@@ -68,7 +68,7 @@ angular.module('copayApp.controllers').controller('HomeWalletController', functi
       removeWatch();
       w.removeListener('txProposalEvent', _updateTxs);
     };
-  });
+  }); 
 
   $scope.setAlternativeAmount = function(w, tx, cb) {
     rateService.whenAvailable(function() {
diff --git a/js/services/identityService.js b/js/services/identityService.js
index aa904d9ec..ab04c7ade 100644
--- a/js/services/identityService.js
+++ b/js/services/identityService.js
@@ -31,6 +31,7 @@ angular.module('copayApp.services')
     root.goWalletHome = function() {
       var w = $rootScope.wallet;
       if (w) {
+        $rootScope.starting = false;
         if (!w.isComplete()) {
           $location.path('/copayers');
         } else {
@@ -233,7 +234,7 @@ angular.module('copayApp.services')
 
       w.on('txProposalEvent', function(e) {
         if (root.isFocused(wid)) {
-          pendingTxsService.update(); 
+          pendingTxsService.update();
         }
 
         balanceService.update(w, function() {
@@ -288,7 +289,6 @@ angular.module('copayApp.services')
 
       var self = this;
       root.setupGlobalVariables(iden);
-
       iden.on('newWallet', function(wid) {
         var w = iden.getWalletById(wid);
         copay.logger.debug('newWallet:', w.getName(), wid, iden.getLastFocusedWalletId());
@@ -298,20 +298,25 @@ angular.module('copayApp.services')
           root.setFocusedWallet(w, true);
           root.goWalletHome();
         }
+
         // At the end (after all handlers are in place)...start the wallet.
         w.netStart();
       });
 
       iden.on('noWallets', function() {
+        notification.warning('No Wallets','Your profile has no wallet. Create one here');
+        $rootScope.starting = false;
         $location.path('/create');
-        $rootScope.$digest()
+        $timeout(function() {
+          $rootScope.$digest();
+        }, 1);
       });
 
       iden.on('walletDeleted', function(wid) {
         // do nothing. this is handled 'on sync' on controller.
       });
 
-      iden.on('walletStorageError', function (wid, message) {
+      iden.on('walletStorageError', function(wid, message) {
         notification.error('Error storing wallet', message);
       });
 
diff --git a/views/home.html b/views/home.html
index 5b7704af7..d61590cf8 100644
--- a/views/home.html
+++ b/views/home.html
@@ -111,7 +111,7 @@
       </form>
     </div>
 
-    <div ng-if='!$root.hasPin && !askForPin'>
+    <div ng-if='!$root.hasPin && !askForPin && !$root.iden'>
       <div class="clipo">
         <img src="img/clipo-signin.png" alt="clipo" width="310">
       </div>
diff --git a/views/includes/walletbar-mobile.html b/views/includes/walletbar-mobile.html
index e4c6f845d..e795e0357 100644
--- a/views/includes/walletbar-mobile.html
+++ b/views/includes/walletbar-mobile.html
@@ -2,11 +2,6 @@
   <header ng-show="$root.wallet">
     <h1>My wallets</h1>
   </header>
-  <div class="side-nav text-center off-canvas-list" ng-show="!wallets[0]">
-    <p class="size-12 text-gray m10t" translate>You do not have another wallets.</p>
-    <a href="#!/create" class="db button secondary tiny" title="Create new wallet">
-      <i class="m10r fi-plus"></i> {{'Create new wallet' | translate }} </a>
-  </div>
   <ul class="side-nav wallets off-canvas-list" ng-show="wallets[0]">
     <li 
       ng-repeat="item in wallets track by $index"

From 7bba75a20a13cdb983f66f2ab6c646e90d6eca79 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Sat, 6 Dec 2014 16:50:22 -0300
Subject: [PATCH 4/7] fixes https://github.com/bitpay/copay/issues/2019

---
 views/includes/sidebar-mobile.html | 49 +++++++++++++++---------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html
index c08d92a6c..3c536466d 100644
--- a/views/includes/sidebar-mobile.html
+++ b/views/includes/sidebar-mobile.html
@@ -1,38 +1,39 @@
 <div>
-  <div class="text-center off-canvas-list">
-    <a href="#!/profile" class="columns m10v" title="Profile">
-      <div class="photo-container">
-        <img gravatar-src="'{{$root.iden.getName()}}'" gravatar-size="35">
-      </div>
-      <p class="text-black m5">{{$root.iden.getName()}}</p>
-      <span class="db text-gray size-10" >
-        <i class="fi-torso"></i> {{'ViewProfile' | translate }} 
-      </span>
-    </a>
-    </div>
   <ul class="off-canvas-list">
     <li>
-    <a href="#!/create" class="db p20h nav-item" title="Create new wallet">
-      <i class="size-24 m20r fi-plus"></i> {{'Create new wallet' | translate }} </a>
+      <a href="#!/profile" class="db p20h nav-item text-center" title="Create new wallet">
+        <div class="photo-container m20t">
+          <img gravatar-src="'{{$root.iden.getName()}}'" gravatar-size="35">
+        </div>
+        <p class="text-black m5">{{$root.iden.getName()}}</p>
+        <span class="db text-gray size-10">
+        <i class="fi-torso"></i> {{'ViewProfile' | translate }} 
+      </span>
+
+      </a>
+
     </li>
     <li>
-    <a href="#!/join" class="db p20h nav-item" title="Join shared wallet">
-      <i class="size-24 m20r fi-torsos-all"></i> {{'Join shared wallet' | translate }} </a>
+      <a href="#!/create" class="db p20h nav-item" title="Create new wallet">
+        <i class="size-24 m20r fi-plus"></i> {{'Create new wallet' | translate }}</a>
     </li>
     <li>
-    <a href="#!/import" class="db p20h nav-item" title="Import wallet">
-      <i class="size-24 m20r fi-download"></i> {{'Import a wallet' | translate }} </a>
+      <a href="#!/join" class="db p20h nav-item" title="Join shared wallet">
+        <i class="size-24 m20r fi-torsos-all"></i> {{'Join shared wallet' | translate }}</a>
+    </li>
+    <li>
+      <a href="#!/import" class="db p20h nav-item" title="Import wallet">
+        <i class="size-24 m20r fi-download"></i> {{'Import a wallet' | translate }}</a>
     </li>
     <li ng-if="$root.wallet">
-    <a href="#!/more" class="db p20h nav-item" title="Settings" >
-      <i class="size-24 m20r fi-widget"></i> {{'Wallet Settings' | translate }} </a>
+      <a href="#!/more" class="db p20h nav-item" title="Settings">
+        <i class="size-24 m20r fi-widget"></i> {{'Wallet Settings' | translate }}</a>
     </li>
     <li>
-    <a href="#!/" class="db p20h nav-item" title="Close"
-      ng-click="signout()">
-      <span ng-if="!$root.hasPin"><i class="size-24 m20r fi-power"></i> {{'Close'|translate}}</span>
-      <span ng-if="$root.hasPin"><i class="size-24 m20r fi-lock"></i> {{'Lock'|translate}}</span>
-    </a>
+      <a href="#!/" class="db p20h nav-item" title="Close" ng-click="signout()">
+        <span ng-if="!$root.hasPin"><i class="size-24 m20r fi-power"></i> {{'Close'|translate}}</span>
+        <span ng-if="$root.hasPin"><i class="size-24 m20r fi-lock"></i> {{'Lock'|translate}}</span>
+      </a>
     </li>
   </ul>
   <div class="text-gray size-12 text-center columns">

From 90195c0f383e98956c57f0ef20f9b2afbe34648f Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Sat, 6 Dec 2014 17:23:26 -0300
Subject: [PATCH 5/7] home links as buttons

---
 js/controllers/home.js               |  4 ++++
 js/controllers/sidebar.js            |  4 ----
 views/home.html                      | 20 +++++++++++---------
 views/includes/bottombar-mobile.html |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/js/controllers/home.js b/js/controllers/home.js
index 630a7515b..1186c6f82 100644
--- a/js/controllers/home.js
+++ b/js/controllers/home.js
@@ -2,6 +2,10 @@
 
 angular.module('copayApp.controllers').controller('HomeController', function($scope, $rootScope, $location, $timeout, notification, identityService, Compatibility, pinService, applicationService, isMobile) {
 
+  // Global functions (TODO should be somewere else)
+  $rootScope.go = function (path) {
+    $location.path(path);
+  };
 
   var _credentials, _firstpin;
   $scope.init = function() {
diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js
index e5319c54e..52c1f04d2 100644
--- a/js/controllers/sidebar.js
+++ b/js/controllers/sidebar.js
@@ -26,10 +26,6 @@ angular.module('copayApp.controllers').controller('SidebarController', function(
     'link': 'more'
   }];
 
-  $scope.go = function (path) {
-    $location.path(path);
-  };
-
   $scope.signout = function() {
     $rootScope.signingOut = true;
     identityService.signout();
diff --git a/views/home.html b/views/home.html
index d61590cf8..a29c49f88 100644
--- a/views/home.html
+++ b/views/home.html
@@ -122,7 +122,7 @@
         </div>
         <b>Copay now needs a profile to access wallets.</b>
         You can import your current wallets after
-        <a class="text-white" href="#!/createProfile">creating your profile</a>
+        <a class="text-white" ng-click="$root.go('#!/createProfile')">creating your profile</a>
       </div>
       <div class="p10 box-setup bg-success m20b text-white" ng-show="pendingPayment">
         <div class="left">
@@ -162,24 +162,26 @@
 
 
       <div class="box-setup-footer">
+
+        <div class="right">
+          <a class="button-setup text-gray"  ng-click="$root.go('#!/settings')">
+            <i class="icon-wrench"></i> 
+            <span translate>Settings</span>
+          </a>
+        </div>
+
         <div class="left m10r">
-          <a class="button-setup text-gray" href="#!/createProfile">
+          <a class="button-setup text-gray"  ng-click="$root.go('#!/createProfile')">
             <i class="icon-person"></i> 
             <span translate>Create a profile</span>
           </a>
         </div>
         <div class="left">
-          <a class="button-setup text-gray" href="#!/importProfile">
+          <a class="button-setup text-gray"  ng-click="$root.go('#!/importProfile')">
             <i class="icon-upload"></i> 
             <span translate>Import a profile</span>
           </a>
         </div>
-        <div class="right m10t">
-          <a class="text-gray" href="#!/settings">
-            <i class="icon-wrench"></i> 
-            <span translate>Settings</span>
-          </a>
-        </div>
       </div>
     </div>
   </div>
diff --git a/views/includes/bottombar-mobile.html b/views/includes/bottombar-mobile.html
index 5f7f5d2d7..12ab7d4bc 100644
--- a/views/includes/bottombar-mobile.html
+++ b/views/includes/bottombar-mobile.html
@@ -1,6 +1,6 @@
 <div class="row collapse">
     <div class="medium-3 small-3 columns text-center bottombar-item" ng-repeat="item in menu" ui-route="{{item.link}}" ng-if="item.link!='more'">
-      <a ng-click="go(item.link)" ng-class="{active: isActive(item)}"> 
+      <a ng-click="$root.go(item.link)" ng-class="{active: isActive(item)}"> 
         <i class="size-36 {{item.icon}} db"></i> 
         <div class="size-10 tu">
           {{item.title}} 

From f13e71b0452739d482ae78b0a3e4aed5e8e4c2b2 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Sat, 6 Dec 2014 17:54:02 -0300
Subject: [PATCH 6/7] fixes https://github.com/bitpay/copay/issues/2017

---
 js/controllers/createProfile.js |  4 ++--
 js/controllers/settings.js      |  4 ++--
 views/createProfile.html        |  2 +-
 views/home.html                 | 12 ++++++------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/js/controllers/createProfile.js b/js/controllers/createProfile.js
index acf8c86fa..26d63ed38 100644
--- a/js/controllers/createProfile.js
+++ b/js/controllers/createProfile.js
@@ -117,8 +117,8 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
         // mobile
         if ($scope.isMobile) {
           _credentials = {
-            email: form.email.$modelValue,
-            password: form.password.$modelValue,
+            email: emailOrUsername,
+            password: password,
           };
           $scope.askForPin = 1;
           $rootScope.hideNavigation = true;
diff --git a/js/controllers/settings.js b/js/controllers/settings.js
index 4b2ef366b..9a0a93fd4 100644
--- a/js/controllers/settings.js
+++ b/js/controllers/settings.js
@@ -89,14 +89,14 @@ angular.module('copayApp.controllers').controller('SettingsController', function
         }),
       },
       function() {
-        notification.success('Settings saved');
+        notification.success('Settings saved',"Settings were saved");
         $location.path('/');
       });
   };
 
   $scope.reset = function() {
     configService.reset(function() {
-      notification.success('Settings reseted');
+      notification.success('Settings reseted',"Settings were reseted");
       $location.path('/');
     });
   };
diff --git a/views/createProfile.html b/views/createProfile.html
index cd5b6706d..b0c285d31 100644
--- a/views/createProfile.html
+++ b/views/createProfile.html
@@ -20,7 +20,7 @@
     </div>
   </div>
 
-  <div class="large-4 large-centered medium-6 medium-centered columns m20b" ng-show="!loading  && !askForPin">
+  <div class="large-5 large-centered medium-6 medium-centered columns m20b" ng-show="!loading  && !askForPin">
     <div class="logo-setup hide-for-small-only">
       <img src="img/logo-negative-beta.svg" alt="Copay" width="100">
       <div ng-include="'views/includes/version.html'"></div>
diff --git a/views/home.html b/views/home.html
index a29c49f88..048aee226 100644
--- a/views/home.html
+++ b/views/home.html
@@ -20,7 +20,7 @@
     </div>
   </div>
 
-  <div class="large-4 large-centered medium-7 medium-centered columns" ng-show="!$root.starting">
+  <div class="large-5 large-centered medium-7 medium-centered columns" ng-show="!$root.starting">
     <div class="logo-setup" ng-show="!$root.iden">
       <img src="img/logo-negative-beta.svg" alt="Copay" width="100">
       <div ng-include="'views/includes/version.html'"></div>
@@ -164,22 +164,22 @@
       <div class="box-setup-footer">
 
         <div class="right">
-          <a class="button-setup text-gray"  ng-click="$root.go('#!/settings')">
+          <a class="button-setup text-gray"  ng-click="$root.go('/settings')">
             <i class="icon-wrench"></i> 
             <span translate>Settings</span>
           </a>
         </div>
 
         <div class="left m10r">
-          <a class="button-setup text-gray"  ng-click="$root.go('#!/createProfile')">
+          <a class="button-setup text-gray"  ng-click="$root.go('/createProfile')">
             <i class="icon-person"></i> 
-            <span translate>Create a profile</span>
+            <span translate>Create profile</span>
           </a>
         </div>
         <div class="left">
-          <a class="button-setup text-gray"  ng-click="$root.go('#!/importProfile')">
+          <a class="button-setup text-gray"  ng-click="$root.go('/importProfile')">
             <i class="icon-upload"></i> 
-            <span translate>Import a profile</span>
+            <span translate>Import</span>
           </a>
         </div>
       </div>

From 59c13b3ff34487a0088f2dd6940beba1e838630e Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Sat, 6 Dec 2014 17:58:07 -0300
Subject: [PATCH 7/7] fix typos

---
 js/controllers/home.js         | 2 +-
 js/services/identityService.js | 2 +-
 views/home.html                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/controllers/home.js b/js/controllers/home.js
index 1186c6f82..9d0285644 100644
--- a/js/controllers/home.js
+++ b/js/controllers/home.js
@@ -2,7 +2,7 @@
 
 angular.module('copayApp.controllers').controller('HomeController', function($scope, $rootScope, $location, $timeout, notification, identityService, Compatibility, pinService, applicationService, isMobile) {
 
-  // Global functions (TODO should be somewere else)
+  // Global functions (TODO should be somewhere else)
   $rootScope.go = function (path) {
     $location.path(path);
   };
diff --git a/js/services/identityService.js b/js/services/identityService.js
index ab04c7ade..1c9c14468 100644
--- a/js/services/identityService.js
+++ b/js/services/identityService.js
@@ -304,7 +304,7 @@ angular.module('copayApp.services')
       });
 
       iden.on('noWallets', function() {
-        notification.warning('No Wallets','Your profile has no wallet. Create one here');
+        notification.warning('No Wallets','Your profile has no wallets. Create one here');
         $rootScope.starting = false;
         $location.path('/create');
         $timeout(function() {
diff --git a/views/home.html b/views/home.html
index 048aee226..a166c3651 100644
--- a/views/home.html
+++ b/views/home.html
@@ -122,7 +122,7 @@
         </div>
         <b>Copay now needs a profile to access wallets.</b>
         You can import your current wallets after
-        <a class="text-white" ng-click="$root.go('#!/createProfile')">creating your profile</a>
+        <a class="text-white" ng-click="$root.go('/createProfile')">creating your profile</a>
       </div>
       <div class="p10 box-setup bg-success m20b text-white" ng-show="pendingPayment">
         <div class="left">