From 965619740b995e08bdef138304bb4c2483baebf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 17 Aug 2016 13:07:48 -0300
Subject: [PATCH] adding wallet id on url

---
 public/index.html                         |  1 -
 public/views/preferences.html             | 10 +++----
 public/views/preferencesAbout.html        |  4 +--
 public/views/preferencesAlias.html        |  4 +--
 public/views/preferencesAltCurrency.html  |  4 +--
 public/views/preferencesBwsUrl.html       |  4 +--
 public/views/preferencesColor.html        |  4 +--
 public/views/preferencesDeleteWallet.html |  4 +--
 public/views/preferencesDeleteWords.html  |  4 +--
 public/views/preferencesEmail.html        |  4 +--
 public/views/preferencesFee.html          |  4 +--
 public/views/preferencesHistory.html      |  4 +--
 public/views/preferencesInformation.html  |  4 +--
 public/views/preferencesLanguage.html     |  4 +--
 public/views/preferencesLogs.html         |  4 +--
 public/views/preferencesUnit.html         |  4 +--
 public/views/tab-home.html                |  7 +++--
 public/views/tab-receive.html             |  6 ++---
 public/views/tab-settings.html            |  4 +--
 public/views/termOfUse.html               |  4 +--
 public/views/translators.html             |  2 +-
 public/views/walletDetails.html           | 22 +++++++++-------
 src/js/controllers/preferences.js         |  9 +++++--
 src/js/controllers/walletDetails.js       |  2 +-
 src/js/routes.js                          | 32 +++++++++++------------
 25 files changed, 81 insertions(+), 74 deletions(-)
diff --git a/public/index.html b/public/index.html
index c706c45d7..fa25263f2 100644
--- a/public/index.html
+++ b/public/index.html
@@ -14,7 +14,6 @@
 <!-- <body ng&#45;cloak class="ng&#45;cloak"> -->
 <body >
 
-  <ion-nav-bar class="bar-stable"></ion-nav-bar>
   <ion-nav-view name="main"></ion-nav-view>
 
   <script src="lib/ionic.bundle.min.js"></script>
diff --git a/public/views/preferences.html b/public/views/preferences.html
index c7aa21a7a..8d3793bc4 100644
--- a/public/views/preferences.html
+++ b/public/views/preferences.html
@@ -1,13 +1,13 @@
-<ion-view ng-controller="preferencesController" cache-view="false" ng-init="init()">
+<ion-view>
   <ion-nav-bar class="bar-stable">
   <ion-nav-title>Wallet Settings</ion-nav-title>
     <ion-nav-buttons side="primary">
-       <button class="button" href ui-sref="walletDetails">
+       <button class="button" href ui-sref="wallet.details">
          <i class="ion-arrow-left-c"></i> Back
        </button>
     </ion-nav-buttons>
   </ion-nav-bar>
-  <ion-content class="has-header">
+  <ion-content class="has-header" ng-controller="preferencesController" cache-view="false" ng-init="init()">
     <div class="list">
       <div class="item item-divider">
         Preferences
@@ -15,7 +15,7 @@
       <div class="item item-icon-right" href ui-sref="preferencesAlias">
         <span translate>Wallet Name</span>
         <span class="item-note">
-          {{index.alias||index.walletName}}
+          {{alias||walletName}}
         </span>
         <i class="icon ion-ios-arrow-right"></i>
       </div>
@@ -38,7 +38,7 @@
         </span>
       </div>
       <div class="item item-icon-right"  href ui-sref="preferencesColor">
-        <span ng-style="{'color':index.backgroundColor}">&block;</span>
+        <span ng-style="{'color': backgroundColor}">&block;</span>
         <span translate>Wallet Color</span>
         <span class="item-note">
           {{index.alias||index.walletName}}
diff --git a/public/views/preferencesAbout.html b/public/views/preferencesAbout.html
index c80d2abca..b71362ce5 100644
--- a/public/views/preferencesAbout.html
+++ b/public/views/preferencesAbout.html
@@ -1,4 +1,4 @@
-<ion-view ng-controller="preferencesAbout" cache-view="false">
+<ion-view>
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>About Copay</ion-nav-title>
     <ion-nav-buttons side="primary">
@@ -7,7 +7,7 @@
      </button>
     </ion-nav-buttons>
   </ion-nav-bar>
-  <ion-content>
+  <ion-content ng-controller="preferencesAbout" cache-view="false">
     <div class="item item-divider">
       Release information
     </div>
diff --git a/public/views/preferencesAlias.html b/public/views/preferencesAlias.html
index 98d95c54c..988fb9e67 100644
--- a/public/views/preferencesAlias.html
+++ b/public/views/preferencesAlias.html
@@ -1,4 +1,4 @@
-<ion-view ng-controller="preferencesAliasController" cache-view="false">
+<ion-view>
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Alias</ion-nav-title>
     <ion-nav-buttons side="primary">
@@ -7,7 +7,7 @@
      </button>
     </ion-nav-buttons>
   </ion-nav-bar>
-  <ion-content class="has-header">
+  <ion-content class="has-header" ng-controller="preferencesAliasController" cache-view="false">
     <form name="aliasForm" ng-submit="save(aliasForm)" novalidate>
       <label class="item item-input item-stacked-label">
         <span class="input-label" transalate>Alias for {{walletName}}</span>
diff --git a/public/views/preferencesAltCurrency.html b/public/views/preferencesAltCurrency.html
index 1c3eb7db2..5157af060 100644
--- a/public/views/preferencesAltCurrency.html
+++ b/public/views/preferencesAltCurrency.html
@@ -1,4 +1,4 @@
-<ion-view ng-controller="preferencesAltCurrencyController" cache-view="false" ng-init="init()">
+<ion-view>
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Alternative Currency</ion-nav-title>
     <ion-nav-buttons side="primary">
@@ -7,7 +7,7 @@
        </button>
      </ion-nav-buttons>
   </ion-nav-bar>
-  <ion-content>
+  <ion-content ng-controller="preferencesAltCurrencyController" ng-init="init()" cache-view="false">
     <ion-radio ng-repeat="altCurrency in altCurrencyList" ng-value="altCurrency.isoCode" ng-model="currentCurrency"
       ng-click="save(altCurrency)">{{altCurrency.name}}
     </ion-radio>
diff --git a/public/views/preferencesBwsUrl.html b/public/views/preferencesBwsUrl.html
index 94249b5ba..81ae2ada2 100644
--- a/public/views/preferencesBwsUrl.html
+++ b/public/views/preferencesBwsUrl.html
@@ -1,4 +1,4 @@
-<ion-view ng-controller="preferencesBwsUrlController" cache-view="false">
+<ion-view>
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Wallet Service URL</ion-nav-title>
     <ion-nav-buttons side="primary">
@@ -7,7 +7,7 @@
      </button>
     </ion-nav-buttons>
   </ion-nav-bar>
-  <ion-content class="has-header">
+  <ion-content class="has-header" ng-controller="preferencesBwsUrlController" cache-view="false">
     <form name="settingsBwsUrlForm" ng-submit="save(settingsBwsUrlForm)" novalidate>
       <label class="item item-input item-stacked-label">
         <span class="input-label" transalate>Wallet Service URL</span><a ng-click="resetDefaultUrl()" translate> Set default url</a>
diff --git a/public/views/preferencesColor.html b/public/views/preferencesColor.html
index d28f1f6f7..d356610ef 100644
--- a/public/views/preferencesColor.html
+++ b/public/views/preferencesColor.html
@@ -1,4 +1,4 @@
-<ion-view ng-controller="preferencesColorController" cache-view="false">
+<ion-view>
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Color</ion-nav-title>
     <ion-nav-buttons side="primary">
@@ -7,7 +7,7 @@
      </button>
     </ion-nav-buttons>
   </ion-nav-bar>
-  <ion-content class="has-header">
+  <ion-content class="has-header" ng-controller="preferencesColorController" cache-view="false">
     <ion-radio ng-repeat="c in colorList" ng-value="c" ng-model="currentColor" ng-click="save(c)">
       <span ng-style="{'color': c}">&block;</span>
     </ion-radio>
diff --git a/public/views/preferencesDeleteWallet.html b/public/views/preferencesDeleteWallet.html
index 04969db7a..26781c44a 100644
--- a/public/views/preferencesDeleteWallet.html
+++ b/public/views/preferencesDeleteWallet.html
@@ -1,4 +1,4 @@
-<ion-view ng-controller="preferencesDeleteWalletController" cache-view="false">
+<ion-view>
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Delete Wallet</ion-nav-title>
     <ion-nav-buttons side="primary">
@@ -7,7 +7,7 @@
      </button>
     </ion-nav-buttons>
   </ion-nav-bar>
-  <ion-content class="has-header">
+  <ion-content class="has-header" ng-controller="preferencesDeleteWalletController" cache-view="false">
     <div translate>Warning!</div>
     <div translate>Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED</div>
     <div class="right" ng-style="{'color':index.backgroundColor}" ng-show="!isDeletingWallet">
diff --git a/public/views/preferencesDeleteWords.html b/public/views/preferencesDeleteWords.html
index 54b72dc9d..bd9c69d28 100644
--- a/public/views/preferencesDeleteWords.html
+++ b/public/views/preferencesDeleteWords.html
@@ -1,4 +1,4 @@
-<ion-view ng-controller="preferencesDeleteWordsController" cache-view="false">
+<ion-view>
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Delete Recovery Phrase</ion-nav-title>
     <ion-nav-buttons side="primary">
@@ -7,7 +7,7 @@
      </button>
     </ion-nav-buttons>
   </ion-nav-bar>
-  <ion-content class="has-header">
+  <ion-content class="has-header" ng-controller="preferencesDeleteWordsController" cache-view="false">
     <div ng-show="!deleted">
       <div ng-show="error">
         {{error|translate}}
diff --git a/public/views/preferencesEmail.html b/public/views/preferencesEmail.html
index 7af7b5b62..02477b291 100644
--- a/public/views/preferencesEmail.html
+++ b/public/views/preferencesEmail.html
@@ -1,4 +1,4 @@
-<ion-view ng-controller="preferencesEmailController" cache-view="false">
+<ion-view>
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Email Notifications</ion-nav-title>
     <ion-nav-buttons side="primary">
@@ -7,7 +7,7 @@
      </button>
     </ion-nav-buttons>
   </ion-nav-bar>
-  <ion-content class="has-header">
+  <ion-content class="has-header" ng-controller="preferencesEmailController" cache-view="false">
     <form name="emailForm" ng-submit="save(emailForm)" novalidate>
       <label class="item item-input item-stacked-label">
         <span class="input-label" transalate>Email for wallet notifications</span>
diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html
index e8d5ebaff..fd7b697bd 100644
--- a/public/views/preferencesFee.html
+++ b/public/views/preferencesFee.html
@@ -1,4 +1,4 @@
-<ion-view ng-controller="preferencesFeeController" cache-view="false" ng-init="init()">
+<ion-view>
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Preferences fee</ion-nav-title>
     <ion-nav-buttons side="primary">
@@ -8,7 +8,7 @@
      </ion-nav-buttons>
   </ion-nav-bar>
 
-  <ion-content>
+  <ion-content ng-controller="preferencesFeeController" cache-view="false" ng-init="init()">
     <div ng-show="loading">
       <ion-spinner class="spinner-dark" icon="lines">Loading...</ion-spinner>
     </div>
diff --git a/public/views/preferencesHistory.html b/public/views/preferencesHistory.html
index afe85b24f..4bd955531 100644
--- a/public/views/preferencesHistory.html
+++ b/public/views/preferencesHistory.html
@@ -1,4 +1,4 @@
-<ion-view ng-controller="preferencesHistory" cache-view="false" ng-init="index.updatingTxHistory ? null : csvHistory()">
+<ion-view>
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Transaction History</ion-nav-title>
     <ion-nav-buttons side="primary">
@@ -7,7 +7,7 @@
      </button>
     </ion-nav-buttons>
   </ion-nav-bar>
-  <ion-content class="has-header">
+  <ion-content class="has-header" ng-controller="preferencesHistory" cache-view="false" ng-init="index.updatingTxHistory ? null : csvHistory()">
     <div class="item item-divider"></div>
     <div class="item" ng-show="csvReady && !index.isCordova" ng-csv="csvContent" csv-header="csvHeader" filename="Copay-{{index.alias || index.walletName}}.csv">
       <span translate>Export to file</span>
diff --git a/public/views/preferencesInformation.html b/public/views/preferencesInformation.html
index 7e0587475..82f1787db 100644
--- a/public/views/preferencesInformation.html
+++ b/public/views/preferencesInformation.html
@@ -1,5 +1,5 @@
 
-<ion-view ng-controller="preferencesInformation" cache-view="false" ng-init="init()">
+<ion-view>
   <ion-nav-bar class="bar-stable">
   <ion-nav-title>Wallet Information</ion-nav-title>
     <ion-nav-buttons side="primary">
@@ -8,7 +8,7 @@
        </button>
     </ion-nav-buttons>
   </ion-nav-bar>
-  <ion-content class="has-header">
+  <ion-content class="has-header" ng-controller="preferencesInformation" cache-view="false" ng-init="init()">
     <div class="list">
       <div class="item item-divider">
         Wallet Information
diff --git a/public/views/preferencesLanguage.html b/public/views/preferencesLanguage.html
index 4509bd097..30f7b81dd 100644
--- a/public/views/preferencesLanguage.html
+++ b/public/views/preferencesLanguage.html
@@ -1,4 +1,4 @@
-<ion-view ng-controller="preferencesLanguageController" ng-init="init()" cache-view="false">
+<ion-view>
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Languages</ion-nav-title>
     <ion-nav-buttons side="primary">
@@ -7,7 +7,7 @@
      </button>
     </ion-nav-buttons>
   </ion-nav-bar>
-  <ion-content>
+  <ion-content ng-controller="preferencesLanguageController" ng-init="init()" cache-view="false">
     <ion-radio ng-repeat="lang in availableLanguages" ng-value="lang.isoCode" ng-model="currentLanguage"
       ng-click="save(lang.isoCode)">{{lang.name}}
     </ion-radio>
diff --git a/public/views/preferencesLogs.html b/public/views/preferencesLogs.html
index 51238b476..682db28f8 100644
--- a/public/views/preferencesLogs.html
+++ b/public/views/preferencesLogs.html
@@ -1,4 +1,4 @@
-<ion-view ng-controller="preferencesLogs" ng-init="init()" cache-view="false">
+<ion-view>
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Session log</ion-nav-title>
     <ion-nav-buttons side="primary">
@@ -7,7 +7,7 @@
      </button>
     </ion-nav-buttons>
   </ion-nav-bar>
-  <ion-content>
+  <ion-content ng-controller="preferencesLogs" ng-init="init()" cache-view="false">
     <button ng-show="isCordova" ng-click="logs.sendLogs()"><i class="fi-mail"></i>
     <span translate>Send by email</span>
     </button>
diff --git a/public/views/preferencesUnit.html b/public/views/preferencesUnit.html
index 262889c6c..7fa4769c6 100644
--- a/public/views/preferencesUnit.html
+++ b/public/views/preferencesUnit.html
@@ -1,4 +1,4 @@
-<ion-view ng-controller="preferencesUnitController" ng-init="init()" cache-view="false">
+<ion-view>
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Unit</ion-nav-title>
     <ion-nav-buttons side="primary">
@@ -7,7 +7,7 @@
      </button>
     </ion-nav-buttons>
   </ion-nav-bar class="bar-stable">
-  <ion-content>
+  <ion-content ng-controller="preferencesUnitController" ng-init="init()" cache-view="false">
     <ion-radio ng-repeat="unit in unitList" ng-value="unit.code" ng-model="currentUnit"
       ng-click="save(unit)">{{unit.shortName}}
     </ion-radio>
diff --git a/public/views/tab-home.html b/public/views/tab-home.html
index fab3bf2f0..e7d193aa8 100644
--- a/public/views/tab-home.html
+++ b/public/views/tab-home.html
@@ -1,5 +1,8 @@
 
-<ion-view view-title="Home">
+<ion-view>
+  <ion-nav-bar class="bar-stable">
+    <ion-nav-title>Home</ion-nav-title>
+  </ion-nav-bar>
   <ion-content class="padding home" ng-controller="tabHomeController">
     <a href="#/add"><i class="ion-ios-plus-outline right"></i></a>
     <h2>Wallets </h2>
@@ -8,7 +11,7 @@
 
         <li ng-show="wallets[0]"
           ng-repeat="item in wallets track by $index" class="item item-icon-left"
-          menu-toggle href ui-sref="walletDetails({'walletId': item.id})">
+          menu-toggle href ui-sref="wallet.details({'walletId': item.id})">
             <i class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i>
             {{item.name || item.id}}
             <span  ng-show="item.n > 1" class="text-gray">
diff --git a/public/views/tab-receive.html b/public/views/tab-receive.html
index 7877b0ce3..7e2ae157f 100644
--- a/public/views/tab-receive.html
+++ b/public/views/tab-receive.html
@@ -1,6 +1,6 @@
-<ion-view ng-controller="tabReceiveController" cache-view="false">
+<ion-view>
   <ion-nav-title>Receive</ion-nav-title>
-  <ion-content ng-init="init()">
+  <ion-content ng-controller="tabReceiveController" ng-init="init()"  cache-view="false">
 
     <div class="text-center m30v" ng-click="copyToClipboard(addr, $event)" ng-show="addr" >
       <qrcode size="220" data="bitcoin:{{addr}}" ng-show="addr"></qrcode>
@@ -34,7 +34,7 @@ Error: {{addrError}}
       </div>
     </div>
 
- 
+
     <div ng-show="!incomplete">
       <div class="item item-icon-left" ng-click="shareAddress(addr)" ng-show="isCordova && addr" ng-disabled="generatingAddress">
         <i class="icon ion-ios-upload-outline"></i>
diff --git a/public/views/tab-settings.html b/public/views/tab-settings.html
index 869da746a..019ad8190 100644
--- a/public/views/tab-settings.html
+++ b/public/views/tab-settings.html
@@ -1,6 +1,6 @@
-<ion-view ng-controller="tabSettingsController" cache-view="false" ng-init="init()">
+<ion-view>
   <ion-nav-title>Global Settings</ion-nav-title>
-  <ion-content class="has-header">
+  <ion-content class="has-header" ng-controller="tabSettingsController" cache-view="false" ng-init="init()">
     <div class="item item-divider">
     </div>
     <div class="list">
diff --git a/public/views/termOfUse.html b/public/views/termOfUse.html
index ad094b3c7..9d06a1ae3 100644
--- a/public/views/termOfUse.html
+++ b/public/views/termOfUse.html
@@ -1,4 +1,4 @@
-<ion-view ng-controller="termOfUseController" cache-view="false">
+<ion-view>
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Terms of Use</ion-nav-title>
     <ion-nav-buttons side="primary">
@@ -7,7 +7,7 @@
      </button>
     </ion-nav-buttons>
   </ion-nav-bar>
-  <ion-content>
+  <ion-content ng-controller="termOfUseController" cache-view="false">
 		<p>
 			<div ng-include="'views/includes/terms.html'"></div>
 		</p>
diff --git a/public/views/translators.html b/public/views/translators.html
index ffbfa1ec1..db809c8bf 100644
--- a/public/views/translators.html
+++ b/public/views/translators.html
@@ -1,4 +1,4 @@
-<ion-view cache-view="false">
+<ion-view>
   <ion-nav-bar class="bar-stable">
   <ion-nav-title>Translators</ion-nav-title>
   <ion-nav-buttons side="primary">
diff --git a/public/views/walletDetails.html b/public/views/walletDetails.html
index b34bda48f..a9a229bad 100644
--- a/public/views/walletDetails.html
+++ b/public/views/walletDetails.html
@@ -1,19 +1,21 @@
 
 
 <ion-view ng-controller="walletDetailsController">
+  <ion-nav-bar class="bar-stable">
+    <ion-nav-title>{{wallet.name}}</ion-nav-title>
 
-  <ion-nav-title>{{wallet.name}}</ion-nav-title>
-
-  <ion-nav-buttons side="primary">
-    <button class="button" href ui-sref="tabs.home">
-      <i class="ion-arrow-left-c"></i> Back
-    </button>
-  </ion-nav-buttons>
-  <ion-nav-buttons side="secondary">
-      <button class="button button-icon icon ion-ios-settings" href ui-sref="preferences"></button>
-  </ion-nav-buttons>
+    <ion-nav-buttons side="primary">
+      <button class="button" href ui-sref="tabs.home">
+        <i class="ion-arrow-left-c"></i> Back
+      </button>
+    </ion-nav-buttons>
+    <ion-nav-buttons side="secondary">
+        <button class="button button-icon icon ion-ios-settings" href ui-sref="wallet.preferences"></button>
+    </ion-nav-buttons>
+  </ion-nav-bar>
 
   <ion-content delegate-handle="my-handle" overflow-scroll="true">
+    <button class="button button-icon icon ion-ios-settings" href ui-sref="wallet.preferences"></button>
 
     <div ng-show="!wallet">
       No Wallet
diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js
index f06efe8e5..6d753c779 100644
--- a/src/js/controllers/preferences.js
+++ b/src/js/controllers/preferences.js
@@ -1,11 +1,11 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesController',
-  function($scope, $rootScope, $timeout, $log, configService, profileService, fingerprintService, walletService) {
+  function($scope, $rootScope, $timeout, $log, $stateParams, configService, profileService, fingerprintService, walletService) {
 
     var fc;
     var config = configService.getSync();
-
+    console.log($stateParams);
     var disableFocusListener = $rootScope.$on('Local/NewFocusedWalletReady', function() {
       $scope.init();
     });
@@ -19,6 +19,11 @@ angular.module('copayApp.controllers').controller('preferencesController',
 
       fc = profileService.focusedClient;
       if (fc) {
+
+        $scope.backgroundColor = fc.color;
+        config.aliasFor = config.aliasFor || {};
+        $scope.walletName = fc.credentials.walletName;
+        $scope.alias = config.aliasFor[fc.credentials.walletId] || $scope.walletName;
         $scope.encryptEnabled = walletService.isEncrypted(fc);
         if (fc.isPrivKeyExternal)
           $scope.externalSource = fc.getPrivKeyExternalSourceName() == 'ledger' ? 'Ledger' : 'Trezor';
diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js
index e432286fb..279389173 100644
--- a/src/js/controllers/walletDetails.js
+++ b/src/js/controllers/walletDetails.js
@@ -84,8 +84,8 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
   var wallet = profileService.getWallet($stateParams.walletId);
   $scope.wallet = wallet;
 
-
   if (wallet) {
+    profileService.setAndStoreFocus(wallet.id, function() {});
     walletService.updateStatus(wallet, {}, function(err, status) {
       if (err) {} // TODO
     });
diff --git a/src/js/routes.js b/src/js/routes.js
index 8fbb2c2a6..f981b0172 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -14,7 +14,7 @@ if (window && window.navigator) {
 
 //Setting up route
 angular.module('copayApp').config(function(historicLogProvider, $provide, $logProvider, $stateProvider, $urlRouterProvider, $compileProvider) {
-    $urlRouterProvider.otherwise('/tabs');
+    $urlRouterProvider.otherwise('/tabs/home');
 
     $logProvider.debugEnabled(true);
     $provide.decorator('$log', ['$delegate', 'platformInfo',
@@ -93,17 +93,25 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
           }
         }
       })
-      .state('walletDetails', {
-        url: '/details',
+      .state('wallet', {
+        url: '/wallet/{walletId}',
+        abstract: true,
         needProfile: true,
         views: {
           'main': {
-            templateUrl: 'views/walletDetails.html',
+            template: '<ui-view/>',
           },
         },
-        params: {
-          walletId: null,
-        },
+      })
+      .state('wallet.details', {
+        url: '/details',
+        needProfile: true,
+        templateUrl: 'views/walletDetails.html'
+      })
+      .state('wallet.preferences', {
+        url: '/preferences',
+        needProfile: true,
+        templateUrl: 'views/preferences.html'
       })
       .state('walletHome', {
         url: '/old',
@@ -238,16 +246,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
           walletId: null,
         },
       })
-      .state('preferences', {
-        url: '/preferences',
-        templateUrl: 'views/preferences.html',
-        needProfile: true,
-        views: {
-          'main': {
-            templateUrl: 'views/preferences.html',
-          },
-        }
-      })
       .state('preferencesLanguage', {
         url: '/preferencesLanguage',
         needProfile: true,
