Join: Allow to click on the "approve license" button, after 5s - fix #592

app/config.json

@@ -274,8 +274,8 @@
       }
     },
     "license": {
-      "fr-FR": "license/license_g1-fr-FR.txt",
-      "en": "license/license_g1-en.txt"
+      "fr-FR": "license/license_g1-fr-FR",
+      "en": "license/license_g1-en"
     },
     "node": {
       "host": "g1.duniter.fr",

www/js/config.js

@@ -29,8 +29,8 @@ angular.module("cesium.config", [])
 		}
 	},
 	"license": {
-		"fr-FR": "license/license_g1-fr-FR.txt",
-		"en": "license/license_g1-en.txt"
+		"fr-FR": "license/license_g1-fr-FR",
+		"en": "license/license_g1-en"
 	},
 	"node": {
 		"host": "g1.duniter.org",

www/js/controllers/app-controllers.js

@@ -357,13 +357,7 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $
 
   $scope.showJoinModal = function() {
     $scope.closeProfilePopover();
-    return Modals.showJoin()
-      .then(function(res){
-        if (!res) return;
-        return (res.accountType == 'member') ?
-          Modals.showJoinMember(res) :
-          Modals.showJoinWallet(res);
-      });
+    return Modals.showJoin();
   };
 
   $scope.showSettings = function() {

www/js/controllers/join-controllers.js

@@ -144,7 +144,14 @@ function JoinModalController($scope, $state, $interval, $timeout, Device, UIUtil
             $scope.licenseFileUrl = $scope.licenseFileUrl + '.html';
           }
           if (!$scope.isLicenseRead) {
-            $scope.startListenLicenseBottom();
+            //$scope.startListenLicenseBottom();
+
+            // Make sure to enable the next button when error occured - Fix issue #592
+            $timeout(function() {
+              if (!$scope.isLicenseRead) {
+                $scope.isLicenseRead = true;
+              }
+            }, 5000);
           }
         }
       }

www/js/services/modal-services.js

@@ -173,7 +173,13 @@ angular.module('cesium.modal.services', [])
 
   function showJoin(parameters) {
     return ModalUtils.show('templates/join/modal_choose_account_type.html','JoinChooseAccountTypeModalCtrl',
-      parameters);
+      parameters)
+      .then(function(res){
+        if (!res) return;
+        return (res.accountType == 'member') ?
+          showJoinMember(res) :
+          showJoinWallet(res);
+      });
   }
 
   function showJoinMember(parameters) {