From 8074db20e6e93e879f9c2feb9a9a7dc631d49950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 27 Oct 2016 12:33:08 -0300
Subject: [PATCH] fix sweep paper wallet backup message

---
 src/js/controllers/paperWallet.js | 3 +--
 www/views/paperWallet.html        | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/js/controllers/paperWallet.js b/src/js/controllers/paperWallet.js
index e346863a4..b460b125e 100644
--- a/src/js/controllers/paperWallet.js
+++ b/src/js/controllers/paperWallet.js
@@ -120,10 +120,9 @@ angular.module('copayApp.controllers').controller('paperWalletController',
       });
     };
 
-    $scope.$on("$ionicView.enter", function(event, data) {
+    $scope.$on("$ionicView.beforeEnter", function(event, data) {
       var wallet = profileService.getWallet($stateParams.walletId);
       $scope.wallet = wallet;
-      $scope.isCordova = platformInfo.isCordova;
       $scope.needsBackup = wallet.needsBackup;
       $scope.walletAlias = wallet.name;
       $scope.walletName = wallet.credentials.walletName;
diff --git a/www/views/paperWallet.html b/www/views/paperWallet.html
index 2d9a5a6f2..4904becfa 100644
--- a/www/views/paperWallet.html
+++ b/www/views/paperWallet.html
@@ -6,17 +6,17 @@
   </ion-nav-bar>
 
   <ion-content>
-    <div class="settings" class="row" ng-show="needsBackup">
+    <div class="settings ng-hide" class="row" ng-show="needsBackup">
       <div class="settings-explanation">
         <div class="settings-heading" translate>Backup Needed</div>
         <div class="settings-description" translate>
           Before receiving funds, you must backup your wallet. If this device is lost, it is impossible to access your funds without a backup.
         </div>
-        <a class="button button-standard button-primary" href ui-sref="tabs.preferences.preferencesAdvanced" translate>Preferences</a>
+        <a class="button button-standard button-primary" href ui-sref="tabs.preferences.backupWarning({from: 'tabs.preferences'})" translate>Backup Now</a>
       </div>
     </div>
 
-    <div ng-show="!needsBackup">
+    <div class="ng-hide" ng-show="!needsBackup">
       <h4 ng-show="!error"></h4>
       <div class="box-notification m20b" ng-show="error">
         <span class="text-warning">{{error|translate}}</span>
@@ -41,7 +41,7 @@
                 <span class="input-label" translate>Password</span>
                 <input type="text" name="passphrase" placeholder="{{'Passphrase'|translate}}" ng-model="passphrase">
               </label>
-              <p ng-show="isCordova" class="card size-12 text-gray" translate>
+              <p class="card size-12 text-gray" translate>
                 Decrypting a paper wallet could take around 5 minutes on this device. please be patient and keep the app open.
               </p>
             </div>