From 2f7f593ad69a1347174aff8f134e99b5ee6f9f94 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 27 Apr 2015 03:03:08 -0300
Subject: [PATCH] do not hice create/join forms with working / no color on
 global pages

---
 public/views/create.html          |  2 +-
 public/views/includes/topbar.html |  2 +-
 public/views/join.html            |  2 +-
 src/js/controllers/join.js        |  4 +++-
 src/js/routes.js                  | 19 +++++++++++++------
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/public/views/create.html b/public/views/create.html
index 35267fb1b..62ca0fcf0 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -14,7 +14,7 @@
   </div>
 
 
-  <form name="setupForm" ng-submit="create.create(setupForm)" ng-show="!create.loading" novalidate>
+  <form name="setupForm" ng-submit="create.create(setupForm)" novalidate>
     <div class="row">
       <div class="large-12 columns">
         <div class="box-notification" ng-show="create.error">
diff --git a/public/views/includes/topbar.html b/public/views/includes/topbar.html
index 32ca8ce47..13028d226 100644
--- a/public/views/includes/topbar.html
+++ b/public/views/includes/topbar.html
@@ -19,7 +19,7 @@
   </section>
 
   <section class="middle tab-bar-section">
-    <h1 class="title ellipsis" ng-style="{'color':index.backgroundColor}">
+    <h1 class="title ellipsis" ng-style="{'color': noColor ? '#4B6178' : index.backgroundColor}">
       {{(titleSection|translate) || index.walletName}}
     </h1>
   </section>
diff --git a/public/views/join.html b/public/views/join.html
index b7f3a4872..a682c1e9a 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -12,7 +12,7 @@
     </div>
   </div>
 
-  <div class="row" ng-show="!join.loading">
+  <div class="row">
     <div class="large-12 columns">
 
       <div class="box-notification" ng-show="join.error ">
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 8099d2a63..2a24a46c1 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -151,7 +151,9 @@ angular.module('copayApp.controllers').controller('joinController',
             $rootScope.$apply();
             return
           }
-          go.walletHome();
+          $timeout(function() {
+            go.walletHome();
+          }, 2000);
         });
       }, 100);
     }
diff --git a/src/js/routes.js b/src/js/routes.js
index 3c42ffcd5..23c225885 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -98,6 +98,7 @@ angular
             templateUrl: 'views/createProfile.html',
             controller: function($scope) {
               $scope.mainDark = true;
+              $scope.noColor = true;
             }
           }
         }
@@ -122,6 +123,7 @@ angular
             templateUrl: 'views/includes/topbar.html',
             controller: function($scope) {
               $scope.goBackToState = 'walletHome';
+              $scope.noColor = true;
             }
           }
         },
@@ -144,6 +146,7 @@ angular
             controller: function($scope) {
               $scope.titleSection = 'Join shared wallet';
               $scope.goBackToState = 'add';
+              $scope.noColor = true;
             }
           }
         }
@@ -160,6 +163,7 @@ angular
             controller: function($scope) {
               $scope.titleSection = 'Import wallet';
               $scope.goBackToState = 'add';
+              $scope.noColor = true;
             }
           }
         }
@@ -181,6 +185,7 @@ angular
             controller: function($scope) {
               $scope.titleSection = 'Import legacy wallet';
               $scope.goBackToState = 'add';
+              $scope.noColor = true;
             }
           }
         }
@@ -199,6 +204,7 @@ angular
             controller: function($scope) {
               $scope.titleSection = 'Create new wallet';
               $scope.goBackToState = 'add';
+              $scope.noColor = true;
             }
           }
         }
@@ -215,12 +221,6 @@ angular
           }
         }
       })
-      .state('profile', {
-        url: '/profile',
-        controller: 'profileController',
-        templateUrl: 'views/profile.html',
-        needProfile: true
-      })
       .state('preferences', {
         url: '/preferences',
         templateUrl: 'views/preferences.html',
@@ -252,6 +252,7 @@ angular
             controller: function($scope) {
               $scope.titleSection = 'Language';
               $scope.goBackToState = 'preferences';
+              $scope.noColor = true;
             }
           }
         }
@@ -270,6 +271,7 @@ angular
             controller: function($scope) {
               $scope.titleSection = 'Unit';
               $scope.goBackToState = 'preferences';
+              $scope.noColor = true;
             }
           }
         }
@@ -307,6 +309,7 @@ angular
             controller: function($scope) {
               $scope.titleSection = 'Alternative Currency';
               $scope.goBackToState = 'preferences';
+              $scope.noColor = true;
             }
           }
         }
@@ -325,6 +328,7 @@ angular
             controller: function($scope) {
               $scope.titleSection = 'Bitcore Wallet Service';
               $scope.goBackToState = 'preferences';
+              $scope.noColor = true;
             }
           }
         }
@@ -361,6 +365,7 @@ angular
             controller: function($scope) {
               $scope.titleSection = 'About';
               $scope.goBackToState = 'preferences';
+              $scope.noColor = true;
             }
           }
         }
@@ -379,6 +384,7 @@ angular
             controller: function($scope) {
               $scope.titleSection = 'Logs';
               $scope.goBackToState = 'about';
+              $scope.noColor = true;
             }
           }
         }
@@ -426,6 +432,7 @@ angular
             controller: function($scope) {
               $scope.titleSection = 'Add wallet';
               $scope.closeToHome = true;
+              $scope.noColor = true;
             }
           }
         }