From c8c82b3cb5b9be1f85f8839c349397a153a86edf Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Sat, 6 Dec 2014 19:16:50 -0300
Subject: [PATCH] fix order when there are errors on funnel

---
 js/controllers/createProfile.js |  3 +-
 js/util/crypto.js               |  2 +-
 views/createProfile.html        | 51 +++++++++++++++++----------------
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/js/controllers/createProfile.js b/js/controllers/createProfile.js
index 26d63ed38..b54f78c44 100644
--- a/js/controllers/createProfile.js
+++ b/js/controllers/createProfile.js
@@ -6,7 +6,7 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
 
   $scope.init = function() {
     identityService.goWalletHome();
-    $scope.isMobile = isMobile.any();
+    $scope.isMobile = 1; //isMobile.any();
 
     $scope.createStep = 'storage';
     $scope.useLocalstorage = false;
@@ -111,6 +111,7 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
         var msg = err.toString();
         if (msg.indexOf('EEXIST') >= 0 || msg.indexOf('BADC') >= 0) {
           msg = 'This profile already exists'
+          $scope.createStep = 'email';
         }
         $scope.error = msg;
       } else {
diff --git a/js/util/crypto.js b/js/util/crypto.js
index 72679f18f..88c821363 100644
--- a/js/util/crypto.js
+++ b/js/util/crypto.js
@@ -76,7 +76,7 @@ module.exports = {
     try {
       return sjcl.decrypt(key, sjclEncryptedJson);
     } catch (e) {
-      log.info('Decryption failed due to error: ' + e.message);
+      log.debug('Decryption failed due to error: ' + e.message);
       return null;
     }
   }
diff --git a/views/createProfile.html b/views/createProfile.html
index b0c285d31..8c1bef967 100644
--- a/views/createProfile.html
+++ b/views/createProfile.html
@@ -23,9 +23,34 @@
   <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>
     </div>
     <div>
+
+      <div class="clipo"  ng-show="createStep == 'storage' ">
+        <img src="img/clipo-signup1.png" alt="clipo" width="311">
+      </div>
+
+      <div ng-show="createStep == 'email'">
+        <div class="clipo" ng-if="useLocalstorage">
+          <img src="img/clipo-signup2-1.png" alt="clipo" width="373">
+        </div>
+        <div class="clipo" ng-if="!useLocalstorage">
+          <img src="img/clipo-signup2.png" alt="clipo" width="373">
+        </div>
+        <h2 ng-if="!useLocalstorage"> Creating in the cloud </h2>
+        <h2 ng-if="useLocalstorage"> Creating on this device </h2>
+      </div>
+
+      <div ng-show="createStep == 'pass'">
+        <div class="clipo">
+          <img src="img/clipo-signup3.png" alt="clipo" width="380">
+        </div>
+
+        <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>
+      </div>
+
       <div class="box-notification" ng-show="error">
         <div class="box-icon error">
           <i class="fi-x size-24"></i>
@@ -37,10 +62,7 @@
 
 
       <form ng-show="createStep == 'storage' " novalidate>
-        <div class="clipo">
-          <img src="img/clipo-signup1.png" alt="clipo" width="311">
-        </div>
-        <tabset>
+       <tabset>
           <tab style="width: 50%;" select="selectStorage('remote')">
             <tab-heading>
               <span class="text-bold">In the Cloud </span><br>
@@ -106,16 +128,6 @@
       </form>
 
       <form ng-show="createStep == 'email'" name="emailForm" ng-submit="setEmailOrUsername(emailForm)" novalidate>
-        <div class="clipo" ng-if="useLocalstorage">
-          <img src="img/clipo-signup2-1.png" alt="clipo" width="373">
-        </div>
-        <div class="clipo" ng-if="!useLocalstorage">
-          <img src="img/clipo-signup2.png" alt="clipo" width="373">
-        </div>
-
-        <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">
           <i class="icon-email"></i>
@@ -154,15 +166,6 @@
       </form>
 
       <form ng-show="createStep == 'pass'" name="passForm" ng-submit="createProfile(passForm)" novalidate>
-        <div class="clipo">
-          <img src="img/clipo-signup3.png" alt="clipo" width="380">
-        </div>
-
-        <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>
-
-
         <div class="input">
           <input id="password" type="password" ng-model="$parent.password" class="form-control" name="password" placeholder="{{'Choose a password'|translate}}" check-strength="passwordStrength" tooltip-html-unsafe="Password strength: <b>{{passwordStrength}}</b><br/><span class='size-12'>Tip: Use lower and uppercase, numbers and symbols</span>" tooltip-trigger="focus" required tooltip-placement="top">
           <i class="icon-locked"></i>