Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/settings_views_polish

# Conflicts:
#	public/views/preferencesLanguage.html

public/views/activity.html

@@ -1,11 +1,12 @@
-
 <ion-view>
   <ion-nav-bar class="bar-royal">
-    <ion-nav-title>Recent Activity</ion-nav-title>
+    <ion-nav-title>
+      {{'Recent Activity'|translate}}
+    </ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
-  <ion-content class="padding" ng-controller="activityController" ng-init="init()">
+  <ion-content class="padding">
 
     <div ng-if="fetchingNotifications" class="updatingHistory">
       <div class="text-center">

public/views/addressbook.html

@@ -12,7 +12,7 @@
     </ion-nav-buttons>
   </ion-nav-bar>
 
-  <ion-content ng-init="initAddressbook()">
+  <ion-content>
 
     <div class="bar bar-header item-input-inset" ng-show="!isEmptyList">
       <label class="item-input-wrapper">

public/views/amazon.html

@@ -5,13 +5,13 @@
     <ion-nav-title>Amazon.com Gift Cards</ion-nav-title>
   </ion-nav-bar>
 
-  <ion-content ng-controller="amazonController as amazon" ng-init="amazon.init()">
+  <ion-content>
 
     <div class="box-notification warning" ng-show="network == 'testnet'">
       Sandbox version. Only for testing purpose
     </div>
 
-    <div class="m20t text-center" ng-click="amazon.updatePendingGiftCards()">
+    <div class="m20t text-center" ng-click="updatePendingGiftCards()">
       <img src="img/GCs-logo-cllb.png" alt="Amazon.com Gift Card" width="200">
       <div class="size-11 m10t"><b>Only</b> redeemable on www.amazon.com (USA website)</div>
     </div>
@@ -42,7 +42,7 @@
           Your cards
         </div>
         <div ng-repeat="(id, item) in giftCards | orderObjectBy:'date':true track by $index"
-             ng-click="amazon.openCardModal(item)"
+             ng-click="openCardModal(item)"
              class="item item-avatar">
           <img src="img/a-smile_color_btn.png" alt="{{id}}" width="40">
           <h2 ng-if="item.claimCode">

public/views/amount.html

@@ -1,10 +1,13 @@
 <ion-view id="view-amount">
   <ion-nav-bar class="bar-royal">
+    <ion-nav-title>
+      {{'Enter Amount'|translate}}
+    </ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
 
-  <ion-content scroll="false" class="amount" ng-controller="amountController" ng-init="init()">
+  <ion-content scroll="false">
 
     <div>
       <div class="item item-no-bottom-border" translate>Recipient</div>

public/views/backup.html

@@ -1,4 +1,4 @@
-<ion-view id="wallet-backup-phrase" title="{{viewTitle}}" ng-controller="backupController" ng-init="init()">
+<ion-view id="wallet-backup-phrase" title="{{viewTitle}}">
   <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
       <button class="button button-back button-clear" ng-click="backupGoBack()">

public/views/buyAmazon.html

@@ -5,7 +5,7 @@
     <ion-nav-title>Buy</ion-nav-title>
   </ion-nav-bar>
 
-  <ion-content ng-controller="buyAmazonController as buy" ng-init="buy.init()">
+  <ion-content>
 
     <div ng-show="!buy.giftCard">
 

public/views/buyGlidera.html

@@ -5,7 +5,7 @@
     <ion-nav-title>Buy</ion-nav-title>
   </ion-nav-bar>
 
-  <ion-content ng-controller="buyGlideraController as buy" ng-init="init()">
+  <ion-content>
 
     <div class="box-notification warning" ng-show="network == 'testnet'">
       Testnet wallets only work with Glidera Sandbox Accounts

public/views/confirm.html

@@ -1,4 +1,4 @@
-<ion-view id="view-confirm" ng-controller="confirmController" ng-init="init()">
+<ion-view id="view-confirm">
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>
       {{'Confirm'|translate}}
@@ -52,6 +52,6 @@
       </div>
     </div>
   </ion-content>
-  <button class="button button-block button-positive accept-button" ng-click="approve()" ng-if="!isCordova" translate>Click to pay</button>
-  <accept class="accept-slide" ng-if="isCordova"></accept>
+  <button class="button button-block button-positive accept-button" ng-click="approve()" ng-if="!isCordova" ng-disabled="!fee" translate>Click to pay</button>
+  <accept class="accept-slide" ng-if="isCordova && fee"></accept>
 </ion-view>

public/views/export.html

@@ -5,7 +5,7 @@
     </ion-nav-back-button>
   </ion-nav-bar>
 
-  <ion-content ng-controller="exportController" ng-init="file = true; init();">
+  <ion-content ng-init="file = true">
     <div class="row text-center">
       <div class="col" ng-click="file = true" ng-style="file && {'border-bottom': '2px solid'}">
         <span class="" translate>File/Text</span>

public/views/glidera.html

@@ -5,7 +5,7 @@
     <ion-nav-title>Glidera</ion-nav-title>
   </ion-nav-bar>
 
-  <ion-content ng-controller="glideraController as glidera" ng-init="init()">
+  <ion-content>
 
     <div class="box-notification error" ng-show="!network">
       Glidera is disabled for this application

public/views/glideraUri.html

@@ -5,7 +5,7 @@
     <ion-nav-title>Glidera</ion-nav-title>
   </ion-nav-bar>
 
-  <ion-content ng-controller="glideraUriController" ng-init="checkCode()">
+  <ion-content>
 
     <div class="box-notification warning" ng-show="network == 'testnet'">
       Testnet wallets only work with Glidera Sandbox Accounts

public/views/modals/tx-status.html

@@ -7,10 +7,10 @@
     <div class="size-16 text-gray m10v">
       <span translate>Sent</span>
     </div>
-    <div class="text-center m20t" ng-if="entryExist">
+    <div class="text-center m20t" ng-if="entryExist || !fromSendTab">
       <a class="button button-positive" ng-click="cancel()" translate>OKAY</a>
     </div>
-    <div class="collect-address" ng-if="!entryExist">
+    <div class="collect-address" ng-if="!entryExist && fromSendTab">
       <div class="row">
         <p translate class="col">Would you like to add this address to your address book?</p>
       </div>

public/views/modals/txp-details.html

@@ -162,5 +162,5 @@
     </div>
   </ion-content>
   <button class="button button-block button-positive accept-button" ng-click="approve()" ng-if="!isCordova" translate>Click to pay</button>
-  <accept class="accept-slide" ng-if="tx.pendingForUs && canSign && !loading && !paymentExpired"></accept>
+  <accept class="accept-slide" ng-if="tx.pendingForUs && canSign && !loading && !paymentExpired && isCordova"></accept>
 </ion-modal-view>

public/views/paperWallet.html

@@ -5,7 +5,7 @@
     </ion-nav-back-button>
   </ion-nav-bar>
 
-  <ion-content ng-controller="paperWalletController" ng-init="init()">
+  <ion-content>
     <div class="row" ng-show="needsBackup">
       <div class="columns">
         <h4></h4>

public/views/preferences.html

@@ -1,9 +1,12 @@
 <ion-view class="settings">
   <ion-nav-bar class="bar-royal">
+    <ion-nav-title>
+      {{'Wallet Preferences'|translate}}
+    </ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
-  <ion-content ng-controller="preferencesController" ng-init="init()">
+  <ion-content>
     <div class="list">
       <div class="item item-divider"></div>
       <a class="item item-icon-right" ui-sref="tabs.preferences.preferencesAlias">

public/views/preferencesAbout.html

@@ -3,7 +3,7 @@
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
-  <ion-content ng-controller="preferencesAbout">
+  <ion-content>
     <div class="list">
       <div class="item item-divider" translate>
         Release information

public/views/preferencesAdvanced.html

@@ -4,7 +4,7 @@
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
-  <ion-content ng-controller="preferencesAdvancedController">
+  <ion-content>
     <div class="list">
       <div class="item item-divider">
       </div>

public/views/preferencesAlias.html

@@ -1,9 +1,12 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
+    <ion-nav-title>
+      {{'Alias'|translate}}
+    </ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
-  <ion-content ng-controller="preferencesAliasController" >
+  <ion-content>
     <form name="aliasForm" ng-submit="save(aliasForm)" novalidate>
       <div class="card list">
         <label class="item item-input item-stacked-label">

public/views/preferencesAltCurrency.html

@@ -1,9 +1,12 @@
 <ion-view class="settings">
   <ion-nav-bar class="bar-royal">
+    <ion-nav-title>
+      {{'Alternative Currency'|translate}}
+    </ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
-  <ion-content ng-controller="preferencesAltCurrencyController" ng-init="init()" >
+  <ion-content>
     <ion-radio ng-repeat="altCurrency in altCurrencyList" ng-value="altCurrency.isoCode" ng-model="currentCurrency"
       ng-click="save(altCurrency)">{{altCurrency.name}}
     </ion-radio>

public/views/preferencesBwsUrl.html

@@ -1,9 +1,10 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
+    <ion-nav-title>Wallet Service URL</ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
-  <ion-content ng-controller="preferencesBwsUrlController">
+  <ion-content>
 
     <div class="card list">
       <label class="item item-input item-stacked-label no-border">

public/views/preferencesColor.html

@@ -1,9 +1,12 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
+    <ion-nav-title>
+      {{'Alias'|translate}}
+    </ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
-  <ion-content ng-controller="preferencesColorController" >
+  <ion-content>
     <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>

public/views/preferencesDeleteWallet.html

@@ -1,9 +1,10 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
+    <ion-nav-title>{{'Delete Wallet' | translate}}</ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
-  <ion-content ng-controller="preferencesDeleteWalletController" >
+  <ion-content>
     <div class="card">
       <h1 class="text-center" translate>Warning!</h2>
       <div class="assertive padding" translate>Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED</div>

public/views/preferencesDeleteWords.html

@@ -1,9 +1,12 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
+    <ion-nav-title>
+      {{'Delete recovery phrase'|translate}}
+    </ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
-  <ion-content ng-controller="preferencesDeleteWordsController" >
+  <ion-content>
     <div ng-show="!deleted">
       <div ng-show="error">
         {{error|translate}}

public/views/preferencesEmail.html

@@ -1,9 +1,12 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
+    <ion-nav-title>
+      {{'Email Notifications'|translate}}
+    </ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
-  <ion-content ng-controller="preferencesEmailController" >
+  <ion-content>
     <form name="emailForm" ng-submit="save(emailForm)" novalidate>
       <div class="card list">
         <label class="item item-input item-stacked-label">

public/views/preferencesFee.html

@@ -1,10 +1,13 @@
 <ion-view class="settings">
   <ion-nav-bar class="bar-royal">
+    <ion-nav-title>
+      {{'Bitcoin Network Fee Policy'|translate}}
+    </ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
 
-  <ion-content ng-controller="preferencesFeeController"  ng-init="init()">
+  <ion-content>
     <ion-radio ng-repeat="fee in feeLevels.livenet" ng-value="fee.level" ng-model="currentFeeLevel" ng-click="save(fee)">
       {{feeOpts[fee.level]|translate}}
     </ion-radio>

public/views/preferencesGlidera.html

@@ -5,7 +5,7 @@
     <ion-nav-title>Preferences</ion-nav-title>
   </ion-nav-bar>
 
-  <ion-content ng-controller="preferencesGlideraController" ng-init="init()">
+  <ion-content>
 
     <ul class="list">
       <div ng-if="token">

public/views/preferencesHistory.html

@@ -1,9 +1,10 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
+    <ion-nav-title>{{'Transaction History' | translate}}</ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
-  <ion-content ng-controller="preferencesHistory" ng-init="csvHistory()">
+  <ion-content>
     <div class="item item-divider"></div>
     <div class="item" ng-show="csvReady && !isCordova" ng-csv="csvContent" csv-header="csvHeader" filename="Copay-{{wallet.name}}.csv">
       <span translate>Export to file</span>

public/views/preferencesInformation.html

@@ -1,9 +1,10 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
+    <ion-nav-title>{{'Wallet Information' | translate}}</ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
-  <ion-content   ng-controller="preferencesInformation"  ng-init="init()">
+  <ion-content>
     <div class="list">
       <div class="item item-divider"></div>
       <div class="item" ng-click="saveBlack()">

public/views/preferencesLanguage.html

@@ -1,9 +1,12 @@
 <ion-view id="preferences-language" class="settings">
   <ion-nav-bar class="bar-royal">
+    <ion-nav-title>
+      {{'Language'|translate}}
+    </ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
-  <ion-content ng-controller="preferencesLanguageController" ng-init="init()" >
+  <ion-content>
     <div class="list">
       <ion-radio ng-repeat="lang in availableLanguages" ng-value="lang.isoCode" ng-model="currentLanguage"
         ng-click="save(lang.isoCode)">{{lang.name}}
@@ -17,4 +20,4 @@
       </span>
     </div>
   </ion-content>
-</ion-view>
+</ion-view>

public/views/preferencesLogs.html

@@ -1,9 +1,18 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
+    <ion-nav-title>{{'Session Log' | translate}}</ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
-  <ion-content ng-controller="preferencesLogs" ng-init="init()">
+  <ion-content>
+    <button class="button button-block button-positive" copy-to-clipboard="prepare()">
+      <i class="icon ion-clipboard"></i>
+      <span translate>Copy to clipboard</span>
+    </button>
+    <button class="button button-block button-positive" ng-show="isCordova" ng-click="sendLogs()">
+      <i class="icon ion-ios-email-outline"></i>
+      <span translate>Send by email</span>
+    </button>
     <div class="card">
       <div class="item item-text-wrap">
         <ul>
@@ -15,13 +24,5 @@
         </ul>
       </div>
     </div>
-    <button class="button button-block button-positive" copy-to-clipboard="prepare()">
-      <i class="icon ion-clipboard"></i>
-      <span translate>Copy to clipboard</span>
-    </button>
-    <button class="button button-block button-positive" ng-show="isCordova" ng-click="sendLogs()">
-      <i class="icon ion-ios-email-outline"></i>
-      <span translate>Send by email</span>
-    </button>
   </ion-content>
 </ion-view>

public/views/preferencesUnit.html

@@ -1,9 +1,12 @@
 <ion-view class="settings">
   <ion-nav-bar class="bar-royal">
+    <ion-nav-title>
+      {{'Unit'|translate}}
+    </ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
-  <ion-content ng-controller="preferencesUnitController" ng-init="init()" >
+  <ion-content>
     <ion-radio ng-repeat="unit in unitList" ng-value="unit.code" ng-model="currentUnit"
       ng-click="save(unit)">{{unit.shortName}}
     </ion-radio>

public/views/proposals.html

@@ -7,14 +7,23 @@
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
-  <ion-content class="padding" ng-controller="proposalsController" ng-init="init()">
+  <ion-content class="padding">
 
-   <div class="list card">
+    <div ng-if="fetchingProposals" class="updatingHistory">
+      <div class="text-center">
+        <ion-spinner class="spinner-dark" icon="lines"></ion-spinner>
+        <div translate>Updating pending proposals. Please stand by</div>
+      </div>
+    </div>
+
+    <div class="list card" ng-show="txps[0] && !fetchingProposals">
       <a ng-repeat="tx in txps" class="item" ng-click="openTxpModal(tx)">
         <span ng-include="'views/includes/txp.html'"></span>
       </a>
+    </div>
 
-      <div class="item" ng-show="!txps[0]">
+    <div class="list card" ng-show="!txps[0] && !fetchingProposals">
+      <div class="item">
         <span translate>No pending proposals</span>
       </div>
     </div>

public/views/sellGlidera.html

@@ -5,7 +5,7 @@
     <ion-nav-title>Sell</ion-nav-title>
   </ion-nav-bar>
 
-  <ion-content ng-controller="sellGlideraController as sell" ng-init="init()">
+  <ion-content>
 
     <div class="box-notification warning" ng-show="network == 'testnet'">
       Testnet wallets only work with Glidera Sandbox Accounts

public/views/tab-home.html

@@ -3,7 +3,7 @@
     <ion-nav-title>{{'Home' | translate}}</ion-nav-title>
   </ion-nav-bar>
 
-  <ion-content class="padding" ng-controller="tabHomeController" ng-init="updateAllWallets(); nextStep()">
+  <ion-content class="padding">
     <div class="list card homeTip" ng-show="homeTip">
       <div class="item item-icon-right item-heading">
         <a ng-click="hideHomeTip()"><i class="icon ion-ios-close-empty close-home-tip"></i></a>

public/views/tab-receive.html

@@ -1,4 +1,4 @@
-<ion-view id="tab-receive" ng-controller="tabReceiveController" ng-init="init()">
+<ion-view id="tab-receive">
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Receive' | translate}}</ion-nav-title>
     <ion-nav-buttons side="secondary">
@@ -10,8 +10,11 @@
   <ion-content>
     <article id="address">
       <div class="row">
-        <div class="m15t text-center col col-60 center-block" copy-to-clipboard="addr">
-          <qrcode size="220" data="bitcoin:{{addr}}"></qrcode>
+        <div class="m15t text-center col center-block" copy-to-clipboard="addr">
+          <qrcode ng-if="addr" size="220" data="bitcoin:{{addr}}"></qrcode>
+          <div ng-if="!addr" style="height:220px; width:220px; margin:auto; background: white; padding-top: 20%;">
+            ...
+          </div>
           <div ng-if="wallet.needsBackup" class="assertive m10t" 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>
@@ -25,7 +28,7 @@
           </div>
         </div>
         <div class="col" ng-class="{'center-block col-50': !isCordova || !addr}">
-          <div class="item item-icon-left" ng-click="setAddress(null, true)">
+          <div class="item item-icon-left" ng-click="setAddress(true)">
             <i class="icon ion-ios-loop"></i>
             <span translate>Next Address</span>
           </div>
@@ -46,11 +49,7 @@
         <span translate>No Wallet</span>
       </div>
       <div class="list" ng-if="wallets[0]">
-                <!-- <div class="item item-icon-left" ng-click="setAddress(null, true)">
-          <i class="icon ion-ios-loop"></i>
-          <span translate>Next Address</span>
-        </div> -->
-        <wallets ng-if="wallets[0]" wallets="wallets"></wallets>
+        <wallets wallets="wallets"></wallets>
       </div>
     </article>
   </ion-content>

public/views/tab-scan.html

@@ -1,12 +0,0 @@
-<ion-view>
-  <ion-nav-bar class="bar-royal">
-    <ion-nav-title>{{'Scan' | translate}}</ion-nav-title>
-  </ion-nav-bar>
-
-  <ion-content class="padding" ng-controller="tabScanController" ng-init="init()">
-
-    <canvas id="qr-canvas" width="200" height="150"></canvas>
-    <video id="qrcode-scanner-video" width="300" height="225"></video>
-
-  </ion-content>
-</ion-view>

public/views/tab-send.html

@@ -3,7 +3,7 @@
     <ion-nav-title>{{'Send' | translate}}</ion-nav-title>
   </ion-nav-bar>
 
-  <ion-content ng-controller="tabSendController" ng-init="init()">
+  <ion-content>
     <div>
       <div class="item item-heading" translate>Recipient</div>
       <label class="item item-input bitcoin-address">

public/views/tab-settings.html

@@ -3,7 +3,7 @@
     <ion-nav-title>{{'Global Settings' | translate}}</ion-nav-title>
   </ion-nav-bar>
 
-  <ion-content ng-controller="tabSettingsController" ng-init="init()">
+  <ion-content>
     <div class="list">
       <div class="item item-divider"></div>
       <a class="item item-icon-left item-icon-right" ui-sref="tabs.addressbook">
@@ -53,7 +53,7 @@
       <div ng-show="usePushNotifications && PNEnabledByUser">
         <div class="item item-divider" translate>Notifications</div>
 
-        <ion-toggle ng-model="pushNotifications" toggle-class="toggle-balanced" ng-change="pushNotificationsChange()">
+        <ion-toggle ng-model="pushNotifications.value" toggle-class="toggle-balanced" ng-change="pushNotificationsChange()">
           <span class="toggle-label" translate>Enable push notifications</span>
         </ion-toggle>
 
@@ -67,7 +67,7 @@
 
       <div class="item item-divider" translate>Exchanges</div>
 
-      <ion-toggle ng-show="!isWP" ng-model="glideraEnabled" toggle-class="toggle-balanced" ng-change="glideraChange()">
+      <ion-toggle ng-show="!isWP" ng-model="glideraEnabled.value" toggle-class="toggle-balanced" ng-change="glideraChange()">
         <span class="toggle-label" translate>Enable Glidera Service</span>
       </ion-toggle>
 
@@ -80,20 +80,20 @@
 
       <div class="item item-divider" translate>Others</div>
 
-      <ion-toggle ng-model="spendUnconfirmed" toggle-class="toggle-balanced" ng-change="spendUnconfirmedChange()">
+      <ion-toggle ng-model="spendUnconfirmed.value" toggle-class="toggle-balanced" ng-change="spendUnconfirmedChange()">
         <span class="toggle-label" translate>Use Unconfirmed Funds</span>
       </ion-toggle>
 
       <div class="item item-divider" translate>Wallets Preferences</div>
       <a class="item item-icon-left item-icon-right" href
-           ui-sref="tabs.preferences.main({'walletId': item.id})"
+           ui-sref="tabs.preferences({'walletId': item.id})"
            ng-repeat="item in wallets track by $index">
         <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-light">
           {{item.m}}-of-{{item.n}}
         </span>
-        <span class="badge badge-assertive" ng-show="!item.isComplete()" translate>
+        <span class="right text-light assertive" ng-show="!item.isComplete()" translate>
           Incomplete
         </span>
         <i class="icon nav-item-arrow-right"></i>

public/views/termsOfUse.html

@@ -1,10 +1,11 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
+    <ion-nav-title>{{'Terms Of Use' | translate}}</ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
 
-  <ion-content class="padding" ng-controller="termOfUseController">
+  <ion-content class="padding">
     <div class="card">
       <div class="item item-text-wrap" ng-include="'views/includes/terms.html'"></div>
     </div>

public/views/translators.html

@@ -4,7 +4,7 @@
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
-  <ion-content ng-controller="translatorsController">
+  <ion-content>
     <div class="list">
       <div class="item item-divider" translate>
         Translation Credits

public/views/walletDetails.html

@@ -1,4 +1,4 @@
-<ion-view id="walletDetails" ng-controller="walletDetailsController" ng-init="init()">
+<ion-view id="walletDetails">
   <ion-nav-bar ng-style="{'background-color': walletDetailsColor}">
     <ion-nav-title>{{walletDetailsName}}</ion-nav-title>
     <ion-nav-back-button>