diff --git a/public/index.html b/public/index.html
index 56a114dec..703186195 100644
--- a/public/index.html
+++ b/public/index.html
@@ -18,7 +18,7 @@
ng-controller="indexController as index"
ng-swipe-disable-mouse
ng-swipe-left="index.closeMenu()"
- ng-swipe-right="index.openMenu()">
+ ng-swipe-right="index.agreeDisclaimer ? index.openMenu()">
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 38fc751bb..2ed1da44e 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -135,6 +135,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.openWallet();
});
}
+ storageService.getCopayDisclaimerFlag(function(err, val) {
+ self.agreeDisclaimer = val;
+ });
});
};
diff --git a/src/js/routes.js b/src/js/routes.js
index 6e8c7d527..00bce5d32 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -457,7 +457,8 @@ angular
url: '/cordova/:status/:isHome',
views: {
'main': {
- controller: function($rootScope, $state, $stateParams, $timeout, go, isCordova) {
+ controller: function($rootScope, $state, $stateParams, $timeout, go, isCordova, storageService) {
+
switch ($stateParams.status) {
case 'resume':
$rootScope.$emit('Local/Resume');
@@ -470,10 +471,14 @@ angular
}
break;
};
- $timeout(function() {
- $rootScope.$emit('Local/SetTab', 'walletHome', true);
- }, 100);
- go.walletHome();
+ storageService.getCopayDisclaimerFlag(function(err, val) {
+ if (!val) navigator.app.exitApp();
+
+ $timeout(function() {
+ $rootScope.$emit('Local/SetTab', 'walletHome', true);
+ }, 100);
+ go.walletHome();
+ });
}
}
},