[fix] Assistant de création de compte > Message d'erreur furtif - FIX #715

www/js/controllers/join-controllers.js

@@ -185,12 +185,16 @@ function JoinModalController($scope, $state, $interval, $timeout, Device, UIUtil
     CryptoUtils.scryptKeypair($scope.formData.username, $scope.formData.password)
       .then(function(keypair) {
         $scope.formData.pubkey = CryptoUtils.util.encode_base58(keypair.signPk);
+        return $scope.checkAccountAvailable();
+      })
+      .then(function() {
+        return $timeout(function(){
           $scope.formData.computing=false;
-        $scope.checkAccountAvailable();
+        }, 400);
       })
       .catch(function(err) {
-        $scope.formData.computing=false;
         $scope.formData.pubkey = undefined;
+        $scope.formData.computing=false;
         UIUtils.onError('ERROR.CRYPTO_UNKNOWN_ERROR')(err);
       });
   };
@@ -301,6 +305,11 @@ function JoinModalController($scope, $state, $interval, $timeout, Device, UIUtil
     $scope.slideBehavior = $scope.computeSlideBehavior();
   };
 
+  $scope.doPrev = function() {
+    $scope.slidePrev();
+    $scope.slideBehavior = $scope.computeSlideBehavior();
+  };
+
   $scope.doNewAccount = function(confirm) {
 
     if (!confirm) {
@@ -462,27 +471,25 @@ function JoinModalController($scope, $state, $interval, $timeout, Device, UIUtil
   $scope.checkAccountAvailable = function() {
     delete $scope.accountAvailable;
     // Search for tx source, from pubkey
-    BMA.tx.sources({ pubkey:  $scope.formData.pubkey })
+    return BMA.tx.sources({ pubkey:  $scope.formData.pubkey })
       .then(function(res) {
-        if(!res.sources.length) {
-          $scope.formData.computing=false;
-          $scope.accountAvailable = true;
-        }
-        else{
-          $scope.formData.computing=false;
-          $scope.accountAvailable = false;
-        }
+        $scope.accountAvailable = !res || !res.sources.length;
       })
       .catch(function(err) {
         console.error(err);
-        $scope.formData.computing=false;
         $scope.accountAvailable = false;
       });
   };
 
   $scope.identifierRecovery = function() {
-    for (var i = 0; i < 2; i++)
-      $scope.slidePrev();
+    // Go back
+    $scope.slides.slider.unlockSwipes();
+    for (var i = 0; i < 2; i++) {
+      $scope.slides.slider.slidePrev();
+    }
+    $scope.slides.slider.lockSwipes();
+    // Recompute behavior
+    $scope.slideBehavior = $scope.computeSlideBehavior();
   };
 
   // TODO: remove auto add account when done

www/templates/join/modal_join_member.html

@@ -7,7 +7,7 @@
             ng-click="closeModal()" translate>COMMON.BTN_CANCEL
     </button>
     <button class="button button-icon button-clear icon ion-ios-arrow-back buttons header-item"
-            ng-click="slidePrev()"
+            ng-click="doPrev()"
             ng-if="slides.slider.activeIndex && slideBehavior.hasPreviousButton">
     </button>
     <button class="button button-icon button-clear icon ion-ios-help-outline visible-xs"
@@ -356,7 +356,8 @@
           </div>
 
           <!-- Account available -->
-          <div ng-if="accountAvailable && !formData.computing">
+          <ng-if ng-if="!formData.computing">
+            <div class="animate-fade-in animate-show-hide ng-hide" ng-show="accountAvailable">
               <div class="padding text-center" translate>ACCOUNT.NEW.LAST_SLIDE_CONGRATULATION</div>
 
               <div class="list">
@@ -381,7 +382,7 @@
             </div>
 
             <!-- Existing non-empty account -->
-          <div ng-if="!accountAvailable && !formData.computing">
+            <div class="animate-fade-in animate-show-hide ng-hide" ng-show="!accountAvailable">
 
               <ion-item class="item-icon-left item-text-wrap text-center">
                   <i class="icon ion-minus-circled assertive"></i>
@@ -410,6 +411,7 @@
                 </button>
               </div>
             </div>
+          </ng-if>
 
         </ion-content>
       </ion-slide-page>