From 62a1a1a87a57c04ca1468acd42bdff3278db2518 Mon Sep 17 00:00:00 2001
From: Nick Cardin <nick@cardin.email>
Date: Wed, 31 Aug 2016 15:54:40 -0400
Subject: [PATCH 01/26] use ionic scss instead of css, set ionic vars

---
 Gruntfile.js                     | 8 +-------
 src/sass/{views => }/common.scss | 0
 src/sass/ionic.scss              | 8 ++++++++
 src/sass/main.scss               | 3 ++-
 4 files changed, 11 insertions(+), 8 deletions(-)
 rename src/sass/{views => }/common.scss (100%)
 create mode 100644 src/sass/ionic.scss

diff --git a/Gruntfile.js b/Gruntfile.js
index b007c8083..026c4d499 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -94,7 +94,7 @@ module.exports = function(grunt) {
         },
         files: [{
           expand: true,
-          src: ['src/sass/*.scss'],
+          src: ['src/sass/main.scss'],
           dest: './',
           ext: '.css'
         }]
@@ -193,12 +193,6 @@ module.exports = function(grunt) {
         src: 'bower_components/ionic/release/js/ionic.bundle.min.js',
         dest: 'public/lib/'
       },
-      ionic_css: {
-        expand: true,
-        flatten: true,
-        src: 'bower_components/ionic/release/css/ionic.min.css',
-        dest: 'public/css/'
-      },
       linux: {
         files: [{
           expand: true,
diff --git a/src/sass/views/common.scss b/src/sass/common.scss
similarity index 100%
rename from src/sass/views/common.scss
rename to src/sass/common.scss
diff --git a/src/sass/ionic.scss b/src/sass/ionic.scss
new file mode 100644
index 000000000..3d7a67ec2
--- /dev/null
+++ b/src/sass/ionic.scss
@@ -0,0 +1,8 @@
+/* Set ionic variables */
+$font-family-sans-serif: "Roboto", sans-serif;
+$font-family-light-sans-serif: "Roboto-Light", sans-serif-light;
+$royal: #1e3186;
+
+
+
+@import "../../bower_components/ionic/scss/ionic";
diff --git a/src/sass/main.scss b/src/sass/main.scss
index 0ece1c388..acf737299 100644
--- a/src/sass/main.scss
+++ b/src/sass/main.scss
@@ -997,6 +997,7 @@ input[type=number] {
   }
 }
 
-@import "views/common";
+@import "ionic";
+@import "common";
 @import "views/tab-home";
 @import "views/includes/walletActivity";

From 9fa4da88c68a1ef2c6deab96d73378b3526ba398 Mon Sep 17 00:00:00 2001
From: Nick Cardin <nick@cardin.email>
Date: Wed, 31 Aug 2016 15:54:53 -0400
Subject: [PATCH 02/26] update top bar color

---
 public/views/activity.html                 | 2 +-
 public/views/amazon.html                   | 2 +-
 public/views/bitpayCard.html               | 2 +-
 public/views/buyAmazon.html                | 2 +-
 public/views/buyGlidera.html               | 2 +-
 public/views/buyandsell.html               | 2 +-
 public/views/copayers.html                 | 2 +-
 public/views/glidera.html                  | 2 +-
 public/views/join.html                     | 2 +-
 public/views/modals/addressbook.html       | 2 +-
 public/views/modals/scanner.html           | 2 +-
 public/views/onboarding/backupWarning.html | 2 +-
 public/views/onboarding/collectEmail.html  | 2 +-
 public/views/onboarding/terms.html         | 2 +-
 public/views/onboarding/tour.html          | 2 +-
 public/views/preferencesBitpayCard.html    | 2 +-
 public/views/preferencesGlidera.html       | 2 +-
 public/views/sellGlidera.html              | 2 +-
 public/views/tab-create-personal.html      | 2 +-
 public/views/tab-create-shared.html        | 2 +-
 public/views/tab-export-file.html          | 2 +-
 public/views/tab-export-qrCode.html        | 2 +-
 public/views/tab-home.html                 | 2 +-
 public/views/tab-import-file.html          | 2 +-
 public/views/tab-import-hardware.html      | 2 +-
 public/views/tab-import-phrase.html        | 2 +-
 public/views/tab-scan.html                 | 2 +-
 public/views/tab-settings.html             | 2 +-
 public/views/walletDetails.html            | 2 +-
 29 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/public/views/activity.html b/public/views/activity.html
index d10d45479..1002f3d43 100644
--- a/public/views/activity.html
+++ b/public/views/activity.html
@@ -1,6 +1,6 @@
 
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-title>Recent Activity</ion-nav-title>
     <ion-nav-buttons side="primary">
       <button class="button no-border" ui-sref="tabs.home">
diff --git a/public/views/amazon.html b/public/views/amazon.html
index 730035d41..fcb498100 100644
--- a/public/views/amazon.html
+++ b/public/views/amazon.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
       <button class="button no-border" ui-sref="tabs.home">
         Close
diff --git a/public/views/bitpayCard.html b/public/views/bitpayCard.html
index 3a7dc4ec5..ecfd9bdd6 100644
--- a/public/views/bitpayCard.html
+++ b/public/views/bitpayCard.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
       <button class="button no-border" ui-sref="tabs.home">
         Close
diff --git a/public/views/buyAmazon.html b/public/views/buyAmazon.html
index d428c84e2..749d66125 100644
--- a/public/views/buyAmazon.html
+++ b/public/views/buyAmazon.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
       <button class="button no-border" ui-sref="amazon.main">
         <i class="icon ion-chevron-left"></i> Back
diff --git a/public/views/buyGlidera.html b/public/views/buyGlidera.html
index a447eff9b..fa14a145c 100644
--- a/public/views/buyGlidera.html
+++ b/public/views/buyGlidera.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
       <button class="button no-border" ui-sref="glidera.main">
         <i class="icon ion-chevron-left"></i> Back
diff --git a/public/views/buyandsell.html b/public/views/buyandsell.html
index a516f5b69..b107fae15 100644
--- a/public/views/buyandsell.html
+++ b/public/views/buyandsell.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
       <button class="button no-border" ui-sref="tabs.home">
         Close
diff --git a/public/views/copayers.html b/public/views/copayers.html
index 66f9133d3..92330a040 100644
--- a/public/views/copayers.html
+++ b/public/views/copayers.html
@@ -1,6 +1,6 @@
 
 <ion-view  ng-controller="copayersController">
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{wallet.name}}</ion-nav-title>
     <ion-nav-buttons side="primary">
       <button class="button" href ui-sref="tabs.home">
diff --git a/public/views/glidera.html b/public/views/glidera.html
index b626ad29d..9f6ca236b 100644
--- a/public/views/glidera.html
+++ b/public/views/glidera.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
       <button class="button no-border" ui-sref="tabs.home">
         Close
diff --git a/public/views/join.html b/public/views/join.html
index 97b18ae75..fd191f449 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
       <button class="button no-border" ui-sref="add.main">
         <i class="icon ion-chevron-left"></i> Back
diff --git a/public/views/modals/addressbook.html b/public/views/modals/addressbook.html
index db6b28dd8..441468e98 100644
--- a/public/views/modals/addressbook.html
+++ b/public/views/modals/addressbook.html
@@ -1,5 +1,5 @@
 <ion-modal-view ng-controller="addressbookModalController" ng-init="initAddressbook()">
-  <ion-header-bar align-title="center" class="bar-stable">
+  <ion-header-bar align-title="center" class="bar-royal">
     <button class="button button-clear button-positive"
             ng-click="closeAddressbookModal()">
       Close
diff --git a/public/views/modals/scanner.html b/public/views/modals/scanner.html
index fb2a9916f..30e197f49 100644
--- a/public/views/modals/scanner.html
+++ b/public/views/modals/scanner.html
@@ -1,5 +1,5 @@
 <ion-modal-view ng-controller="scannerController" ng-init="init()">
-  <ion-header-bar align-title="center" class="bar-stable">
+  <ion-header-bar align-title="center" class="bar-royal">
     <button ng-click="cancel()" class="button button-clear button-positive" translate>
       Close
     </button>
diff --git a/public/views/onboarding/backupWarning.html b/public/views/onboarding/backupWarning.html
index 0a5a4086d..4a6a37be2 100644
--- a/public/views/onboarding/backupWarning.html
+++ b/public/views/onboarding/backupWarning.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
       <button class="button no-border" href ui-sref="onboarding.backupRequest">
         <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
diff --git a/public/views/onboarding/collectEmail.html b/public/views/onboarding/collectEmail.html
index eb5bda54b..5ae812fba 100644
--- a/public/views/onboarding/collectEmail.html
+++ b/public/views/onboarding/collectEmail.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable" ng-controller="backController">
+  <ion-nav-bar class="bar-royal" ng-controller="backController">
     <ion-nav-buttons side="secondary">
       <button class="button no-border" ng-click="onboardingMailSkip()">
         {{'Skip' | translate}}
diff --git a/public/views/onboarding/terms.html b/public/views/onboarding/terms.html
index 49861a15e..9b1197e31 100644
--- a/public/views/onboarding/terms.html
+++ b/public/views/onboarding/terms.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Terms of Use' | translate}}</ion-nav-title>
     <ion-nav-buttons side="primary">
       <button class="button no-border" href ui-sref="onboarding.disclaimer">
diff --git a/public/views/onboarding/tour.html b/public/views/onboarding/tour.html
index 0261a14c1..d1eaf79b2 100644
--- a/public/views/onboarding/tour.html
+++ b/public/views/onboarding/tour.html
@@ -1,5 +1,5 @@
 <ion-view ng-controller="tourController" ng-init="init()">
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Get Started' | translate}}</ion-nav-title>
     <ion-nav-buttons side="primary">
       <button class="button no-border" ng-click="goBack()">
diff --git a/public/views/preferencesBitpayCard.html b/public/views/preferencesBitpayCard.html
index b281f8fcb..55ad3e244 100644
--- a/public/views/preferencesBitpayCard.html
+++ b/public/views/preferencesBitpayCard.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
       <button class="button no-border" ui-sref="bitpayCard.main">
         <i class="icon ion-chevron-left"></i> Back
diff --git a/public/views/preferencesGlidera.html b/public/views/preferencesGlidera.html
index dedea52b0..6177aa21f 100644
--- a/public/views/preferencesGlidera.html
+++ b/public/views/preferencesGlidera.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
       <button class="button no-border" ui-sref="glidera.main">
         <i class="icon ion-chevron-left"></i> Back
diff --git a/public/views/sellGlidera.html b/public/views/sellGlidera.html
index f5a7796e8..5e6c2bbed 100644
--- a/public/views/sellGlidera.html
+++ b/public/views/sellGlidera.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
       <button class="button no-border" ui-sref="glidera.main">
         <i class="icon ion-chevron-left"></i> Back
diff --git a/public/views/tab-create-personal.html b/public/views/tab-create-personal.html
index 8114e1739..721ad1243 100644
--- a/public/views/tab-create-personal.html
+++ b/public/views/tab-create-personal.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
       <button class="button no-border" ui-sref="add.main">
         <i class="icon ion-chevron-left"></i> Back
diff --git a/public/views/tab-create-shared.html b/public/views/tab-create-shared.html
index 758d8ef3f..9512c5ec6 100644
--- a/public/views/tab-create-shared.html
+++ b/public/views/tab-create-shared.html
@@ -1,4 +1,4 @@
-<ion-nav-bar class="bar-stable">
+<ion-nav-bar class="bar-royal">
   <ion-nav-buttons side="primary">
     <button class="button no-border" ui-sref="add.main">
       <i class="icon ion-chevron-left"></i> Back
diff --git a/public/views/tab-export-file.html b/public/views/tab-export-file.html
index 9a2e8a450..cd1fba70b 100644
--- a/public/views/tab-export-file.html
+++ b/public/views/tab-export-file.html
@@ -1,4 +1,4 @@
-<ion-nav-bar class="bar-stable">
+<ion-nav-bar class="bar-royal">
   <ion-nav-title>Export Wallet</ion-nav-title>
   <ion-nav-buttons side="primary">
     <button class="button no-border" ui-sref="wallet.preferencesAdvanced">
diff --git a/public/views/tab-export-qrCode.html b/public/views/tab-export-qrCode.html
index a16fcd428..785770b07 100644
--- a/public/views/tab-export-qrCode.html
+++ b/public/views/tab-export-qrCode.html
@@ -1,4 +1,4 @@
-<ion-nav-bar class="bar-stable">
+<ion-nav-bar class="bar-royal">
   <ion-nav-title>Export Wallet</ion-nav-title>
   <ion-nav-buttons side="primary">
     <button class="button no-border" ui-sref="wallet.preferencesAdvanced">
diff --git a/public/views/tab-home.html b/public/views/tab-home.html
index 0c258b9e6..952a865db 100644
--- a/public/views/tab-home.html
+++ b/public/views/tab-home.html
@@ -1,5 +1,5 @@
 <ion-view id="tab-home">
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-title>Home</ion-nav-title>
   </ion-nav-bar>
 
diff --git a/public/views/tab-import-file.html b/public/views/tab-import-file.html
index e0069afa8..fee2116b2 100644
--- a/public/views/tab-import-file.html
+++ b/public/views/tab-import-file.html
@@ -1,4 +1,4 @@
-<ion-nav-bar class="bar-stable" ng-controller="backController">
+<ion-nav-bar class="bar-royal" ng-controller="backController">
   <ion-nav-buttons side="primary">
     <button class="button no-border" ng-click="importGoBack()">
       <i class="icon ion-chevron-left"></i> Back
diff --git a/public/views/tab-import-hardware.html b/public/views/tab-import-hardware.html
index 041f3d499..b99545d5d 100644
--- a/public/views/tab-import-hardware.html
+++ b/public/views/tab-import-hardware.html
@@ -1,4 +1,4 @@
-<ion-nav-bar class="bar-stable" ng-controller="backController">
+<ion-nav-bar class="bar-royal" ng-controller="backController">
   <ion-nav-buttons side="primary">
     <button class="button no-border" ng-click="importGoBack()">
       <i class="icon ion-chevron-left"></i> Back
diff --git a/public/views/tab-import-phrase.html b/public/views/tab-import-phrase.html
index 42d4525fd..7ac9264eb 100644
--- a/public/views/tab-import-phrase.html
+++ b/public/views/tab-import-phrase.html
@@ -1,4 +1,4 @@
-<ion-nav-bar class="bar-stable" ng-controller="backController">
+<ion-nav-bar class="bar-royal" ng-controller="backController">
   <ion-nav-buttons side="primary">
     <button class="button no-border" ng-click="importGoBack()">
       <i class="icon ion-chevron-left"></i> Back
diff --git a/public/views/tab-scan.html b/public/views/tab-scan.html
index 1c6296cb8..a3a605892 100644
--- a/public/views/tab-scan.html
+++ b/public/views/tab-scan.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-title>Scan</ion-nav-title>
   </ion-nav-bar>
 
diff --git a/public/views/tab-settings.html b/public/views/tab-settings.html
index dd7a257c5..45fe76f71 100644
--- a/public/views/tab-settings.html
+++ b/public/views/tab-settings.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-title>Global Settings</ion-nav-title>
   </ion-nav-bar>
 
diff --git a/public/views/walletDetails.html b/public/views/walletDetails.html
index 498be236f..94a7d4ac1 100644
--- a/public/views/walletDetails.html
+++ b/public/views/walletDetails.html
@@ -1,7 +1,7 @@
 
 
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{wallet.name}}</ion-nav-title>
     <ion-nav-buttons side="primary">
       <button class="button no-border" ui-sref="tabs.home">

From 09859996a29bd9d1380cecfffdb434181337a72e Mon Sep 17 00:00:00 2001
From: Nick Cardin <nick@cardin.email>
Date: Wed, 31 Aug 2016 15:57:52 -0400
Subject: [PATCH 03/26] fix accidental logic inversion

---
 public/views/tab-home.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/views/tab-home.html b/public/views/tab-home.html
index 952a865db..28be09b04 100644
--- a/public/views/tab-home.html
+++ b/public/views/tab-home.html
@@ -80,14 +80,14 @@
       <div class="item item-heading">
         Next steps
       </div>
-      <a ng-show="!!wallets[0]" ui-sref="add.main" class="item item-icon-left item-big-icon-left item-icon-right">
+      <a ng-show="!wallets[0]" ui-sref="add.main" class="item item-icon-left item-big-icon-left item-icon-right">
        <i class="icon big-icon-svg">
          <img class="icon-create-wallet"/>
        </i>
         <span>Crate a bitcoin wallet</span>
         <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
       </a>
-      <a ng-show="!!externalServices.BuyAndSell" ui-sref="buyandsell" class="item item-icon-left item-big-icon-left item-icon-right">
+      <a ng-show="!externalServices.BuyAndSell" ui-sref="buyandsell" class="item item-icon-left item-big-icon-left item-icon-right">
        <i class="icon big-icon-svg">
          <img class="icon-buy-bitcoin"/>
        </i>

From bacf1fb68f7c40d8a894580093a312549f3c068a Mon Sep 17 00:00:00 2001
From: Nick Cardin <nick@cardin.email>
Date: Wed, 31 Aug 2016 17:10:54 -0400
Subject: [PATCH 04/26] update add wallet view

---
 public/views/add.html   | 22 +++++++++++-----------
 src/sass/ionic.scss     |  1 +
 src/sass/main.scss      |  1 +
 src/sass/views/add.scss | 13 +++++++++++++
 4 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 src/sass/views/add.scss

diff --git a/public/views/add.html b/public/views/add.html
index 1b8413172..647e5e2b8 100644
--- a/public/views/add.html
+++ b/public/views/add.html
@@ -1,5 +1,5 @@
-<ion-view>
-  <ion-nav-bar>
+<ion-view id="view-add">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Add wallet' | translate}}</ion-nav-title>
     <ion-nav-buttons side="primary">
       <button class="button no-border" ng-click="$ionicGoBack()">
@@ -10,20 +10,20 @@
 
   <ion-content>
     <ion-list>
-      <ion-item class="item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="add.create.personal">
+      <a class="item item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="add.create.personal">
         <h2 translate>Create new wallet</h2>
-        <i class="icon ion-chevron-right icon-accessory"></i>
-      </ion-item>
+        <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
+      </a>
 
-      <ion-item class="item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="add.join">
+      <a class="item item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="add.join">
         <h2 translate>Join shared wallet</h2>
-        <i class="icon ion-chevron-right icon-accessory"></i>
-      </ion-item>
+        <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
+      </a>
 
-      <ion-item class="item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="add.import.phrase">
+      <a class="item item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="add.import.phrase">
         <h2 translate>Import wallet</h2>
-        <i class="icon ion-chevron-right icon-accessory"></i>
-      </ion-item>
+        <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
+      </a>
     </ion-list>
 
   </ion-content>
diff --git a/src/sass/ionic.scss b/src/sass/ionic.scss
index 3d7a67ec2..436a4babd 100644
--- a/src/sass/ionic.scss
+++ b/src/sass/ionic.scss
@@ -2,6 +2,7 @@
 $font-family-sans-serif: "Roboto", sans-serif;
 $font-family-light-sans-serif: "Roboto-Light", sans-serif-light;
 $royal: #1e3186;
+$base-background-color: #f5f5f5;
 
 
 
diff --git a/src/sass/main.scss b/src/sass/main.scss
index acf737299..8b0fa552d 100644
--- a/src/sass/main.scss
+++ b/src/sass/main.scss
@@ -999,5 +999,6 @@ input[type=number] {
 
 @import "ionic";
 @import "common";
+@import "views/add";
 @import "views/tab-home";
 @import "views/includes/walletActivity";
diff --git a/src/sass/views/add.scss b/src/sass/views/add.scss
new file mode 100644
index 000000000..9dd30968f
--- /dev/null
+++ b/src/sass/views/add.scss
@@ -0,0 +1,13 @@
+#view-add {
+
+  .item {
+    margin-bottom: 10px;
+    margin-left: 10px;
+    margin-right: 10px;
+
+    &:first-child {
+      margin-top: 25px;
+    }
+  }
+
+}

From 8d762b380b6f8cb1ff7bfe2b46da5f662f089ddf Mon Sep 17 00:00:00 2001
From: Nick Cardin <nick@cardin.email>
Date: Wed, 31 Aug 2016 18:02:15 -0400
Subject: [PATCH 05/26] standardize buttons and bar color

---
 public/views/add.html                 |  4 ++--
 public/views/amount.html              |  6 +++---
 public/views/bitpayCard.html          |  7 +++----
 public/views/join.html                |  3 +--
 public/views/tab-create-personal.html |  2 +-
 public/views/tab-create-shared.html   |  2 +-
 public/views/tab-import-file.html     |  4 ++--
 public/views/tab-import-hardware.html |  2 +-
 public/views/tab-import-phrase.html   |  2 +-
 public/views/tab-receive.html         |  2 +-
 public/views/tab-send.html            |  2 +-
 src/sass/common.scss                  | 16 ++++++++++++++++
 12 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/public/views/add.html b/public/views/add.html
index 647e5e2b8..fdcdf2481 100644
--- a/public/views/add.html
+++ b/public/views/add.html
@@ -2,8 +2,8 @@
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Add wallet' | translate}}</ion-nav-title>
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ng-click="$ionicGoBack()">
-        {{'Close' | translate}}
+      <button class="button back-button" ng-click="$ionicGoBack()">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>
diff --git a/public/views/amount.html b/public/views/amount.html
index 1e93728ee..ab8060e86 100644
--- a/public/views/amount.html
+++ b/public/views/amount.html
@@ -1,8 +1,8 @@
 <ion-view>
-  <ion-nav-bar>
+  <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ng-click="$ionicGoBack()">
-        <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
+      <button class="button back-button" ng-click="$ionicGoBack()">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>
diff --git a/public/views/bitpayCard.html b/public/views/bitpayCard.html
index ecfd9bdd6..d242adbc6 100644
--- a/public/views/bitpayCard.html
+++ b/public/views/bitpayCard.html
@@ -43,7 +43,7 @@
              ng-submit="bitpayCard.authenticate()"
              novalidate>
 
-          <div class="list">
+          <div class="card list">
             <label class="item item-input item-stacked-label">
               <span class="input-label">Email</span>
               <input name="email"
@@ -63,7 +63,7 @@
             </label>
           </div>
 
-          <input class="button button-block"
+          <input class="button button-block button-positive"
                  type="submit"
                  ng-disabled="!authenticateForm.$valid || bitpayCard.authenticating"
                  value="Login">
@@ -90,7 +90,7 @@
             </label>
           </div>
 
-          <input class="button button-block"
+          <input class="button button-block button-positive"
                  type="submit"
                  ng-disabled="!authenticate2FAForm.$valid || bitpayCard.authenticating"
                  value="Login">
@@ -231,4 +231,3 @@
     </div>
   </ion-content>
 </ion-view>
-
diff --git a/public/views/join.html b/public/views/join.html
index fd191f449..8b0b488c6 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -17,7 +17,7 @@
 
     <form name="joinForm" ng-submit="join.join(joinForm)" novalidate>
 
-      <div class="list">
+      <div class="card list">
 
         <div class="row">
           <div class="col">
@@ -133,4 +133,3 @@
     </form>
   </ion-content>
 </ion-view>
-
diff --git a/public/views/tab-create-personal.html b/public/views/tab-create-personal.html
index 721ad1243..9be346cb3 100644
--- a/public/views/tab-create-personal.html
+++ b/public/views/tab-create-personal.html
@@ -16,7 +16,7 @@
 
     <form name="setupForm" ng-submit="create.create(setupForm)" novalidate>
 
-      <div class="list">
+      <div class="card list">
         <label ng-hide="create.hideWalletName" class="item item-input item-stacked-label">
           <span class="input-label" translate>Wallet name</span>
           <input type="text"
diff --git a/public/views/tab-create-shared.html b/public/views/tab-create-shared.html
index 9512c5ec6..41aa6c8b6 100644
--- a/public/views/tab-create-shared.html
+++ b/public/views/tab-create-shared.html
@@ -15,7 +15,7 @@
 
   <form name="setupForm" ng-submit="create.create(setupForm)" novalidate>
 
-    <div class="list">
+    <div class="card list">
       <label ng-hide="create.hideWalletName" class="item item-input item-stacked-label">
         <span class="input-label" translate>Wallet name</span>
         <input type="text"
diff --git a/public/views/tab-import-file.html b/public/views/tab-import-file.html
index fee2116b2..c3f5a8c76 100644
--- a/public/views/tab-import-file.html
+++ b/public/views/tab-import-file.html
@@ -15,7 +15,7 @@
 
   <form name="importForm" ng-submit="importBlob(importForm)" novalidate>
 
-    <div class="list">
+    <div class="list card">
 
       <label class="item item-input item-stacked-label no-border" ng-show="!isSafari && !isCordova">
         <div class="input-label" translate>Choose a backup file from your computer</div>
@@ -56,7 +56,7 @@
     </div>
 
     <button type="submit"
-            class="button round expand black"
+            class="button button-block button-positive"
             ng-disabled="importForm.$invalid || !password " translate>
       Import backup
     </button>
diff --git a/public/views/tab-import-hardware.html b/public/views/tab-import-hardware.html
index b99545d5d..f3f018f38 100644
--- a/public/views/tab-import-hardware.html
+++ b/public/views/tab-import-hardware.html
@@ -22,7 +22,7 @@
     </div>
 
     <div ng-show="seedOptions[0]">
-      <div class="list">
+      <div class="card list">
 
         <label class="item item-input item-select">
           <div class="input-label" translate>
diff --git a/public/views/tab-import-phrase.html b/public/views/tab-import-phrase.html
index 7ac9264eb..1c38bfd47 100644
--- a/public/views/tab-import-phrase.html
+++ b/public/views/tab-import-phrase.html
@@ -28,7 +28,7 @@
   </div>
 
   <form name="importForm12" ng-submit="importMnemonic(importForm12)" novalidate>
-    <div class="list">
+    <div class="list card">
 
       <div class="row">
         <div class="col col-90">
diff --git a/public/views/tab-receive.html b/public/views/tab-receive.html
index 6036b7127..284ba4210 100644
--- a/public/views/tab-receive.html
+++ b/public/views/tab-receive.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar>
+  <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Receive' | translate}}</ion-nav-title>
   </ion-nav-bar>
 
diff --git a/public/views/tab-send.html b/public/views/tab-send.html
index b3041548c..d9251a946 100644
--- a/public/views/tab-send.html
+++ b/public/views/tab-send.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar>
+  <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Send' | translate}}</ion-nav-title>
   </ion-nav-bar>
 
diff --git a/src/sass/common.scss b/src/sass/common.scss
index 53cb79b97..38548d25a 100644
--- a/src/sass/common.scss
+++ b/src/sass/common.scss
@@ -25,3 +25,19 @@
     box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.3);
   }
 }
+
+.back-button {
+  border: 0;
+  .icon:before {
+    color: #fff;
+    font-size: 30px !important;
+    font-weight: bold;
+    margin-left: 5px;
+  }
+}
+
+.button-block {
+  width: 90% !important;
+  margin-left: auto;
+  margin-right: auto;
+}

From 92bb8e01bc93fc774d550e5a51bc67db0867f793 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 1 Sep 2016 10:56:13 -0300
Subject: [PATCH 06/26] Uses popupService

---
 public/views/join.html                  |  4 --
 public/views/modals/txp-details.html    |  3 -
 public/views/tab-create-personal.html   |  4 --
 public/views/tab-create-shared.html     |  4 --
 public/views/tab-import-file.html       |  4 --
 public/views/tab-import-hardware.html   |  4 --
 public/views/tab-import-phrase.html     | 24 +++-----
 public/views/tab-receive.html           |  4 --
 src/js/controllers/buyGlidera.js        |  1 -
 src/js/controllers/copayers.js          |  2 +-
 src/js/controllers/create.js            | 18 +++---
 src/js/controllers/export.js            | 13 ++---
 src/js/controllers/import.js            | 73 ++++++++-----------------
 src/js/controllers/join.js              | 18 +++---
 src/js/controllers/modals/txpDetails.js | 20 ++-----
 src/js/controllers/preferencesBwsUrl.js |  1 -
 src/js/controllers/preferencesDelete.js |  5 +-
 src/js/controllers/tab-receive.js       |  5 +-
 src/js/services/walletService.js        | 21 +------
 19 files changed, 64 insertions(+), 164 deletions(-)

diff --git a/public/views/join.html b/public/views/join.html
index 7529baf11..fa4509e16 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -11,10 +11,6 @@
 
   <ion-content ng-controller="joinController as join">
 
-    <div class="padding assertive" ng-show="join.error">
-      {{join.error|translate}}
-    </div>
-
     <form name="joinForm" ng-submit="join.join(joinForm)" novalidate>
 
       <div class="list">
diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index a8e26e216..fdc3ba9f2 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -25,9 +25,6 @@
 
     </li>
     <li class="item">
-        <div class="assertive" ng-show="error">
-          <span class="text-warning size-14">{{error|translate}}</span>
-        </div>
 
         <div class="row" ng-if="tx.removed">
           <div class="column m20t text-center text-warning size-12" translate>
diff --git a/public/views/tab-create-personal.html b/public/views/tab-create-personal.html
index 47044b542..c3a895c37 100644
--- a/public/views/tab-create-personal.html
+++ b/public/views/tab-create-personal.html
@@ -10,10 +10,6 @@
 
   <ion-content ng-controller="createController as create" ng-init="create.setTotalCopayers(1)">
 
-    <div class="padding assertive" ng-show="create.error">
-      {{create.error|translate}}
-    </div>
-
     <form name="setupForm" ng-submit="create.create(setupForm)" novalidate>
 
       <div class="list">
diff --git a/public/views/tab-create-shared.html b/public/views/tab-create-shared.html
index 66043765e..b7471cc68 100644
--- a/public/views/tab-create-shared.html
+++ b/public/views/tab-create-shared.html
@@ -10,10 +10,6 @@
 
   <ion-content ng-controller="createController as create" ng-init="create.setTotalCopayers(3)">
 
-    <div class="padding assertive" ng-show="create.error">
-      {{create.error|translate}}
-    </div>
-
     <form name="setupForm" ng-submit="create.create(setupForm)" novalidate>
 
       <div class="list">
diff --git a/public/views/tab-import-file.html b/public/views/tab-import-file.html
index f215ac6f2..0f24c12bf 100644
--- a/public/views/tab-import-file.html
+++ b/public/views/tab-import-file.html
@@ -10,10 +10,6 @@
 
   <ion-content ng-controller="importController" ng-init="type='file'">
 
-    <div class="padding assertive" ng-show="error">
-      {{error|translate}}
-    </div>
-
     <form name="importForm" ng-submit="importBlob(importForm)" novalidate>
 
       <div class="list">
diff --git a/public/views/tab-import-hardware.html b/public/views/tab-import-hardware.html
index 6bef8121d..6f97a9259 100644
--- a/public/views/tab-import-hardware.html
+++ b/public/views/tab-import-hardware.html
@@ -10,10 +10,6 @@
 
   <ion-content ng-controller="importController" ng-init="type='hwWallet'">
 
-    <div class="padding assertive" ng-show="error">
-      {{error|translate}}
-    </div>
-
     <form name="importForm3" ng-submit="importHW(importForm3)" novalidate>
 
       <div class="card" ng-show="!seedOptions[0]">
diff --git a/public/views/tab-import-phrase.html b/public/views/tab-import-phrase.html
index 0ec717ba8..077738b3e 100644
--- a/public/views/tab-import-phrase.html
+++ b/public/views/tab-import-phrase.html
@@ -10,21 +10,15 @@
 
   <ion-content ng-controller="importController" ng-init="type='12'">
 
-    <div ng-show="importErr || error" class="padding assertive" ng-click="importErr = error = null">
-      <div ng-show="importErr">
-        <div translate>Could not access the wallet at the server. Please check:</div>
-        <ul>
-          <li translate>The password of the recovery phrase (if set)</li>
-          <li translate>The derivation path</li>
-          <li translate>The wallet service URL</li>
-        </ul>
-        <div translate>
-          NOTE: To import a wallet from a 3rd party software, please go to Add Wallet &gt; Create Wallet, and specify the Recovery Phrase there.
-        </div>
-      </div>
-
-      <div ng-show="error">
-        {{error|translate}}
+    <div ng-show="importErr" class="padding assertive" ng-click="importErr = null">
+      <div translate>Could not access the wallet at the server. Please check:</div>
+      <ul>
+        <li translate>The password of the recovery phrase (if set)</li>
+        <li translate>The derivation path</li>
+        <li translate>The wallet service URL</li>
+      </ul>
+      <div translate>
+        NOTE: To import a wallet from a 3rd party software, please go to Add Wallet &gt; Create Wallet, and specify the Recovery Phrase there.
       </div>
     </div>
 
diff --git a/public/views/tab-receive.html b/public/views/tab-receive.html
index cedff3b8b..7f2119913 100644
--- a/public/views/tab-receive.html
+++ b/public/views/tab-receive.html
@@ -11,10 +11,6 @@
       </div>
     </div>
 
-    <div class="padding assertive" ng-show="error">
-      {{error|translate}}
-    </div>
-
     <div class="list card padding text-center" ng-if="!wallets[0]">
       <span translate>No Wallet</span>
     </div>
diff --git a/src/js/controllers/buyGlidera.js b/src/js/controllers/buyGlidera.js
index 9da07038c..988fccb43 100644
--- a/src/js/controllers/buyGlidera.js
+++ b/src/js/controllers/buyGlidera.js
@@ -83,7 +83,6 @@ angular.module('copayApp.controllers').controller('buyGlideraController',
 
     this.getBuyPrice = function(token, price) {
       var self = this;
-      this.error = null;
       if (!price || (price && !price.qty && !price.fiat)) {
         this.buyPrice = null;
         return;
diff --git a/src/js/controllers/copayers.js b/src/js/controllers/copayers.js
index e9d4c662f..9e52e635a 100644
--- a/src/js/controllers/copayers.js
+++ b/src/js/controllers/copayers.js
@@ -45,7 +45,7 @@ angular.module('copayApp.controllers').controller('copayersController',
       profileService.deleteWalletClient(wallet, function(err) {
         ongoingProcess.set('deletingWallet', false);
         if (err) {
-          $scope.error = err.message || err;
+          popupService.showAlert(gettextCatalog.getString('Error'), err.message || err);
         } else {
           $state.transitionTo('tabs.home');
         }
diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index 1317959fa..1faf089f7 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('createController',
-  function($scope, $rootScope, $timeout, $log, lodash, $state, $ionicScrollDelegate, profileService, configService, gettext, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess, walletService, storageService) {
+  function($scope, $rootScope, $timeout, $log, lodash, $state, $ionicScrollDelegate, profileService, configService, gettext, gettextCatalog, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess, walletService, storageService, popupService) {
 
     var isChromeApp = platformInfo.isChromeApp;
     var isCordova = platformInfo.isCordova;
@@ -92,7 +92,7 @@ angular.module('copayApp.controllers').controller('createController',
 
     this.create = function(form) {
       if (form && form.$invalid) {
-        this.error = gettext('Please enter the required fields');
+        popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Please enter the required fields'));
         return;
       }
 
@@ -119,7 +119,7 @@ angular.module('copayApp.controllers').controller('createController',
 
         var pathData = derivationPathHelper.parse($scope.derivationPath);
         if (!pathData) {
-          this.error = gettext('Invalid derivation path');
+          popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid derivation path'));
           return;
         }
 
@@ -132,14 +132,14 @@ angular.module('copayApp.controllers').controller('createController',
       }
 
       if (setSeed && !opts.mnemonic && !opts.extendedPrivateKey) {
-        this.error = gettext('Please enter the wallet recovery phrase');
+        popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Please enter the wallet recovery phrase'));
         return;
       }
 
       if (self.seedSourceId == 'ledger' || self.seedSourceId == 'trezor') {
         var account = $scope.account;
         if (!account || account < 1) {
-          this.error = gettext('Invalid account number');
+          popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid account number'));
           return;
         }
 
@@ -154,8 +154,7 @@ angular.module('copayApp.controllers').controller('createController',
         src.getInfoForNewWallet(opts.n > 1, account, function(err, lopts) {
           ongoingProcess.set('connecting' + self.seedSourceId, false);
           if (err) {
-            self.error = err;
-            $scope.$apply();
+            popupService.showAlert(gettextCatalog.getString('Error'), err);
             return;
           }
           opts = lodash.assign(lopts, opts);
@@ -174,10 +173,7 @@ angular.module('copayApp.controllers').controller('createController',
           ongoingProcess.set('creatingWallet', false);
           if (err) {
             $log.warn(err);
-            self.error = err;
-            $timeout(function() {
-              $rootScope.$apply();
-            });
+            popupService.showAlert(gettextCatalog.getString('Error'), err);
             return;
           }
 
diff --git a/src/js/controllers/export.js b/src/js/controllers/export.js
index 1ea44845f..0a0690e85 100644
--- a/src/js/controllers/export.js
+++ b/src/js/controllers/export.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('exportController',
-  function($rootScope, $scope, $timeout, $log, lodash, backupService, walletService, storageService, profileService, platformInfo, gettext, gettextCatalog, $state, $stateParams) {
+  function($rootScope, $scope, $timeout, $log, lodash, backupService, walletService, storageService, profileService, platformInfo, gettext, gettextCatalog, $state, $stateParams, popupService) {
     var prevState;
     var isWP = platformInfo.isWP;
     var isAndroid = platformInfo.isAndroid;
@@ -10,7 +10,6 @@ angular.module('copayApp.controllers').controller('exportController',
     $scope.isEncrypted = wallet.isPrivKeyEncrypted();
     $scope.isCordova = platformInfo.isCordova;
     $scope.isSafari = platformInfo.isSafari;
-    $scope.error = null;
 
     $scope.init = function() {
       $scope.supported = true;
@@ -51,7 +50,7 @@ angular.module('copayApp.controllers').controller('exportController',
     $scope.downloadWalletBackup = function() {
       $scope.getAddressbook(function(err, localAddressBook) {
         if (err) {
-          $scope.error = true;
+          popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export'));
           return;
         }
         var opts = {
@@ -61,7 +60,7 @@ angular.module('copayApp.controllers').controller('exportController',
 
         backupService.walletDownload($scope.password, opts, function(err) {
           if (err) {
-            $scope.error = true;
+            popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export'));
             return;
           }
           $state.go('tabs.home');
@@ -87,7 +86,7 @@ angular.module('copayApp.controllers').controller('exportController',
     $scope.getBackup = function(cb) {
       $scope.getAddressbook(function(err, localAddressBook) {
         if (err) {
-          $scope.error = true;
+          popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export'));
           return cb(null);
         }
         var opts = {
@@ -97,9 +96,7 @@ angular.module('copayApp.controllers').controller('exportController',
 
         var ew = backupService.walletExport($scope.password, opts);
         if (!ew) {
-          $scope.error = true;
-        } else {
-          $scope.error = false;
+          popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export'));
         }
         return cb(ew);
       });
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index a5f09fd26..c1fbaf111 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('importController',
-  function($scope, $rootScope, $timeout, $log, $state, $stateParams, $ionicHistory, profileService, configService, sjcl, gettext, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService) {
+  function($scope, $rootScope, $timeout, $log, $state, $stateParams, $ionicHistory, profileService, configService, sjcl, gettext, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService, popupService, gettextCatalog) {
 
     var isChromeApp = platformInfo.isChromeApp;
     var isDevel = platformInfo.isDevel;
@@ -38,12 +38,11 @@ angular.module('copayApp.controllers').controller('importController',
       if (!code) return;
 
       $scope.importErr = false;
-      $scope.error = null;
       var parsedCode = code.split('|');
 
       if (parsedCode.length != 5) {
         /// Trying to import a malformed wallet export QR code
-        $scope.error = gettext('Incorrect code format');
+        popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Incorrect code format'));
         return;
       }
 
@@ -56,7 +55,7 @@ angular.module('copayApp.controllers').controller('importController',
       };
 
       if (info.type == 1 && info.hasPassphrase)
-        $scope.error = gettext('Password required. Make sure to enter your password in advanced options');
+        popupService.showAlert(gettextCatalog.getString('Password required. Make sure to enter your password in advanced options'));
 
       $scope.derivationPath = info.derivationPath;
       $scope.testnetEnabled = info.network == 'testnet' ? true : false;
@@ -69,7 +68,6 @@ angular.module('copayApp.controllers').controller('importController',
 
     $scope.setType = function(type) {
       $scope.type = type;
-      $scope.error = null;
       $timeout(function() {
         $rootScope.$apply();
       }, 1);
@@ -80,12 +78,12 @@ angular.module('copayApp.controllers').controller('importController',
       try {
         str2 = sjcl.decrypt($scope.password, str);
       } catch (e) {
-        err = gettext('Could not decrypt file, check your password');
+        err = gettextCatalog.getString('Could not decrypt file, check your password');
         $log.warn(e);
       };
 
       if (err) {
-        $scope.error = err;
+        popupService.showAlert(gettextCatalog.getString('Error'), err);
         $timeout(function() {
           $rootScope.$apply();
         });
@@ -100,7 +98,7 @@ angular.module('copayApp.controllers').controller('importController',
         profileService.importWallet(str2, opts, function(err, client) {
           ongoingProcess.set('importingWallet', false);
           if (err) {
-            $scope.error = err;
+            popupService.showAlert(gettextCatalog.getString('Error'), err);
             return;
 
           }
@@ -129,7 +127,7 @@ angular.module('copayApp.controllers').controller('importController',
             if (err instanceof errors.NOT_AUTHORIZED) {
               $scope.importErr = true;
             } else {
-              $scope.error = err;
+              popupService.showAlert(gettextCatalog.getString('Error'), err);
             }
             return $timeout(function() {
               $scope.$apply();
@@ -190,7 +188,7 @@ angular.module('copayApp.controllers').controller('importController',
             if (err instanceof errors.NOT_AUTHORIZED) {
               $scope.importErr = true;
             } else {
-              $scope.error = err;
+              popupService.showAlert(gettextCatalog.getString('Error'), err);
             }
             return $timeout(function() {
               $scope.$apply();
@@ -232,10 +230,7 @@ angular.module('copayApp.controllers').controller('importController',
 
     $scope.importBlob = function(form) {
       if (form.$invalid) {
-        $scope.error = gettext('There is an error in the form');
-        $timeout(function() {
-          $scope.$apply();
-        });
+        popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('There is an error in the form'));
         return;
       }
 
@@ -244,11 +239,7 @@ angular.module('copayApp.controllers').controller('importController',
       var password = form.password.$modelValue;
 
       if (!backupFile && !backupText) {
-        $scope.error = gettext('Please, select your backup file');
-        $timeout(function() {
-          $scope.$apply();
-        });
-
+        popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Please, select your backup file'));
         return;
       }
 
@@ -263,10 +254,7 @@ angular.module('copayApp.controllers').controller('importController',
 
     $scope.importMnemonic = function(form) {
       if (form.$invalid) {
-        $scope.error = gettext('There is an error in the form');
-        $timeout(function() {
-          $scope.$apply();
-        });
+        popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('There is an error in the form'));
         return;
       }
 
@@ -276,7 +264,7 @@ angular.module('copayApp.controllers').controller('importController',
 
       var pathData = derivationPathHelper.parse($scope.derivationPath);
       if (!pathData) {
-        $scope.error = gettext('Invalid derivation path');
+        popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid derivation path'));
         return;
       }
       opts.account = pathData.account;
@@ -284,10 +272,9 @@ angular.module('copayApp.controllers').controller('importController',
       opts.derivationStrategy = pathData.derivationStrategy;
 
       var words = form.words.$modelValue || null;
-      $scope.error = null;
 
       if (!words) {
-        $scope.error = gettext('Please enter the recovery phrase');
+        popupService.showAlert(gettextCatalog.getString('Please enter the recovery phrase'));
       } else if (words.indexOf('xprv') == 0 || words.indexOf('tprv') == 0) {
         return _importExtendedPrivateKey(words, opts);
       } else if (words.indexOf('xpub') == 0 || words.indexOf('tpuv') == 0) {
@@ -296,17 +283,11 @@ angular.module('copayApp.controllers').controller('importController',
         var wordList = words.split(/[\u3000\s]+/);
 
         if ((wordList.length % 3) != 0) {
-          $scope.error = gettext('Wrong number of recovery words:') + wordList.length;
+          popupService.showAlert(gettextCatalog.getString('Wrong number of recovery words:') + wordList.length);
+          return;
         }
       }
 
-      if ($scope.error) {
-        $timeout(function() {
-          $scope.$apply();
-        });
-        return;
-      }
-
       var passphrase = form.passphrase.$modelValue;
       opts.passphrase = form.passphrase.$modelValue || null;
 
@@ -317,8 +298,7 @@ angular.module('copayApp.controllers').controller('importController',
       trezor.getInfoForNewWallet(isMultisig, account, function(err, lopts) {
         ongoingProcess.clear();
         if (err) {
-          $scope.error = err;
-          $scope.$apply();
+          popupService.showAlert(gettextCatalog.getString('Error'), err);
           return;
         }
 
@@ -330,10 +310,8 @@ angular.module('copayApp.controllers').controller('importController',
         profileService.importExtendedPublicKey(lopts, function(err, wallet) {
           ongoingProcess.set('importingWallet', false);
           if (err) {
-            $scope.error = err;
-            return $timeout(function() {
-              $scope.$apply();
-            });
+            popupService.showAlert(gettextCatalog.getString('Error'), err);
+            return;
           }
 
 
@@ -354,13 +332,9 @@ angular.module('copayApp.controllers').controller('importController',
 
     $scope.importHW = function(form) {
       if (form.$invalid || $scope.account < 0) {
-        $scope.error = gettext('There is an error in the form');
-        $timeout(function() {
-          $scope.$apply();
-        });
+        popupService.showAlert(gettextCatalog.getString('There is an error in the form'));
         return;
       }
-      $scope.error = '';
       $scope.importErr = false;
 
       var account = +$scope.account;
@@ -400,8 +374,7 @@ angular.module('copayApp.controllers').controller('importController',
       ledger.getInfoForNewWallet(true, account, function(err, lopts) {
         ongoingProcess.clear();
         if (err) {
-          $scope.error = err;
-          $scope.$apply();
+          popupService.showAlert(gettextCatalog.getString('Error'), err);
           return;
         }
 
@@ -413,10 +386,8 @@ angular.module('copayApp.controllers').controller('importController',
         profileService.importExtendedPublicKey(lopts, function(err, wallet) {
           ongoingProcess.set('importingWallet', false);
           if (err) {
-            $scope.error = err;
-            return $timeout(function() {
-              $scope.$apply();
-            });
+            popupService.showAlert(gettextCatalog.getString('Error'), err);
+            return;
           }
 
 
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 4afdbd963..757a584b9 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('joinController',
-  function($scope, $rootScope, $timeout, $state, profileService, configService, storageService, applicationService, gettext, lodash, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess, walletService, $log, $stateParams) {
+  function($scope, $rootScope, $timeout, $state, profileService, configService, storageService, applicationService, gettext, gettextCatalog, lodash, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess, walletService, $log, $stateParams, popupService) {
 
     var isChromeApp = platformInfo.isChromeApp;
     var isDevel = platformInfo.isDevel;
@@ -14,7 +14,6 @@ angular.module('copayApp.controllers').controller('joinController',
 
 
     this.onQrCodeScanned = function(data) {
-console.log('[join.js.16:data:]',data); //TODO
       $scope.secret = data;
       if ($scope.joinForm) {
         $scope.joinForm.secret.$setViewValue(data);
@@ -64,7 +63,7 @@ console.log('[join.js.16:data:]',data); //TODO
 
     this.join = function(form) {
       if (form && form.$invalid) {
-        self.error = gettext('Please enter the required fields');
+        popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Please enter the required fields'));
         return;
       }
 
@@ -86,7 +85,7 @@ console.log('[join.js.16:data:]',data); //TODO
 
         var pathData = derivationPathHelper.parse($scope.derivationPath);
         if (!pathData) {
-          this.error = gettext('Invalid derivation path');
+          popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid derivation path'));
           return;
         }
         opts.account = pathData.account;
@@ -100,15 +99,14 @@ console.log('[join.js.16:data:]',data); //TODO
 
 
       if (setSeed && !opts.mnemonic && !opts.extendedPrivateKey) {
-
-        this.error = gettext('Please enter the wallet recovery phrase');
+        popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Please enter the wallet recovery phrase'));
         return;
       }
 
       if (self.seedSourceId == 'ledger' || self.seedSourceId == 'trezor') {
         var account = $scope.account;
         if (!account || account < 1) {
-          this.error = gettext('Invalid account number');
+          popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid account number'));
           return;
         }
 
@@ -122,8 +120,7 @@ console.log('[join.js.16:data:]',data); //TODO
         src.getInfoForNewWallet(true, account, function(err, lopts) {
           ongoingProcess.set('connecting' + self.seedSourceId, false);
           if (err) {
-            self.error = err;
-            $scope.$apply();
+            popupService.showAlert(gettextCatalog.getString('Error'), err);
             return;
           }
           opts = lodash.assign(lopts, opts);
@@ -141,8 +138,7 @@ console.log('[join.js.16:data:]',data); //TODO
         profileService.joinWallet(opts, function(err, client) {
           ongoingProcess.set('joiningWallet', false);
           if (err) {
-            self.error = err;
-            $rootScope.$apply();
+            popupService.showAlert(gettextCatalog.getString('Error'), err);
             return;
           }
 
diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js
index b426602e6..e76acb50b 100644
--- a/src/js/controllers/modals/txpDetails.js
+++ b/src/js/controllers/modals/txpDetails.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('txpDetailsController', function($scope, $rootScope, $timeout, $interval, $ionicModal, ongoingProcess, platformInfo, txStatus, $ionicScrollDelegate, txFormatService, fingerprintService, bwcError, gettextCatalog, lodash,  walletService) {
+angular.module('copayApp.controllers').controller('txpDetailsController', function($scope, $rootScope, $timeout, $interval, $ionicModal, ongoingProcess, platformInfo, txStatus, $ionicScrollDelegate, txFormatService, fingerprintService, bwcError, gettextCatalog, lodash,  walletService, popupService) {
   var self = $scope.self;
   var tx = $scope.tx;
   var copayers = $scope.copayers;
@@ -25,13 +25,11 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
   }
 
   var setSendError = function(msg) {
-    $scope.error = msg || gettextCatalog.getString('Could not send payment');
+    var error = msg || gettextCatalog.getString('Could not send payment');
+    popupService.showAlert(gettextCatalog.getString('Error'), error);
   }
 
-
-
   $scope.sign = function() {
-    $scope.error = null;
     $scope.loading = true;
     walletService.publishAndSign($scope.wallet, $scope.tx, function(err, txp) {
         $scope.$emit('UpdateTx');
@@ -42,18 +40,14 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
 
   function setError(err, prefix) {
     $scope.loading = false;
-    $scope.error = bwcError.msg(err, prefix);
-    $timeout(function() {
-      $scope.$digest();
-    }, 10);
+    popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err, prefix));
   };
 
   $scope.reject = function(txp) {
     $scope.loading = true;
-    $scope.error = null;
 
     walletService.reject($scope.wallet, $scope.tx, function(err, txpr) {
-      if (err) 
+      if (err)
         return setError(err, gettextCatalog.getString('Could not reject payment'));
 
       $scope.close(txpr);
@@ -64,7 +58,6 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
 
   $scope.remove = function() {
     $scope.loading = true;
-    $scope.error = null;
 
     $timeout(function() {
       ongoingProcess.set('removeTx', true);
@@ -84,7 +77,6 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
 
   $scope.broadcast = function(txp) {
     $scope.loading = true;
-    $scope.error = null;
 
     $timeout(function() {
       ongoingProcess.set('broadcastTx', true);
@@ -185,7 +177,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
     if (txp) {
       var type = txStatus.notify(txp);
       $scope.openStatusModal(type, txp, function() {});
-    }  
+    }
     $scope.cancel();
   };
 
diff --git a/src/js/controllers/preferencesBwsUrl.js b/src/js/controllers/preferencesBwsUrl.js
index 0c886148a..16c8ef2d6 100644
--- a/src/js/controllers/preferencesBwsUrl.js
+++ b/src/js/controllers/preferencesBwsUrl.js
@@ -3,7 +3,6 @@
 angular.module('copayApp.controllers').controller('preferencesBwsUrlController',
   function($scope, $log, $stateParams, $ionicNavBarDelegate, configService, applicationService, profileService, storageService) {
     $ionicNavBarDelegate.title('Wallet Service URL');
-    $scope.error = null;
     $scope.success = null;
 
     var wallet = profileService.getWallet($stateParams.walletId);
diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js
index fa0d3bca2..c66e2c165 100644
--- a/src/js/controllers/preferencesDelete.js
+++ b/src/js/controllers/preferencesDelete.js
@@ -1,12 +1,11 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesDeleteWalletController',
-  function($scope, $ionicPopup, $stateParams, $ionicNavBarDelegate, gettextCatalog, lodash, profileService, $state, ongoingProcess) {
+  function($scope, $ionicPopup, $stateParams, $ionicNavBarDelegate, gettextCatalog, lodash, profileService, $state, ongoingProcess, popupService) {
     $ionicNavBarDelegate.title(gettextCatalog.getString('Delete Wallet'));
     var wallet = profileService.getWallet($stateParams.walletId);
     $scope.alias = lodash.isEqual(wallet.name, wallet.credentials.walletName) ? null : wallet.name + ' ';
     $scope.walletName = '[' + wallet.credentials.walletName + ']';
-    $scope.error = null;
 
     $scope.showDeletePopup = function() {
       var popup = $ionicPopup.show({
@@ -36,7 +35,7 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
       profileService.deleteWalletClient(wallet, function(err) {
         ongoingProcess.set('deletingWallet', false);
         if (err) {
-          $scope.error = err.message || err;
+          popupService.showAlert(gettextCatalog.getString('Error'), err.message || err);
         } else {
           $state.go('tabs.home');
         }
diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index 16d509897..3a03d090a 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('tabReceiveController', function($scope, $timeout, $log, platformInfo, walletService, profileService, configService, lodash, gettextCatalog) {
+angular.module('copayApp.controllers').controller('tabReceiveController', function($scope, $timeout, $log, platformInfo, walletService, profileService, configService, lodash, gettextCatalog, popupService) {
 
   $scope.isCordova = platformInfo.isCordova;
 
@@ -33,7 +33,6 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
     if ($scope.generatingAddress) return;
 
     var wallet = wallet || $scope.wallet;
-    $scope.error = null;
     $scope.addr = null;
     $scope.generatingAddress = true;
 
@@ -41,7 +40,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
       walletService.getAddress(wallet, forceNew, function(err, addr) {
         $scope.generatingAddress = false;
         if (err) {
-          $scope.error = err;
+          popupService.showAlert(gettextCatalog.getString('Error'), err);
         } else {
           if (addr)
             $scope.addr = addr;
diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js
index fd5a5bfa2..e5640af61 100644
--- a/src/js/services/walletService.js
+++ b/src/js/services/walletService.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.services').factory('walletService', function($log, $timeout, lodash, trezor, ledger, storageService, configService, rateService, uxLanguage, $filter, gettextCatalog, bwcError, $ionicPopup, fingerprintService, ongoingProcess, gettext, $rootScope, txStatus, txFormatService, $ionicModal, $state, bwcService, bitcore) {
+angular.module('copayApp.services').factory('walletService', function($log, $timeout, lodash, trezor, ledger, storageService, configService, rateService, uxLanguage, $filter, gettextCatalog, bwcError, $ionicPopup, fingerprintService, ongoingProcess, gettext, $rootScope, txStatus, txFormatService, $ionicModal, $state, bwcService, bitcore, popupService) {
   // `wallet` is a decorated version of client.
 
   var root = {};
@@ -81,12 +81,11 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
       wallet.notAuthorized = true;
       $state.go('tabs.home');
     } else if (err instanceof errors.NOT_FOUND) {
-      root.showErrorPopup(gettext('Could not access Wallet Service: Not found'));
+      popupService.showAlert(gettextCatalog.getString('Could not access Wallet Service: Not found'));
     } else {
       var msg = ""
       $rootScope.$emit('Local/ClientError', (err.error ? err.error : err));
-      var msg = bwcError.msg(err, gettext('Error at Wallet Service'));
-      root.showErrorPopup(msg);
+      popupService.showAlert(bwcError.msg(err, gettextCatalog.getString('Error at Wallet Service')));
     }
   };
   root.handleError = lodash.debounce(_handleError, 1000);
@@ -664,20 +663,6 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
     });
   };
 
-  root.showErrorPopup = function(msg, cb) {
-    $log.warn('Showing err popup:' + msg);
-
-    // An alert dialog
-    var alertPopup = $ionicPopup.alert({
-      title: title,
-      template: msg
-    });
-
-    if (!cb) cb = function() {};
-
-    alertPopup.then(cb);
-  };
-
   // walletHome
   root.recreate = function(wallet, cb) {
     ongoingProcess.set('recreating', true);

From 50fdeff138111b91e8eef661a02c4cdc45f28445 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 1 Sep 2016 11:11:40 -0300
Subject: [PATCH 07/26] Removes function showAlert

---
 src/js/controllers/confirm.js            | 36 +++++++-----------------
 src/js/controllers/modals/addressbook.js | 19 ++-----------
 2 files changed, 13 insertions(+), 42 deletions(-)

diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index 2390ea639..f6f6523b3 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -1,24 +1,10 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, $ionicNavBarDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, $ionicPopup, txStatus, gettext, txFormatService, ongoingProcess, $ionicModal) {
+angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, $ionicNavBarDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, $ionicPopup, txStatus, gettext, txFormatService, ongoingProcess, $ionicModal, popupService) {
   $ionicNavBarDelegate.title(gettextCatalog.getString('Confirm'));
   var cachedTxp = {};
   var isChromeApp = platformInfo.isChromeApp;
 
-  // An alert dialog
-  var showAlert = function(title, msg, cb) {
-    var message = msg.message ? msg.message : msg;
-    $log.warn(title + ": " + message);
-
-    var alertPopup = $ionicPopup.alert({
-      title: title,
-      template: message
-    });
-
-    if (!cb) cb = function() {};
-    alertPopup.then(cb);
-  };
-
   $scope.showDescriptionPopup = function() {
     var commentPopup = $ionicPopup.show({
       templateUrl: "views/includes/note.html",
@@ -52,7 +38,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     if (!wallet) return cb();
 
     if (isChromeApp) {
-      showAlert(gettext('Payment Protocol not supported on Chrome App'));
+      popupService.showAlert(gettextCatalog.getString('Payment Protocol not supported on Chrome App'));
       return cb(true);
     }
 
@@ -69,15 +55,15 @@ angular.module('copayApp.controllers').controller('confirmController', function(
         $log.warn('Could not fetch payment request:', err);
         var msg = err.toString();
         if (msg.match('HTTP')) {
-          msg = gettext('Could not fetch payment information');
+          msg = gettextCatalog.getString('Could not fetch payment information');
         }
-        showAlert(msg);
+        popupService.showAlert(msg);
         return cb(true);
       }
 
       if (!paypro.verified) {
         $log.warn('Failed to verify payment protocol signatures');
-        showAlert(gettext('Payment Protocol Invalid'));
+        popupService.showAlert(gettextCatalog.getString('Payment Protocol Invalid'));
         return cb(true);
       }
 
@@ -189,7 +175,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
   };
 
   var setSendError = function(msg) {
-    showAlert(gettext('Error at confirm:'), msg);
+    popupService.showAlert(gettextCatalog.getString('Error at confirm:'), msg);
   };
 
   function apply(txp) {
@@ -212,13 +198,13 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     if (description && !wallet.credentials.sharedEncryptingKey) {
       var msg = 'Could not add message to imported wallet without shared encrypting key';
       $log.warn(msg);
-      return setSendError(gettext(msg));
+      return setSendError(msg);
     }
 
     if (toAmount > Number.MAX_SAFE_INTEGER) {
       var msg = 'Amount too big';
       $log.warn(msg);
-      return setSendError(gettext(msg));
+      return setSendError(msg);
     };
 
     outputs.push({
@@ -263,13 +249,11 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     var wallet = $scope.wallet;
     var txp = $scope.txp;
     if (!wallet) {
-      return setSendError(gettext('No wallet selected'));
-      return;
+      return setSendError(gettextCatalog.getString('No wallet selected'));
     };
 
     if (!txp) {
-      return setSendError(gettext('No transaction'));
-      return;
+      return setSendError(gettextCatalog.getString('No transaction'));
     };
 
     if (!wallet.canSign() && !wallet.isPrivKeyExternal()) {
diff --git a/src/js/controllers/modals/addressbook.js b/src/js/controllers/modals/addressbook.js
index e9944f14e..ee63c7e75 100644
--- a/src/js/controllers/modals/addressbook.js
+++ b/src/js/controllers/modals/addressbook.js
@@ -1,22 +1,9 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('addressbookModalController', function($scope, $log, $state, $timeout, $ionicPopup, addressbookService, lodash) {
+angular.module('copayApp.controllers').controller('addressbookModalController', function($scope, $log, $state, $timeout, $ionicPopup, addressbookService, lodash, popupService) {
 
   var contacts;
 
-  // An alert dialog
-  var showAlert = function(title, msg, cb) {
-    $log.warn(title + ": " + msg);
-    var alertPopup = $ionicPopup.alert({
-      title: title,
-      template: msg
-    });
-
-    if (!cb) cb = function() {};
-
-    alertPopup.then(cb);
-  };
-
   $scope.initAddressbook = function() {
     addressbookService.list(function(err, ab) {
       if (err) $log.error(err);
@@ -94,7 +81,7 @@ angular.module('copayApp.controllers').controller('addressbookModalController',
     $timeout(function() {
       addressbookService.add(addressbook, function(err, ab) {
         if (err) {
-          showAlert(err);
+          popupService.showAlert(err);
           return;
         }
         $scope.initAddressbook();
@@ -108,7 +95,7 @@ angular.module('copayApp.controllers').controller('addressbookModalController',
     $timeout(function() {
       addressbookService.remove(addr, function(err, ab) {
         if (err) {
-          showAlert(err);
+          popupService.showAlert(err);
           return;
         }
         $scope.initAddressbook();

From 4a793682e60086ea19f01b49ab93082483384b76 Mon Sep 17 00:00:00 2001
From: Jamal Jackson <jamal@bitpay.com>
Date: Thu, 1 Sep 2016 10:27:06 -0400
Subject: [PATCH 08/26] removed bitpay-wallet file

---
 app-template/bitpay-wallet | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 app-template/bitpay-wallet

diff --git a/app-template/bitpay-wallet b/app-template/bitpay-wallet
deleted file mode 120000
index 6c981665f..000000000
--- a/app-template/bitpay-wallet
+++ /dev/null
@@ -1 +0,0 @@
-/Users/jamal/dev/bitpay-wallet-app-template/
\ No newline at end of file

From 997f57e6d6be8978d4d36cafc993ba69752f689b Mon Sep 17 00:00:00 2001
From: Nick Cardin <nick@cardin.email>
Date: Thu, 1 Sep 2016 11:50:30 -0400
Subject: [PATCH 09/26] revert onboarding

---
 public/views/onboarding/backupWarning.html | 2 +-
 public/views/onboarding/collectEmail.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/views/onboarding/backupWarning.html b/public/views/onboarding/backupWarning.html
index 4a6a37be2..0a5a4086d 100644
--- a/public/views/onboarding/backupWarning.html
+++ b/public/views/onboarding/backupWarning.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-royal">
+  <ion-nav-bar class="bar-stable">
     <ion-nav-buttons side="primary">
       <button class="button no-border" href ui-sref="onboarding.backupRequest">
         <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
diff --git a/public/views/onboarding/collectEmail.html b/public/views/onboarding/collectEmail.html
index 5ae812fba..eb5bda54b 100644
--- a/public/views/onboarding/collectEmail.html
+++ b/public/views/onboarding/collectEmail.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-royal" ng-controller="backController">
+  <ion-nav-bar class="bar-stable" ng-controller="backController">
     <ion-nav-buttons side="secondary">
       <button class="button no-border" ng-click="onboardingMailSkip()">
         {{'Skip' | translate}}

From bd7b7d1a77f7c05417e47fe49acee6f362af962a Mon Sep 17 00:00:00 2001
From: Nick Cardin <nick@cardin.email>
Date: Thu, 1 Sep 2016 11:53:55 -0400
Subject: [PATCH 10/26] indent

---
 public/views/tab-import-file.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/views/tab-import-file.html b/public/views/tab-import-file.html
index 259ed0792..52deb1d73 100644
--- a/public/views/tab-import-file.html
+++ b/public/views/tab-import-file.html
@@ -36,9 +36,9 @@
         <label class="item item-input item-stacked-label">
           <span class="input-label" translate>Password</span>
           <input type="password"
-          placeholder="{{'Your password'|translate}}"
-          name="password"
-          ng-model="password">
+            placeholder="{{'Your password'|translate}}"
+            name="password"
+            ng-model="password">
         </label>
 
         <ion-toggle ng-model="showAdv" toggle-class="toggle-stable">

From e63cb569bac554c4e4ddb35bc2c35e112d531f98 Mon Sep 17 00:00:00 2001
From: Nick Cardin <nick@cardin.email>
Date: Thu, 1 Sep 2016 12:16:28 -0400
Subject: [PATCH 11/26] standardize back buttons

---
 public/views/activity.html                 | 4 ++--
 public/views/amazon.html                   | 5 ++---
 public/views/backup.html                   | 4 ++--
 public/views/bitpayCard.html               | 4 ++--
 public/views/buyAmazon.html                | 5 ++---
 public/views/buyGlidera.html               | 4 ++--
 public/views/buyandsell.html               | 4 ++--
 public/views/copayers.html                 | 4 ++--
 public/views/glidera.html                  | 4 ++--
 public/views/glideraUri.html               | 4 ++--
 public/views/join.html                     | 4 ++--
 public/views/modals/addressbook.html       | 5 ++---
 public/views/onboarding/backupWarning.html | 4 ++--
 public/views/preferencesAbout.html         | 4 ++--
 public/views/preferencesBitpayCard.html    | 5 ++---
 public/views/preferencesGlidera.html       | 5 ++---
 public/views/sellGlidera.html              | 4 ++--
 public/views/tab-create-personal.html      | 4 ++--
 public/views/tab-create-shared.html        | 4 ++--
 public/views/tab-export-file.html          | 4 ++--
 public/views/tab-export-qrCode.html        | 4 ++--
 public/views/tab-import-file.html          | 4 ++--
 public/views/tab-import-hardware.html      | 4 ++--
 public/views/tab-import-phrase.html        | 4 ++--
 24 files changed, 48 insertions(+), 53 deletions(-)

diff --git a/public/views/activity.html b/public/views/activity.html
index cd14c773e..c562dfdf5 100644
--- a/public/views/activity.html
+++ b/public/views/activity.html
@@ -3,8 +3,8 @@
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>Recent Activity</ion-nav-title>
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ui-sref="tabs.home">
-        <span translate>Close</span>
+      <button class="button back-button" ui-sref="tabs.home">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>
diff --git a/public/views/amazon.html b/public/views/amazon.html
index fcb498100..1d145f05e 100644
--- a/public/views/amazon.html
+++ b/public/views/amazon.html
@@ -1,8 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ui-sref="tabs.home">
-        Close
+      <button class="button back-button" ui-sref="tabs.home">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
     <ion-nav-title>Gift cards</ion-nav-title>
@@ -65,4 +65,3 @@
     </div>
   </ion-content>
 </ion-view>
-
diff --git a/public/views/backup.html b/public/views/backup.html
index f7dceb589..66dddae7e 100644
--- a/public/views/backup.html
+++ b/public/views/backup.html
@@ -1,7 +1,7 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
-      {{'Back' | translate}}
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
 
diff --git a/public/views/bitpayCard.html b/public/views/bitpayCard.html
index 1717c430d..758f2bd01 100644
--- a/public/views/bitpayCard.html
+++ b/public/views/bitpayCard.html
@@ -1,8 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ui-sref="tabs.home">
-        Close
+      <button class="button back-button" ui-sref="tabs.home">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
     <ion-nav-title>BitPay Card</ion-nav-title>
diff --git a/public/views/buyAmazon.html b/public/views/buyAmazon.html
index 749d66125..b8a6b1eba 100644
--- a/public/views/buyAmazon.html
+++ b/public/views/buyAmazon.html
@@ -1,8 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ui-sref="amazon.main">
-        <i class="icon ion-chevron-left"></i> Back
+      <button class="button back-button" ui-sref="amazon.main">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
     <ion-nav-title>Buy</ion-nav-title>
@@ -154,4 +154,3 @@
 
   </ion-content>
 </ion-view>
-
diff --git a/public/views/buyGlidera.html b/public/views/buyGlidera.html
index 83801f931..ff7d0bd54 100644
--- a/public/views/buyGlidera.html
+++ b/public/views/buyGlidera.html
@@ -1,8 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ui-sref="glidera.main">
-        <i class="icon ion-chevron-left"></i> Back
+      <button class="button back-button" ui-sref="glidera.main">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
     <ion-nav-title>Buy</ion-nav-title>
diff --git a/public/views/buyandsell.html b/public/views/buyandsell.html
index b107fae15..101927d52 100644
--- a/public/views/buyandsell.html
+++ b/public/views/buyandsell.html
@@ -1,8 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ui-sref="tabs.home">
-        Close
+      <button class="button back-button" ui-sref="tabs.home">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
     <ion-nav-title translate>Buy and sell</ion-nav-title>
diff --git a/public/views/copayers.html b/public/views/copayers.html
index 156be72be..aa5b8f626 100644
--- a/public/views/copayers.html
+++ b/public/views/copayers.html
@@ -3,8 +3,8 @@
   <ion-nav-bar class="bar-royal">
     <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' | translate}}
+      <button class="button back-button" ui-sref="tabs.home">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>
diff --git a/public/views/glidera.html b/public/views/glidera.html
index f9c83d5d5..3c32f93eb 100644
--- a/public/views/glidera.html
+++ b/public/views/glidera.html
@@ -1,8 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ui-sref="tabs.home">
-        Close
+      <button class="button back-button" ui-sref="tabs.home">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
     <ion-nav-title>Glidera</ion-nav-title>
diff --git a/public/views/glideraUri.html b/public/views/glideraUri.html
index 626118f94..ede94ef42 100644
--- a/public/views/glideraUri.html
+++ b/public/views/glideraUri.html
@@ -1,8 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-stable">
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ui-sref="tabs.home">
-        Close
+      <button class="button back-button" ui-sref="tabs.home">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
     <ion-nav-title>Glidera</ion-nav-title>
diff --git a/public/views/join.html b/public/views/join.html
index b8ad6d21f..3b535a928 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -1,8 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ui-sref="tabs.add">
-        <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
+      <button class="button back-button" ui-sref="tabs.add">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
     <ion-nav-title>{{'Join shared wallet' | translate}}</ion-nav-title>
diff --git a/public/views/modals/addressbook.html b/public/views/modals/addressbook.html
index a8bd30182..77b43b5ef 100644
--- a/public/views/modals/addressbook.html
+++ b/public/views/modals/addressbook.html
@@ -1,8 +1,7 @@
 <ion-modal-view ng-controller="addressbookModalController" ng-init="initAddressbook()">
   <ion-header-bar align-title="center" class="bar-royal">
-    <button class="button button-clear button-positive"
-            ng-click="closeAddressbookModal()" translate>
-      Close
+    <button class="button back-button" ng-click="closeAddressbookModal()">
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </button>
     <div class="h1 title">
       <span ng-show="!addAddressbookEntry" translate>Addressbook</span>
diff --git a/public/views/onboarding/backupWarning.html b/public/views/onboarding/backupWarning.html
index 0a5a4086d..b0eadea83 100644
--- a/public/views/onboarding/backupWarning.html
+++ b/public/views/onboarding/backupWarning.html
@@ -1,8 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-stable">
     <ion-nav-buttons side="primary">
-      <button class="button no-border" href ui-sref="onboarding.backupRequest">
-        <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
+      <button class="button back-button" ui-sref="onboarding.backupRequest">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>
diff --git a/public/views/preferencesAbout.html b/public/views/preferencesAbout.html
index 6970fca97..325d056c6 100644
--- a/public/views/preferencesAbout.html
+++ b/public/views/preferencesAbout.html
@@ -1,8 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-stable">
     <ion-nav-buttons side="primary">
-      <button class="button button-stable no-border" ui-sref="tabs.settings">
-        <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
+      <button class="button back-button" ui-sref="tabs.settings">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>
diff --git a/public/views/preferencesBitpayCard.html b/public/views/preferencesBitpayCard.html
index 55ad3e244..99f31f893 100644
--- a/public/views/preferencesBitpayCard.html
+++ b/public/views/preferencesBitpayCard.html
@@ -1,8 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ui-sref="bitpayCard.main">
-        <i class="icon ion-chevron-left"></i> Back
+      <button class="button back-button" ui-sref="bitpayCard.main">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
     <ion-nav-title>Preferences</ion-nav-title>
@@ -16,4 +16,3 @@
     </ul>
   </ion-content>
 </ion-view>
-
diff --git a/public/views/preferencesGlidera.html b/public/views/preferencesGlidera.html
index 6177aa21f..d34ef5ff1 100644
--- a/public/views/preferencesGlidera.html
+++ b/public/views/preferencesGlidera.html
@@ -1,8 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ui-sref="glidera.main">
-        <i class="icon ion-chevron-left"></i> Back
+      <button class="button back-button" ui-sref="glidera.main">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
     <ion-nav-title>Preferences</ion-nav-title>
@@ -275,4 +275,3 @@
     </ul>
   </ion-content>
 </ion-view>
-
diff --git a/public/views/sellGlidera.html b/public/views/sellGlidera.html
index 26e2d7708..e6aa011a0 100644
--- a/public/views/sellGlidera.html
+++ b/public/views/sellGlidera.html
@@ -1,8 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ui-sref="glidera.main">
-        <i class="icon ion-chevron-left"></i> Back
+      <button class="button back-button" ui-sref="glidera.main">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
     <ion-nav-title>Sell</ion-nav-title>
diff --git a/public/views/tab-create-personal.html b/public/views/tab-create-personal.html
index 2cf953c28..fe741f20c 100644
--- a/public/views/tab-create-personal.html
+++ b/public/views/tab-create-personal.html
@@ -1,8 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ui-sref="tabs.add">
-        <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
+      <button class="button back-button" ui-sref="tabs.add">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
     <ion-nav-title>{{'Create new wallet' | translate}}</ion-nav-title>
diff --git a/public/views/tab-create-shared.html b/public/views/tab-create-shared.html
index 035763b43..d2ebd3f0e 100644
--- a/public/views/tab-create-shared.html
+++ b/public/views/tab-create-shared.html
@@ -1,8 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ui-sref="tabs.add">
-        <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
+      <button class="button back-button" ui-sref="tabs.add">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
     <ion-nav-title>{{'Create new wallet' | translate}}</ion-nav-title>
diff --git a/public/views/tab-export-file.html b/public/views/tab-export-file.html
index 6035b6f98..36504222f 100644
--- a/public/views/tab-export-file.html
+++ b/public/views/tab-export-file.html
@@ -1,8 +1,8 @@
 <ion-nav-bar class="bar-royal">
   <ion-nav-title>Export Wallet</ion-nav-title>
   <ion-nav-buttons side="primary">
-    <button class="button no-border" ui-sref="tabs.preferences.preferencesAdvanced">
-      <i class="icon ion-chevron-left"></i> Back
+    <button class="button back-button" ui-sref="tabs.preferences.preferencesAdvanced">
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </button>
   </ion-nav-buttons>
 </ion-nav-bar>
diff --git a/public/views/tab-export-qrCode.html b/public/views/tab-export-qrCode.html
index d53b9df00..c1982ec32 100644
--- a/public/views/tab-export-qrCode.html
+++ b/public/views/tab-export-qrCode.html
@@ -1,8 +1,8 @@
 <ion-nav-bar class="bar-royal">
   <ion-nav-title>Export Wallet</ion-nav-title>
   <ion-nav-buttons side="primary">
-    <button class="button no-border" ui-sref="tabs.preferences.preferencesAdvanced">
-      <i class="icon ion-chevron-left"></i> Back
+    <button class="button back-button" ui-sref="tabs.preferences.preferencesAdvanced">
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </button>
   </ion-nav-buttons>
 </ion-nav-bar>
diff --git a/public/views/tab-import-file.html b/public/views/tab-import-file.html
index 52deb1d73..76e34e20e 100644
--- a/public/views/tab-import-file.html
+++ b/public/views/tab-import-file.html
@@ -1,8 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-royal" ng-controller="backController">
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ng-click="importGoBack()">
-        <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
+      <button class="button back-button" ng-click="importGoBack()">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
     <ion-nav-title>{{'Import wallet' | translate}}</ion-nav-title>
diff --git a/public/views/tab-import-hardware.html b/public/views/tab-import-hardware.html
index 096974709..180e1db0c 100644
--- a/public/views/tab-import-hardware.html
+++ b/public/views/tab-import-hardware.html
@@ -1,8 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-royal" ng-controller="backController">
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ng-click="importGoBack()">
-        <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
+      <button class="button back-button" ng-click="importGoBack()">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
     <ion-nav-title>{{'Import wallet' | translate}}</ion-nav-title>
diff --git a/public/views/tab-import-phrase.html b/public/views/tab-import-phrase.html
index dfc5cf5b7..3f64ec521 100644
--- a/public/views/tab-import-phrase.html
+++ b/public/views/tab-import-phrase.html
@@ -1,8 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-royal" ng-controller="backController">
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ng-click="importGoBack()">
-        <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
+      <button class="button back-button" ng-click="importGoBack()">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
     <ion-nav-title>Import wallet</ion-nav-title>

From 8e6cd5ffba52e4506e6df009e4b65236bf6d633f Mon Sep 17 00:00:00 2001
From: Nick Cardin <nick@cardin.email>
Date: Thu, 1 Sep 2016 12:36:59 -0400
Subject: [PATCH 12/26] update header color and back button for settings

---
 public/views/confirm.html                   |  4 +--
 public/views/glideraUri.html                |  2 +-
 public/views/modals/glidera-tx-details.html |  2 +-
 public/views/onboarding/backupWarning.html  |  2 +-
 public/views/preferences.html               |  4 +--
 public/views/preferencesAbout.html          |  2 +-
 public/views/preferencesAdvanced.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-export-qrCode.html         | 33 +++++++++++----------
 public/views/termsOfUse.html                |  4 +--
 public/views/translators.html               |  4 +--
 public/views/walletDetails.html             |  2 +-
 24 files changed, 58 insertions(+), 57 deletions(-)

diff --git a/public/views/confirm.html b/public/views/confirm.html
index d2f74bb4c..2d45e16b1 100644
--- a/public/views/confirm.html
+++ b/public/views/confirm.html
@@ -1,7 +1,7 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
-      {{'Back' | translate}}
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
 
diff --git a/public/views/glideraUri.html b/public/views/glideraUri.html
index ede94ef42..453da1668 100644
--- a/public/views/glideraUri.html
+++ b/public/views/glideraUri.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
       <button class="button back-button" ui-sref="tabs.home">
         <i class="icon ion-ios-arrow-thin-left"></i>
diff --git a/public/views/modals/glidera-tx-details.html b/public/views/modals/glidera-tx-details.html
index bc19dc485..34e3992d5 100644
--- a/public/views/modals/glidera-tx-details.html
+++ b/public/views/modals/glidera-tx-details.html
@@ -1,5 +1,5 @@
 <ion-modal-view ng-controller="glideraTxDetailsController">
-  <ion-header-bar align-title="center" class="bar-stable">
+  <ion-header-bar align-title="center" class="bar-royal">
     <button class="button button-clear button-positive"
             ng-click="cancel()">
       Close
diff --git a/public/views/onboarding/backupWarning.html b/public/views/onboarding/backupWarning.html
index b0eadea83..88fa653a5 100644
--- a/public/views/onboarding/backupWarning.html
+++ b/public/views/onboarding/backupWarning.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
       <button class="button back-button" ui-sref="onboarding.backupRequest">
         <i class="icon ion-ios-arrow-thin-left"></i>
diff --git a/public/views/preferences.html b/public/views/preferences.html
index d289e0c40..76cbd551a 100644
--- a/public/views/preferences.html
+++ b/public/views/preferences.html
@@ -1,7 +1,7 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
-      {{'Back' | translate}}
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content ng-controller="preferencesController" ng-init="init()">
diff --git a/public/views/preferencesAbout.html b/public/views/preferencesAbout.html
index 325d056c6..e768ddc8b 100644
--- a/public/views/preferencesAbout.html
+++ b/public/views/preferencesAbout.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
       <button class="button back-button" ui-sref="tabs.settings">
         <i class="icon ion-ios-arrow-thin-left"></i>
diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html
index 0ce5c7c1c..2c821f634 100644
--- a/public/views/preferencesAdvanced.html
+++ b/public/views/preferencesAdvanced.html
@@ -1,8 +1,8 @@
 <ion-view >
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Advanced Preferences' | translate}}</ion-nav-title>
     <ion-nav-back-button>
-      {{'Back' | translate}}
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content>
diff --git a/public/views/preferencesAlias.html b/public/views/preferencesAlias.html
index b6a63e546..8a8c72d6b 100644
--- a/public/views/preferencesAlias.html
+++ b/public/views/preferencesAlias.html
@@ -1,7 +1,7 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
-      {{'Back' | translate}}
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content ng-controller="preferencesAliasController" >
diff --git a/public/views/preferencesAltCurrency.html b/public/views/preferencesAltCurrency.html
index f9bae64f8..446a50074 100644
--- a/public/views/preferencesAltCurrency.html
+++ b/public/views/preferencesAltCurrency.html
@@ -1,7 +1,7 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
-      {{'Back' | translate}}
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content ng-controller="preferencesAltCurrencyController" ng-init="init()" >
diff --git a/public/views/preferencesBwsUrl.html b/public/views/preferencesBwsUrl.html
index c9cd99af8..54df1a81f 100644
--- a/public/views/preferencesBwsUrl.html
+++ b/public/views/preferencesBwsUrl.html
@@ -1,7 +1,7 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
-      {{'Back' | translate}}
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content ng-controller="preferencesBwsUrlController" >
diff --git a/public/views/preferencesColor.html b/public/views/preferencesColor.html
index 1114c9011..c0790e3ea 100644
--- a/public/views/preferencesColor.html
+++ b/public/views/preferencesColor.html
@@ -1,7 +1,7 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
-      {{'Back' | translate}}
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content ng-controller="preferencesColorController" >
diff --git a/public/views/preferencesDeleteWallet.html b/public/views/preferencesDeleteWallet.html
index 16705aae6..c68b8e984 100644
--- a/public/views/preferencesDeleteWallet.html
+++ b/public/views/preferencesDeleteWallet.html
@@ -1,7 +1,7 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
-      {{'Back' | translate}}
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content class="has-header" ng-controller="preferencesDeleteWalletController" >
diff --git a/public/views/preferencesDeleteWords.html b/public/views/preferencesDeleteWords.html
index fe4f0f8fd..25a3eaedc 100644
--- a/public/views/preferencesDeleteWords.html
+++ b/public/views/preferencesDeleteWords.html
@@ -1,7 +1,7 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
-      {{'Back' | translate}}
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content ng-controller="preferencesDeleteWordsController" >
diff --git a/public/views/preferencesEmail.html b/public/views/preferencesEmail.html
index e70230642..2ac020111 100644
--- a/public/views/preferencesEmail.html
+++ b/public/views/preferencesEmail.html
@@ -1,7 +1,7 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
-      {{'Back' | translate}}
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content ng-controller="preferencesEmailController" >
diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html
index c5f363d02..89c2d417e 100644
--- a/public/views/preferencesFee.html
+++ b/public/views/preferencesFee.html
@@ -1,7 +1,7 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
-      {{'Back' | translate}}
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
 
diff --git a/public/views/preferencesHistory.html b/public/views/preferencesHistory.html
index abce175fa..001ab547a 100644
--- a/public/views/preferencesHistory.html
+++ b/public/views/preferencesHistory.html
@@ -1,7 +1,7 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
-      {{'Back' | translate}}
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content ng-controller="preferencesHistory" ng-init="index.updatingTxHistory ? null : csvHistory()">
diff --git a/public/views/preferencesInformation.html b/public/views/preferencesInformation.html
index 92355948e..7e5ee438e 100644
--- a/public/views/preferencesInformation.html
+++ b/public/views/preferencesInformation.html
@@ -1,7 +1,7 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
-      {{'Back' | translate}}
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content   ng-controller="preferencesInformation"  ng-init="init()">
diff --git a/public/views/preferencesLanguage.html b/public/views/preferencesLanguage.html
index ccc402b60..3adb8a34a 100644
--- a/public/views/preferencesLanguage.html
+++ b/public/views/preferencesLanguage.html
@@ -1,7 +1,7 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
-      {{'Back' | translate}}
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content ng-controller="preferencesLanguageController" ng-init="init()" >
diff --git a/public/views/preferencesLogs.html b/public/views/preferencesLogs.html
index 754e1adbf..dcd0add3e 100644
--- a/public/views/preferencesLogs.html
+++ b/public/views/preferencesLogs.html
@@ -1,7 +1,7 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
-      {{'Back' | translate}}
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content ng-controller="preferencesLogs" ng-init="init()" >
diff --git a/public/views/preferencesUnit.html b/public/views/preferencesUnit.html
index a017c7528..520f43fce 100644
--- a/public/views/preferencesUnit.html
+++ b/public/views/preferencesUnit.html
@@ -1,7 +1,7 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
-      {{'Back' | translate}}
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content ng-controller="preferencesUnitController" ng-init="init()" >
diff --git a/public/views/tab-export-qrCode.html b/public/views/tab-export-qrCode.html
index c1982ec32..c2b54be2a 100644
--- a/public/views/tab-export-qrCode.html
+++ b/public/views/tab-export-qrCode.html
@@ -1,24 +1,25 @@
-<ion-nav-bar class="bar-royal">
-  <ion-nav-title>Export Wallet</ion-nav-title>
-  <ion-nav-buttons side="primary">
-    <button class="button back-button" ui-sref="tabs.preferences.preferencesAdvanced">
-      <i class="icon ion-ios-arrow-thin-left"></i>
-    </button>
-  </ion-nav-buttons>
-</ion-nav-bar>
+<ion-view>
+  <ion-nav-bar class="bar-royal">
+    <ion-nav-title>Export Wallet</ion-nav-title>
+    <ion-nav-buttons side="primary">
+      <button class="button back-button" ui-sref="tabs.preferences.preferencesAdvanced">
+        <i class="icon ion-ios-arrow-thin-left"></i>
+      </button>
+    </ion-nav-buttons>
+  </ion-nav-bar>
 
   <ion-content ng-controller="exportController" ng-init="init()">
 
-      <div class="m20t text-gray" ng-show="supported">
-        <div class="text-center m20b">
-          <qrcode size="220" version="8" error-correction-level="M" data="{{exportWalletInfo}}"></qrcode>
-        </div>
-        <div class="text-center size-12 m10" translate>From the destination device, go to Add wallet &gt; Import wallet and scan this QR code</div>
+    <div class="m20t text-gray" ng-show="supported">
+      <div class="text-center m20b">
+        <qrcode size="220" version="8" error-correction-level="M" data="{{exportWalletInfo}}"></qrcode>
       </div>
+      <div class="text-center size-12 m10" translate>From the destination device, go to Add wallet &gt; Import wallet and scan this QR code</div>
+    </div>
 
-      <div class="m20t text-gray" ng-show="!supported">
-        <div class="text-center size-12 m10" translate>Exporting via QR not supported for this wallet</div>
-      </div>
+    <div class="m20t text-gray" ng-show="!supported">
+      <div class="text-center size-12 m10" translate>Exporting via QR not supported for this wallet</div>
+    </div>
 
   </ion-content>
 </ion-view>
diff --git a/public/views/termsOfUse.html b/public/views/termsOfUse.html
index a0edffb52..788b1b4b0 100644
--- a/public/views/termsOfUse.html
+++ b/public/views/termsOfUse.html
@@ -1,7 +1,7 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
-      {{'Back' | translate}}
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
 
diff --git a/public/views/translators.html b/public/views/translators.html
index 1f33e7857..7163e1e45 100644
--- a/public/views/translators.html
+++ b/public/views/translators.html
@@ -1,8 +1,8 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Translators' | translate}}</ion-nav-title>
     <ion-nav-back-button>
-      {{'Back' | translate}}
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content>
diff --git a/public/views/walletDetails.html b/public/views/walletDetails.html
index 421daab8d..12abcb6c6 100644
--- a/public/views/walletDetails.html
+++ b/public/views/walletDetails.html
@@ -2,7 +2,7 @@
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{wallet.name}}</ion-nav-title>
     <ion-nav-back-button>
-      {{'Back' | translate}}
+      <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
 

From a2052b3f3ad7b08a91c0309fc76c084e21f15cf9 Mon Sep 17 00:00:00 2001
From: Nick Cardin <nick@cardin.email>
Date: Thu, 1 Sep 2016 12:46:25 -0400
Subject: [PATCH 13/26] clean up merge

---
 public/views/tab-export-file.html     | 11 ++++++-----
 public/views/tab-export-qrCode.html   | 24 ++++++++++++------------
 public/views/tab-import-hardware.html | 10 ++++++----
 public/views/tab-import-phrase.html   |  4 +++-
 public/views/tab-send.html            |  3 ++-
 5 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/public/views/tab-export-file.html b/public/views/tab-export-file.html
index 36504222f..6e64f2fce 100644
--- a/public/views/tab-export-file.html
+++ b/public/views/tab-export-file.html
@@ -1,11 +1,12 @@
-<ion-nav-bar class="bar-royal">
-  <ion-nav-title>Export Wallet</ion-nav-title>
-  <ion-nav-buttons side="primary">
+<ion-view>
+  <ion-nav-bar class="bar-royal">
+    <ion-nav-title>{{'Export Wallet' | translate}}</ion-nav-title>
+    <ion-nav-buttons side="primary">
     <button class="button back-button" ui-sref="tabs.preferences.preferencesAdvanced">
       <i class="icon ion-ios-arrow-thin-left"></i>
     </button>
-  </ion-nav-buttons>
-</ion-nav-bar>
+    </ion-nav-buttons>
+  </ion-nav-bar>
 
   <ion-content ng-controller="exportController" ng-init="init()" cache-view="true">
 
diff --git a/public/views/tab-export-qrCode.html b/public/views/tab-export-qrCode.html
index c2b54be2a..b6254e42d 100644
--- a/public/views/tab-export-qrCode.html
+++ b/public/views/tab-export-qrCode.html
@@ -1,25 +1,25 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
-    <ion-nav-title>Export Wallet</ion-nav-title>
+    <ion-nav-title>{{'Export Wallet' | translate}}</ion-nav-title>
     <ion-nav-buttons side="primary">
-      <button class="button back-button" ui-sref="tabs.preferences.preferencesAdvanced">
-        <i class="icon ion-ios-arrow-thin-left"></i>
-      </button>
+    <button class="button back-button" ui-sref="tabs.preferences.preferencesAdvanced">
+      <i class="icon ion-ios-arrow-thin-left"></i>
+    </button>
     </ion-nav-buttons>
   </ion-nav-bar>
 
   <ion-content ng-controller="exportController" ng-init="init()">
 
-    <div class="m20t text-gray" ng-show="supported">
-      <div class="text-center m20b">
-        <qrcode size="220" version="8" error-correction-level="M" data="{{exportWalletInfo}}"></qrcode>
+      <div class="m20t text-gray" ng-show="supported">
+        <div class="text-center m20b">
+          <qrcode size="220" version="8" error-correction-level="M" data="{{exportWalletInfo}}"></qrcode>
+        </div>
+        <div class="text-center size-12 m10" translate>From the destination device, go to Add wallet &gt; Import wallet and scan this QR code</div>
       </div>
-      <div class="text-center size-12 m10" translate>From the destination device, go to Add wallet &gt; Import wallet and scan this QR code</div>
-    </div>
 
-    <div class="m20t text-gray" ng-show="!supported">
-      <div class="text-center size-12 m10" translate>Exporting via QR not supported for this wallet</div>
-    </div>
+      <div class="m20t text-gray" ng-show="!supported">
+        <div class="text-center size-12 m10" translate>Exporting via QR not supported for this wallet</div>
+      </div>
 
   </ion-content>
 </ion-view>
diff --git a/public/views/tab-import-hardware.html b/public/views/tab-import-hardware.html
index 180e1db0c..338be0205 100644
--- a/public/views/tab-import-hardware.html
+++ b/public/views/tab-import-hardware.html
@@ -35,12 +35,15 @@
             </select>
           </label>
 
-          <label class="item item-input item-stacked-label" ng-show="seedSourceId == 'trezor' || seedSourceId == 'ledger'">
+          <label class="item item-input item-stacked-label"
+                 ng-show="seedSourceId == 'trezor' || seedSourceId == 'ledger'">
             <span class="input-label" translate>Account Number</span>
             <input type="number" id="account" ng-model="account" ignore-mouse-wheel>
           </label>
 
-          <ion-toggle ng-show="seedSourceId == 'trezor'" ng-model="isMultisig" toggle-class="toggle-positive">
+          <ion-toggle ng-show="seedSourceId == 'trezor'"
+                      ng-model="isMultisig"
+                      toggle-class="toggle-positive">
             <span translate>Shared Wallet</span>
           </ion-toggle>
 
@@ -62,8 +65,7 @@
         <button translate type="submit" class="button button-block button-positive">
           Import
         </button>
-      </div>
-      <!-- seedoptions show -->
+      </div> <!-- seedoptions show -->
 
     </form>
 
diff --git a/public/views/tab-import-phrase.html b/public/views/tab-import-phrase.html
index 3f64ec521..6207508f7 100644
--- a/public/views/tab-import-phrase.html
+++ b/public/views/tab-import-phrase.html
@@ -82,7 +82,9 @@
         </div>
       </div>
 
-      <button type="submit" class="button button-block button-positive" ng-disabled="importForm12.$invalid" translate>Import</button>
+      <button type="submit"
+        class="button button-block button-positive"
+        ng-disabled="importForm12.$invalid" translate>Import</button>
     </form>
   </ion-content>
 </ion-view>
diff --git a/public/views/tab-send.html b/public/views/tab-send.html
index f362abb05..d9251a946 100644
--- a/public/views/tab-send.html
+++ b/public/views/tab-send.html
@@ -27,7 +27,8 @@
       <div class="item text-center" ng-show="!list[0]" translate>No Wallet - Contact</div>
       <a class="item item-icon-left" ng-repeat="item in list" ng-click="goToAmount(item)">
         <i ng-show="item.isWallet" class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i>
-        <i ng-show="!item.isWallet" class="icon ion-ios-person-outline"></i> {{item.label}}
+        <i ng-show="!item.isWallet" class="icon ion-ios-person-outline"></i>
+        {{item.label}}
       </a>
     </div>
   </ion-content>

From 7835694fb233c6170a68bc4c3711529191825aae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 1 Sep 2016 12:10:08 -0300
Subject: [PATCH 14/26] import with Qr in onboarding

---
 public/views/onboarding/welcome.html               | 2 +-
 src/js/controllers/import.js                       | 4 ++--
 src/js/controllers/onboarding/welcomeController.js | 6 ++++++
 src/js/routes.js                                   | 7 +++++--
 src/sass/views/onboarding/onboard-welcome.scss     | 1 +
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/public/views/onboarding/welcome.html b/public/views/onboarding/welcome.html
index 8e44f87aa..20dd432b6 100644
--- a/public/views/onboarding/welcome.html
+++ b/public/views/onboarding/welcome.html
@@ -1,6 +1,6 @@
 <ion-view id="onboard-welcome" class="onboarding">
   <ion-content ng-controller="welcomeController" ng-init="createProfile()">
-    <img src="../img/onboarding-welcome-shopping24.png" id="shopping-24" />
+    <qr-scanner id="shopping-24" on-scan="goImport(data)"></qr-scanner>
     <div class="text-center">
       <div class="row">
         <img src='../../img/bitpay-logo.svg' class="logo col col-50" />
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index c1fbaf111..55fcb5645 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -36,7 +36,6 @@ angular.module('copayApp.controllers').controller('importController',
 
     $scope.processWalletInfo = function(code) {
       if (!code) return;
-
       $scope.importErr = false;
       var parsedCode = code.split('|');
 
@@ -407,5 +406,6 @@ angular.module('copayApp.controllers').controller('importController',
     };
 
     updateSeedSourceSelect();
-    $scope.setSeedSource('new');
+    $scope.setSeedSource();
+    if ($stateParams.code) $scope.processWalletInfo($stateParams.code);
   });
diff --git a/src/js/controllers/onboarding/welcomeController.js b/src/js/controllers/onboarding/welcomeController.js
index f217639ad..213a28bc5 100644
--- a/src/js/controllers/onboarding/welcomeController.js
+++ b/src/js/controllers/onboarding/welcomeController.js
@@ -2,6 +2,12 @@
 
 angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $log, $ionicPopup, profileService) {
 
+  $scope.goImport = function(code) {
+    $state.go('tabs.import', {
+      code: code
+    });
+  };
+
   $scope.createProfile = function() {
     $log.debug('Creating profile');
     profileService.createProfile(function(err) {
diff --git a/src/js/routes.js b/src/js/routes.js
index d580f3f4d..15ed20d90 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -270,12 +270,15 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       })
       .state('tabs.import', {
         url: '/import/:fromOnboarding',
-//        abstract: true,
+        //        abstract: true,
         views: {
           'tab-home': {
             templateUrl: 'views/import.html'
           },
-        }
+        },
+        params: {
+          code: null
+        },
       })
       .state('tabs.import.phrase', {
         url: '/tab-import-phrase',
diff --git a/src/sass/views/onboarding/onboard-welcome.scss b/src/sass/views/onboarding/onboard-welcome.scss
index 2e9c19e01..8e40facd9 100644
--- a/src/sass/views/onboarding/onboard-welcome.scss
+++ b/src/sass/views/onboarding/onboard-welcome.scss
@@ -5,6 +5,7 @@
     background-size: contain;
     background-repeat-y: no-repeat;
     #shopping-24 {
+      content: url("../img/onboarding-welcome-shopping24.png");
       position: absolute;
       top: 2%;
       right: 5%;

From d25a5dfb1b88021202081c7b13df380ba0d7231b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 1 Sep 2016 12:14:21 -0300
Subject: [PATCH 15/26] adding from onboarding state param

---
 src/js/controllers/onboarding/welcomeController.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/js/controllers/onboarding/welcomeController.js b/src/js/controllers/onboarding/welcomeController.js
index 213a28bc5..921086c98 100644
--- a/src/js/controllers/onboarding/welcomeController.js
+++ b/src/js/controllers/onboarding/welcomeController.js
@@ -4,6 +4,7 @@ angular.module('copayApp.controllers').controller('welcomeController', function(
 
   $scope.goImport = function(code) {
     $state.go('tabs.import', {
+      fromOnboarding: true,
       code: code
     });
   };

From 657c2b830ce60cd88462a89e38de4cf5060d951f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 1 Sep 2016 15:21:18 -0300
Subject: [PATCH 16/26] remove main tabs from import view in onboarding flow

---
 public/views/import.html                      | 36 +++++++++++++------
 public/views/onboarding/welcome.html          |  2 +-
 .../onboarding/welcomeController.js           |  2 +-
 src/js/controllers/tabsController.js          | 36 +++++++++++--------
 src/js/routes.js                              | 36 +++++++++++++++++++
 5 files changed, 85 insertions(+), 27 deletions(-)

diff --git a/public/views/import.html b/public/views/import.html
index 79d347ebd..17e6187aa 100644
--- a/public/views/import.html
+++ b/public/views/import.html
@@ -1,17 +1,33 @@
-<ion-view >
+<ion-view ng-controller="tabsController" ng-init="importInit()">
   <ion-tabs class="tabs-striped tabs-color-positive tabs-color-active-positive tabs-top">
 
-    <ion-tab title="Recovery Phrare" ui-sref="tabs.import.phrase">
-      <ion-nav-view name="tab-import-phrase"></ion-nav-view>
-    </ion-tab>
+    <div ng-if="!fromOnboarding">
+      <ion-tab title="Recovery Phrase" ui-sref="tabs.import.phrase">
+        <ion-nav-view name="tab-import-phrase"></ion-nav-view>
+      </ion-tab>
 
-    <ion-tab title="File/Text" ui-sref="tabs.import.file">
-      <ion-nav-view name="tab-import-file"></ion-nav-view>
-    </ion-tab>
+      <ion-tab title="File/Text" ui-sref="tabs.import.file">
+        <ion-nav-view name="tab-import-file"></ion-nav-view>
+      </ion-tab>
 
-    <ion-tab title="Hardware Wallet" ui-sref="tabs.import.hardware">
-      <ion-nav-view name="tab-import-hardware"></ion-nav-view>
-    </ion-tab>
+      <ion-tab title="Hardware Wallet" ui-sref="tabs.import.hardware">
+        <ion-nav-view name="tab-import-hardware"></ion-nav-view>
+      </ion-tab>
+    </div>
+
+    <div ng-if="fromOnboarding">
+      <ion-tab title="Recovery Phrase" ui-sref="onboarding.import.phrase">
+        <ion-nav-view name="tab-import-phrase"></ion-nav-view>
+      </ion-tab>
+
+      <ion-tab title="File/Text" ui-sref="onboarding.import.file">
+        <ion-nav-view name="tab-import-file"></ion-nav-view>
+      </ion-tab>
+
+      <ion-tab title="Hardware Wallet" ui-sref="onboarding.import.hardware">
+        <ion-nav-view name="tab-import-hardware"></ion-nav-view>
+      </ion-tab>
+    </div>
 
   </ion-tabs>
 </ion-view>
diff --git a/public/views/onboarding/welcome.html b/public/views/onboarding/welcome.html
index 20dd432b6..05459b33d 100644
--- a/public/views/onboarding/welcome.html
+++ b/public/views/onboarding/welcome.html
@@ -14,7 +14,7 @@
         <button class="button button-block get-started col col-75" href ui-sref="onboarding.tour" translate>Get started</button>
       </div>
       <div class="row">
-        <button class="button button-block restore col col-75" translate href ui-sref="tabs.import({'fromOnboarding':true})">Restore</button>
+        <button class="button button-block restore col col-75" translate href ui-sref="onboarding.import.phrase({'fromOnboarding':true})">Restore</button>
       </div>
   </ion-content>
 </ion-view>
diff --git a/src/js/controllers/onboarding/welcomeController.js b/src/js/controllers/onboarding/welcomeController.js
index 921086c98..f08a5b5eb 100644
--- a/src/js/controllers/onboarding/welcomeController.js
+++ b/src/js/controllers/onboarding/welcomeController.js
@@ -3,7 +3,7 @@
 angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $log, $ionicPopup, profileService) {
 
   $scope.goImport = function(code) {
-    $state.go('tabs.import', {
+    $state.go('onboarding.import.phrase', {
       fromOnboarding: true,
       code: code
     });
diff --git a/src/js/controllers/tabsController.js b/src/js/controllers/tabsController.js
index b9114db36..ccd1b1e88 100644
--- a/src/js/controllers/tabsController.js
+++ b/src/js/controllers/tabsController.js
@@ -1,21 +1,27 @@
-
 'use strict';
 
-angular.module('copayApp.controllers').controller('tabsController', function($log, $scope, $ionicModal, incomingData) {
+angular.module('copayApp.controllers').controller('tabsController', function($log, $scope, $stateParams, $ionicModal, $timeout, incomingData) {
 
-    $scope.onScan = function(data) {
-console.log('[tabsController.js.6:data:]',data); //TODO
-      if (!incomingData.redir(data)) {
-        $ionicPopup.alert({
-          title: 'Invalid data',
-        });
-      }
+  $scope.onScan = function(data) {
+    if (!incomingData.redir(data)) {
+      $ionicPopup.alert({
+        title: 'Invalid data',
+      });
     }
+  }
 
-    $scope.setScanFn = function(scanFn) {
-      $scope.scan = function() {
-        $log.debug('Scanning...');
-        scanFn();
-      };
+  $scope.setScanFn = function(scanFn) {
+    $scope.scan = function() {
+      $log.debug('Scanning...');
+      scanFn();
     };
-  });
+  };
+
+  $scope.importInit = function() {
+    $scope.fromOnboarding = $stateParams.fromOnboarding;
+    $timeout(function() {
+      $scope.$apply();
+    }, 1);
+  }
+
+});
diff --git a/src/js/routes.js b/src/js/routes.js
index 15ed20d90..e70269936 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -631,6 +631,42 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
           }
         }
       })
+      .state('onboarding.import', {
+        url: '/import/:fromOnboarding',
+        abstract: true,
+        views: {
+          'onboarding': {
+            templateUrl: 'views/import.html'
+          },
+        },
+        params: {
+          code: null
+        },
+      })
+      .state('onboarding.import.phrase', {
+        url: '/tab-import-phrase',
+        views: {
+          'tab-import-phrase': {
+            templateUrl: 'views/tab-import-phrase.html',
+          },
+        }
+      })
+      .state('onboarding.import.file', {
+        url: '/tab-import-file',
+        views: {
+          'tab-import-file': {
+            templateUrl: 'views/tab-import-file.html',
+          },
+        }
+      })
+      .state('onboarding.import.hardware', {
+        url: '/tab-import-hardware',
+        views: {
+          'tab-import-hardware': {
+            templateUrl: 'views/tab-import-hardware.html',
+          },
+        }
+      })
 
     /*
      *

From d5ef1e071d6a010d6660fdf3440beec59bb02d0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 1 Sep 2016 16:03:43 -0300
Subject: [PATCH 17/26] import refactor

---
 src/js/controllers/import.js | 90 ++++++++----------------------------
 1 file changed, 20 insertions(+), 70 deletions(-)

diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index 55fcb5645..8f437368f 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -101,18 +101,7 @@ angular.module('copayApp.controllers').controller('importController',
             return;
 
           }
-
-          walletService.updateRemotePreferences(client, {}, function() {
-            $log.debug('Remote preferences saved for:' + client.credentials.walletId)
-          });
-
-          profileService.setBackupFlag(client.credentials.walletId);
-          if ($stateParams.fromOnboarding) {
-            profileService.setDisclaimerAccepted(function(err) {
-              if (err) $log.error(err);
-            });
-          }
-          $state.go('tabs.home');
+          finish(client);
         });
       }, 100);
     };
@@ -132,19 +121,7 @@ angular.module('copayApp.controllers').controller('importController',
               $scope.$apply();
             });
           }
-
-
-          walletService.updateRemotePreferences(client, {}, function() {
-            $log.debug('Remote preferences saved for:' + client.credentials.walletId)
-          });
-
-          profileService.setBackupFlag(client.credentials.walletId);
-          if ($stateParams.fromOnboarding) {
-            profileService.setDisclaimerAccepted(function(err) {
-              if (err) $log.error(err);
-            });
-          }
-          $state.go('tabs.home');
+          finish(client);
         });
       }, 100);
     };
@@ -163,13 +140,6 @@ angular.module('copayApp.controllers').controller('importController',
               $scope.$apply();
             });
           }
-
-          profileService.setBackupFlag(walletId);
-          if ($stateParams.fromOnboarding) {
-            profileService.setDisclaimerAccepted(function(err) {
-              if (err) $log.error(err);
-            });
-          }
           $state.go('tabs.home');
         });
       }, 100);
@@ -193,18 +163,7 @@ angular.module('copayApp.controllers').controller('importController',
               $scope.$apply();
             });
           }
-
-          walletService.updateRemotePreferences(client, {}, function() {
-            $log.debug('Remote preferences saved for:' + client.credentials.walletId)
-          });
-
-          profileService.setBackupFlag(client.credentials.walletId);
-          if ($stateParams.fromOnboarding) {
-            profileService.setDisclaimerAccepted(function(err) {
-              if (err) $log.error(err);
-            });
-          }
-          $state.go('tabs.home');
+          finish(client);
         });
       }, 100);
     };
@@ -312,19 +271,7 @@ angular.module('copayApp.controllers').controller('importController',
             popupService.showAlert(gettextCatalog.getString('Error'), err);
             return;
           }
-
-
-          walletService.updateRemotePreferences(wallet, {}, function() {
-            $log.debug('Remote preferences saved for:' + wallet.walletId)
-          });
-
-          profileService.setBackupFlag(wallet.walletId);
-          if ($stateParams.fromOnboarding) {
-            profileService.setDisclaimerAccepted(function(err) {
-              if (err) $log.error(err);
-            });
-          }
-          $state.go('tabs.home');
+          finish(wallet);
         });
       }, 100);
     };
@@ -388,23 +335,26 @@ angular.module('copayApp.controllers').controller('importController',
             popupService.showAlert(gettextCatalog.getString('Error'), err);
             return;
           }
-
-
-          walletService.updateRemotePreferences(wallet, {}, function() {
-            $log.debug('Remote preferences saved for:' + wallet.walletId)
-          });
-
-          profileService.setBackupFlag(wallet.walletId);
-          if ($stateParams.fromOnboarding) {
-            profileService.setDisclaimerAccepted(function(err) {
-              if (err) $log.error(err);
-            });
-          }
-          $state.go('tabs.home');
+          finish(wallet);
         });
       }, 100);
     };
 
+    var finish = function(wallet) {
+
+      walletService.updateRemotePreferences(wallet, {}, function() {
+        $log.debug('Remote preferences saved for:' + wallet.credentials.walletId)
+      });
+
+      profileService.setBackupFlag(wallet.credentials.walletId);
+      if ($stateParams.fromOnboarding) {
+        profileService.setDisclaimerAccepted(function(err) {
+          if (err) $log.error(err);
+        });
+      }
+      $state.go('tabs.home');
+    };
+
     updateSeedSourceSelect();
     $scope.setSeedSource();
     if ($stateParams.code) $scope.processWalletInfo($stateParams.code);

From 8dd14aa1b165fd96575412297b36216059867e44 Mon Sep 17 00:00:00 2001
From: Nick Cardin <nick@cardin.email>
Date: Thu, 1 Sep 2016 15:06:26 -0400
Subject: [PATCH 18/26] remove ionic css task from gruntfile

---
 Gruntfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 026c4d499..d49d5bf8f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -245,7 +245,7 @@ module.exports = function(grunt) {
     }
   });
 
-  grunt.registerTask('default', ['nggettext_compile', 'exec:appConfig', 'exec:coinbase', 'browserify', 'sass', 'concat', 'copy:ionic_fonts', 'copy:ionic_js', 'copy:ionic_css']);
+  grunt.registerTask('default', ['nggettext_compile', 'exec:appConfig', 'exec:coinbase', 'browserify', 'sass', 'concat', 'copy:ionic_fonts', 'copy:ionic_js']);
   grunt.registerTask('prod', ['default', 'uglify']);
   grunt.registerTask('translate', ['nggettext_extract']);
   grunt.registerTask('test', ['karma:unit']);

From 3c9303ab290804aab0a808c0086b4248c35d0e43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 1 Sep 2016 16:08:41 -0300
Subject: [PATCH 19/26] fixes

---
 src/js/controllers/import.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index 8f437368f..4ba74e011 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -140,6 +140,14 @@ angular.module('copayApp.controllers').controller('importController',
               $scope.$apply();
             });
           }
+
+          profileService.setBackupFlag(walletId);
+           if ($stateParams.fromOnboarding) {
+             profileService.setDisclaimerAccepted(function(err) {
+               if (err) $log.error(err);
+             });
+           }
+ 
           $state.go('tabs.home');
         });
       }, 100);

From 70db673855d2ee6e56967b2c317c5447e97020a3 Mon Sep 17 00:00:00 2001
From: Nick Cardin <nick@cardin.email>
Date: Thu, 1 Sep 2016 15:04:15 -0400
Subject: [PATCH 20/26] update walletDetails header styles

---
 public/views/walletDetails.html     | 17 ++++++++++-------
 src/js/controllers/walletDetails.js |  4 ++++
 src/sass/common.scss                |  8 ++++++++
 src/sass/main.scss                  | 15 +--------------
 src/sass/views/walletDetails.scss   | 24 ++++++++++++++++++++++++
 5 files changed, 47 insertions(+), 21 deletions(-)
 create mode 100644 src/sass/views/walletDetails.scss

diff --git a/public/views/walletDetails.html b/public/views/walletDetails.html
index 12abcb6c6..7efc8a472 100644
--- a/public/views/walletDetails.html
+++ b/public/views/walletDetails.html
@@ -1,10 +1,13 @@
-<ion-view>
-  <ion-nav-bar class="bar-royal">
-    <ion-nav-title>{{wallet.name}}</ion-nav-title>
-    <ion-nav-back-button>
+<ion-view id="walletDetails">
+  <ion-header-bar ng-style="{'background-color': walletDetailsColor}">
+    <button class="button back-button" ng-click="$ionicGoBack()">
       <i class="icon ion-ios-arrow-thin-left"></i>
-    </ion-nav-back-button>
-  </ion-nav-bar>
+    </button>
+    <h1 class="title">{{walletDetailsName}}</h1>
+    <button class="button search-button">
+      <i class="icon ion-ios-search-strong"></i>
+    </button>
+  </ion-header-bar>
 
   <ion-content ng-controller="walletDetailsController" ng-init="init()" delegate-handle="my-handle">
     <div ng-show="!wallet" translate>
@@ -39,7 +42,7 @@
 
           <div ng-click='updateAll()' ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !wallet.balanceHidden" on-hold="hideToggle()">
             <strong class="size-36">{{status.totalBalanceStr}}</strong>
-            <div class="size-14" ng-if="status.totalBalanceAlternative">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</div>
+            <div class="size-14 amount-alternative" ng-if="status.totalBalanceAlternative">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</div>
             <div class="size-14" ng-if="status.pendingAmount">
               <span translate>Pending Confirmation</span>: {{status.pendingAmountStr}}
             </div>
diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js
index 4422a5d22..9994be0dd 100644
--- a/src/js/controllers/walletDetails.js
+++ b/src/js/controllers/walletDetails.js
@@ -194,6 +194,10 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
       return $state.go('wallet.copayers');
     };
 
+    /* Set color for header bar */
+    $rootScope.walletDetailsColor = wallet.color;
+    $rootScope.walletDetailsName = wallet.name;
+
     $scope.wallet = wallet;
     $scope.requiresMultipleSignatures = wallet.credentials.m > 1;
     $scope.newTx = false;
diff --git a/src/sass/common.scss b/src/sass/common.scss
index 38548d25a..4507e1f0d 100644
--- a/src/sass/common.scss
+++ b/src/sass/common.scss
@@ -36,6 +36,14 @@
   }
 }
 
+.search-button {
+  .icon:before {
+    color: #fff;
+    font-size: 30px !important;
+    margin-left: 5px;
+  }
+}
+
 .button-block {
   width: 90% !important;
   margin-left: auto;
diff --git a/src/sass/main.scss b/src/sass/main.scss
index fc34e9a98..0f218dd75 100644
--- a/src/sass/main.scss
+++ b/src/sass/main.scss
@@ -339,20 +339,6 @@ ul.wallet-selection.wallets {
   padding-right: 10%;
 }
 
-.amount {
-  width: 100%;
-  text-align: center;
-  padding: 1.5rem 1rem 1.5rem 1rem;
-  color: #fff;
-  height: 150px;
-  margin-bottom: 25px;
-}
-
-.alternative-amount {
-  height: 25px;
-  text-align: center;
-}
-
 .wallet-info {
   position: absolute;
   top: inherit;
@@ -1008,5 +994,6 @@ input[type=number] {
 @import 'mixins/mixins';
 @import "views/add";
 @import "views/tab-home";
+@import "views/walletDetails";
 @import 'views/onboarding/onboarding';
 @import "views/includes/walletActivity";
diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss
new file mode 100644
index 000000000..633f076ee
--- /dev/null
+++ b/src/sass/views/walletDetails.scss
@@ -0,0 +1,24 @@
+#walletDetails {
+  .bar-header {
+    border: 0;
+    .title, .button {
+      color: #fff;
+    }
+    .button {
+      background-color: transparent;
+    }
+  }
+
+  .amount {
+    width: 100%;
+    text-align: center;
+    padding: 2.5rem 1rem 1.5rem 1rem;
+    color: #fff;
+    height: 150px;
+    margin-bottom: 25px;
+
+    &-alternative {
+      line-height: 48px;
+    }
+  }
+}

From 333b4f45a0bfa780277033c7c8dfb26889f734f1 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 1 Sep 2016 16:23:27 -0300
Subject: [PATCH 21/26] fix fingerprint setting, remove activity from home

---
 app-template/Makefile             |  2 +-
 chrome-app/manifest.json          |  2 +-
 package.json                      |  2 +-
 src/js/controllers/preferences.js |  6 ++--
 src/js/controllers/tab-home.js    | 48 +++++++++++++++----------------
 src/js/services/profileService.js |  1 +
 src/js/services/walletService.js  | 13 +++++++--
 webkitbuilds/.desktop             |  2 +-
 webkitbuilds/setup-win.iss        |  2 +-
 9 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/app-template/Makefile b/app-template/Makefile
index 2e81223e7..058cbce10 100644
--- a/app-template/Makefile
+++ b/app-template/Makefile
@@ -42,4 +42,4 @@ wp: build-wp
 
 androidrun:
 	make -C $(WORKDIR)android run
-	adb logcat | grep copay.js
+	adb logcat | grep chromium
diff --git a/chrome-app/manifest.json b/chrome-app/manifest.json
index 5e013d96e..d0240e0cc 100644
--- a/chrome-app/manifest.json
+++ b/chrome-app/manifest.json
@@ -5,7 +5,7 @@
   "manifest_version": 2,
   "name": "BitPay",
   "description": "The BitPay Bitcoin Wallet",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "permissions": [
     "storage",
     "unlimitedStorage",
diff --git a/package.json b/package.json
index c34d05ca9..abfa18eb5 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "name": "bitpay",
   "description": "The BitPay Bitcoin Wallet",
   "author": "BitPay",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "keywords": [
     "wallet",
     "copay",
diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js
index 65d95f618..f66aad999 100644
--- a/src/js/controllers/preferences.js
+++ b/src/js/controllers/preferences.js
@@ -69,10 +69,12 @@ angular.module('copayApp.controllers').controller('preferencesController',
 
     $scope.touchIdChange = function() {
       var newStatus = $scope.touchIdEnabled;
-      walletService.setTouchId(wallet, newStatus, function(err) {
+      walletService.setTouchId(wallet, !!newStatus, function(err) {
         if (err) {
-          $log.warn(err);
           $scope.touchIdEnabled = !newStatus;
+          $timeout(function() {
+            $scope.$apply();
+          }, 1);
           return;
         }
         $log.debug('Touch Id status changed: ' + newStatus);
diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index 592c10c84..058568ebc 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -31,19 +31,19 @@ angular.module('copayApp.controllers').controller('tabHomeController',
           wallet.status = status;
         });
       });
-
-      $scope.fetchingNotifications = true;
-      profileService.getNotifications({
-        limit: 3
-      }, function(err, n) {
-        if (err) {
-          console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
-          return;
-        }
-        $scope.fetchingNotifications = false;
-        setNotifications(n);
-        $ionicScrollDelegate.resize();
-      })
+      //
+      // $scope.fetchingNotifications = true;
+      // profileService.getNotifications({
+      //   limit: 3
+      // }, function(err, n) {
+      //   if (err) {
+      //     console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
+      //     return;
+      //   }
+      //   $scope.fetchingNotifications = false;
+      //   setNotifications(n);
+      //   $ionicScrollDelegate.resize();
+      // })
     };
 
     $scope.updateWallet = function(wallet) {
@@ -55,17 +55,17 @@ angular.module('copayApp.controllers').controller('tabHomeController',
         }
         wallet.status = status;
 
-        profileService.getNotifications({
-          limit: 3
-        }, function(err, n) {
-          console.log('[tab-home.js.57]', n); //TODO
-          if (err) {
-            console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
-            return;
-          }
-          setNotifications(n);
-          $ionicScrollDelegate.resize();
-        })
+        // profileService.getNotifications({
+        //   limit: 3
+        // }, function(err, n) {
+        //   console.log('[tab-home.js.57]', n); //TODO
+        //   if (err) {
+        //     console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
+        //     return;
+        //   }
+        //   setNotifications(n);
+        //   $ionicScrollDelegate.resize();
+        // })
       });
     };
 
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 78c1739f1..76d639869 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -827,6 +827,7 @@ angular.module('copayApp.services')
         prev;
 
 
+        // REMOVE (if we want 1-to-1 notification) ????
         lodash.each(shown, function(x) {
           if (prev && prev.walletId === x.walletId && prev.txpId && prev.txpId === x.txpId && prev.creatorId && prev.creatorId === x.creatorId) {
             prev.types.push(x.type);
diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js
index e5640af61..4f3519514 100644
--- a/src/js/services/walletService.js
+++ b/src/js/services/walletService.js
@@ -995,10 +995,17 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
   };
 
   root.setTouchId = function(wallet, enabled, cb) {
+
+    var opts = {
+      touchIdFor: {}
+    };
+    opts.touchIdFor[wallet.id] = enabled;
+
     fingerprintService.check(wallet, function(err) {
-      if (err) return cb(err); {
-        $log.debug(err);
-        return;
+      if (err) {
+        opts.touchIdFor[wallet.id] = !enabled;
+        $log.debug('Error with fingerprint:' + err);
+        return cb(err);
       }
       configService.set(opts, cb);
     });
diff --git a/webkitbuilds/.desktop b/webkitbuilds/.desktop
index fe6c809a5..805d086bd 100644
--- a/webkitbuilds/.desktop
+++ b/webkitbuilds/.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Version=0.7.0
+Version=0.8.0
 Name=BitPay
 Comment=The BitPay Bitcoin Wallet
 Exec=bitpay
diff --git a/webkitbuilds/setup-win.iss b/webkitbuilds/setup-win.iss
index 4fdf77619..3fe57e4b6 100755
--- a/webkitbuilds/setup-win.iss
+++ b/webkitbuilds/setup-win.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "bitpay"
-#define MyAppVersion "0.7.0"
+#define MyAppVersion "0.8.0"
 #define MyAppPublisher "BitPay"
 #define MyAppURL "https://bitpay.com"
 #define MyAppExeName "*NAMECASENOSPACE.exe"

From e0b77968bd4a0312283c0943b785c914f0a92543 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 1 Sep 2016 16:50:13 -0300
Subject: [PATCH 22/26] disable grouping in activity

---
 public/views/includes/walletActivity.html | 32 +++++++--------
 src/js/controllers/tab-home.js            | 48 +++++++++++------------
 src/js/services/profileService.js         | 39 +++++++++---------
 3 files changed, 60 insertions(+), 59 deletions(-)

diff --git a/public/views/includes/walletActivity.html b/public/views/includes/walletActivity.html
index fca106357..a4d834e45 100644
--- a/public/views/includes/walletActivity.html
+++ b/public/views/includes/walletActivity.html
@@ -1,14 +1,14 @@
 <span class="wallet-activity">
 
-  <div ng-if="x.types.indexOf('NewCopayer')>=0 && x.wallet.n>1">
+  <div ng-if="x.type ==  'NewCopayer' && x.wallet.n>1">
     Copayer joined 
   </div>
 
-  <div ng-if="x.types.indexOf('NewCopayer')>=0 && x.wallet.n==1">
+  <div ng-if="x.type == 'NewCopayer' && x.wallet.n==1">
     Wallet created
   </div>
 
-  <div ng-if="x.types.indexOf('NewOutgoingTx')>=0">
+  <div ng-if="x.type == 'NewOutgoingTx'">
       <span translate>Payment Sent </span>
       <div class="wallet-activity-amount">
       {{x.amountStr}}
@@ -17,36 +17,34 @@
 
 
 
-  <div ng-if="x.types.indexOf('NewIncomingTx')>=0">
+  <div ng-if="x.type == 'NewIncomingTx'">
       <span translate>Payment Received</span>
       <div class="wallet-activity-amount">
       {{x.amountStr}}
       </div>
   </div>
 
-  <div ng-if="x.types.indexOf('TxProposalRemoved')>=0">
+  <div ng-if="x.type == 'TxProposalRemoved'">
     <i class="icon ion-ios-close-empty size-21" ng-style="{'color':x.wallet.color}"></i>
     <span translate>Proposal Deleted</span>
   </div>
 
-  <div ng-if="x.types.indexOf('TxProposalRejected')>=0">
+  <div ng-if="x.type == 'TxProposalRejected'">
     <i class="icon ion-ios-close-empty size-21" ng-style="{'color':x.wallet.color}"></i>
     <span translate>Proposal Rejected</span>
   </div>
 
-  <div ng-if="x.types.indexOf('TxProposalRemoved') == -1 && x.types.indexOf('TxProposalRejected') == -1">
-    <span ng-if="x.types.indexOf('NewTxProposal')>=0  && x.types.indexOf('NewOutgoingTx')==-1 ">
-      <i class="icon ion-arrow-up-c size-21" ng-style="{'color':x.wallet.color}"></i>
+  <span ng-if="x.type == 'NewTxProposal'">
+    <i class="icon ion-arrow-up-c size-21" ng-style="{'color':x.wallet.color}"></i>
 
-      {{x.amountStr}}
-      <i>{{x.message}}</i>
-    </span>
-    <span ng-if="x.types.indexOf('TxProposalAcceptedBy')>=0 && x.types.indexOf('NewTxProposal') == -1  && x.types.indexOf('NewOutgoingTx')==-1">
-      <i class="icon ion-checkmark-round size-21" ng-style="{'color':x.wallet.color}"></i>
-      <span translate>Proposal Accepted</span>
-    </span>
-  </div>
+    {{x.amountStr}}
+    <i>{{x.message}}</i>
+  </span>
 
+  <span ng-if="x.type == 'TxProposalAcceptedBy'">
+    <i class="icon ion-checkmark-round size-21" ng-style="{'color':x.wallet.color}"></i>
+    <span translate>Proposal Accepted</span>
+  </span>
 
   <p class="wallet-activity-note">
 <!-- {{x.types}} -->
diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index 058568ebc..592c10c84 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -31,19 +31,19 @@ angular.module('copayApp.controllers').controller('tabHomeController',
           wallet.status = status;
         });
       });
-      //
-      // $scope.fetchingNotifications = true;
-      // profileService.getNotifications({
-      //   limit: 3
-      // }, function(err, n) {
-      //   if (err) {
-      //     console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
-      //     return;
-      //   }
-      //   $scope.fetchingNotifications = false;
-      //   setNotifications(n);
-      //   $ionicScrollDelegate.resize();
-      // })
+
+      $scope.fetchingNotifications = true;
+      profileService.getNotifications({
+        limit: 3
+      }, function(err, n) {
+        if (err) {
+          console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
+          return;
+        }
+        $scope.fetchingNotifications = false;
+        setNotifications(n);
+        $ionicScrollDelegate.resize();
+      })
     };
 
     $scope.updateWallet = function(wallet) {
@@ -55,17 +55,17 @@ angular.module('copayApp.controllers').controller('tabHomeController',
         }
         wallet.status = status;
 
-        // profileService.getNotifications({
-        //   limit: 3
-        // }, function(err, n) {
-        //   console.log('[tab-home.js.57]', n); //TODO
-        //   if (err) {
-        //     console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
-        //     return;
-        //   }
-        //   setNotifications(n);
-        //   $ionicScrollDelegate.resize();
-        // })
+        profileService.getNotifications({
+          limit: 3
+        }, function(err, n) {
+          console.log('[tab-home.js.57]', n); //TODO
+          if (err) {
+            console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
+            return;
+          }
+          setNotifications(n);
+          $ionicScrollDelegate.resize();
+        })
       });
     };
 
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 76d639869..a5f5c8769 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -822,26 +822,29 @@ angular.module('copayApp.services')
           };
         });
 
-        // condense
-        var finale = [],
-        prev;
 
+        var finale = shown; // GROUPING DISABLED!
 
-        // REMOVE (if we want 1-to-1 notification) ????
-        lodash.each(shown, function(x) {
-          if (prev && prev.walletId === x.walletId && prev.txpId && prev.txpId === x.txpId && prev.creatorId && prev.creatorId === x.creatorId) {
-            prev.types.push(x.type);
-            prev.data = lodash.assign(prev.data, x.data);
-            prev.txid = prev.txid || x.txid;
-            prev.amountStr = prev.amountStr || x.amountStr;
-            prev.creatorName = prev.creatorName || x.creatorName;
-          } else {
-            finale.push(x);
-            prev = x;
-          }
-        });
-
-        // messages...
+        // var finale = [],
+        // prev;
+        //
+        //
+        // // Item grouping... DISABLED.
+        //
+        // // REMOVE (if we want 1-to-1 notification) ????
+        // lodash.each(shown, function(x) {
+        //   if (prev && prev.walletId === x.walletId && prev.txpId && prev.txpId === x.txpId && prev.creatorId && prev.creatorId === x.creatorId) {
+        //     prev.types.push(x.type);
+        //     prev.data = lodash.assign(prev.data, x.data);
+        //     prev.txid = prev.txid || x.txid;
+        //     prev.amountStr = prev.amountStr || x.amountStr;
+        //     prev.creatorName = prev.creatorName || x.creatorName;
+        //   } else {
+        //     finale.push(x);
+        //     prev = x;
+        //   }
+        // });
+        //
 
         var u = bwcService.getUtils();
         lodash.each(finale, function(x) {

From 792c20b0409376b42ab31cc8fab535413bceda1a Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 1 Sep 2016 16:51:29 -0300
Subject: [PATCH 23/26] Glidera service

---
 .gitignore                        |  6 ++----
 Gruntfile.js                      |  8 +++----
 app-template/apply.js             | 11 +++++++++-
 public/views/glidera.html         |  4 ++++
 src/js/services/glideraService.js | 36 ++++++++++++++++++-------------
 util/buildExternalServices.js     | 30 ++++++++++++++++++++++++++
 util/coinbase.js                  | 20 -----------------
 7 files changed, 71 insertions(+), 44 deletions(-)
 create mode 100755 util/buildExternalServices.js
 delete mode 100755 util/coinbase.js

diff --git a/.gitignore b/.gitignore
index de3b537c4..11a47b5cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,6 @@ i18n/po/*.mo
 i18n/crowdin_api_key.txt
 src/js/translations.js
 
-# Coinbase API ClientID/Secret
-coinbase.json
-src/js/coinbase.js
-
 # cordova
 cordova/project-*/*
 cordova/*.keystore
@@ -101,6 +97,7 @@ public/fonts
 
 ## templates
 /appConfig.json
+externalServices.json
 cordova/Makefile
 cordova/ProjectMakefile
 app-template/bpapp
@@ -110,6 +107,7 @@ cordova/wp/Package.appxmanifest
 public/img/logo-negative.svg
 public/img/logo.svg
 src/js/appConfig.js
+src/js/externalServices.js
 
 
 cordova/Makefile
diff --git a/Gruntfile.js b/Gruntfile.js
index d49d5bf8f..ad4a457a5 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -10,8 +10,8 @@ module.exports = function(grunt) {
       appConfig: {
         command: 'node ./util/buildAppConfig.js'
       },
-      coinbase: {
-        command: 'node ./util/coinbase.js'
+      externalServices: {
+        command: 'node ./util/buildExternalServices.js'
       },
       clean: {
         command: 'rm -Rf bower_components node_modules'
@@ -134,7 +134,7 @@ module.exports = function(grunt) {
           'src/js/controllers/**/*.js',
           'src/js/translations.js',
           'src/js/appConfig.js',
-          'src/js/coinbase.js',
+          'src/js/externalServices.js',
           'src/js/init.js',
           'src/js/trezor-url.js',
           'bower_components/trezor-connect/login.js'
@@ -245,7 +245,7 @@ module.exports = function(grunt) {
     }
   });
 
-  grunt.registerTask('default', ['nggettext_compile', 'exec:appConfig', 'exec:coinbase', 'browserify', 'sass', 'concat', 'copy:ionic_fonts', 'copy:ionic_js']);
+  grunt.registerTask('default', ['nggettext_compile', 'exec:appConfig', 'exec:externalServices', 'browserify', 'sass', 'concat', 'copy:ionic_fonts', 'copy:ionic_js']);
   grunt.registerTask('prod', ['default', 'uglify']);
   grunt.registerTask('translate', ['nggettext_extract']);
   grunt.registerTask('test', ['karma:unit']);
diff --git a/app-template/apply.js b/app-template/apply.js
index 115044cae..7c17ff1ce 100755
--- a/app-template/apply.js
+++ b/app-template/apply.js
@@ -68,7 +68,16 @@ console.log('Copying ' + configDir + '/appConfig.json' + ' to root');
 configBlob = configBlob.replace('{', JSONheader);
 fs.writeFileSync('../appConfig.json', configBlob, 'utf8');
 
-
+////////////////
+var externalServices;
+try {
+  console.log('Copying ' + configDir + '/externalServices.json' + ' to root');
+  externalServices = fs.readFileSync(configDir + '/externalServices.json', 'utf8');
+} catch(err) {
+  externalServices = '{}';
+  console.log('External services not configured');
+}
+fs.writeFileSync('../externalServices.json', externalServices, 'utf8');
 
 function copyDir(from, to, cb) {
   console.log('Copying dir ' + from + ' to');
diff --git a/public/views/glidera.html b/public/views/glidera.html
index 3c32f93eb..10cfcc304 100644
--- a/public/views/glidera.html
+++ b/public/views/glidera.html
@@ -10,6 +10,10 @@
 
   <ion-content ng-controller="glideraController as glidera" ng-init="init()">
 
+    <div class="box-notification error" ng-show="!network">
+      Glidera is disabled for this application
+    </div>
+
     <div class="box-notification warning" ng-show="network == 'testnet'">
       Testnet wallets only work with Glidera Sandbox Accounts
     </div>
diff --git a/src/js/services/glideraService.js b/src/js/services/glideraService.js
index 7665a5767..3f9dfe440 100644
--- a/src/js/services/glideraService.js
+++ b/src/js/services/glideraService.js
@@ -1,11 +1,17 @@
 'use strict';
 
-angular.module('copayApp.services').factory('glideraService', function($http, $log, platformInfo, storageService, configService, $rootScope) {
+angular.module('copayApp.services').factory('glideraService', function($http, $log, $window, platformInfo, storageService, configService, $rootScope) {
   var root = {};
   var credentials = {};
   var isCordova = platformInfo.isCordova;
 
   var _setCredentials = function() {
+    if (!$window.externalServices || !$window.externalServices.glidera) {
+      return;
+    }
+
+    var glidera = $window.externalServices.glidera;
+
     /*
      * Development: 'testnet'
      * Production: 'livenet'
@@ -13,26 +19,26 @@ angular.module('copayApp.services').factory('glideraService', function($http, $l
     credentials.NETWORK = 'livenet';
 
     if (credentials.NETWORK == 'testnet') {
-      credentials.HOST = 'https://sandbox.glidera.io';
+      credentials.HOST = glidera.sandbox.host;
       if (isCordova) {
-        credentials.REDIRECT_URI = 'copay://glidera';
-        credentials.CLIENT_ID = '6163427a2f37d1b2022ececd6d6c9cdd';
-        credentials.CLIENT_SECRET = '599cc3af26108c6fece8ab17c3f35867';
+        credentials.REDIRECT_URI = glidera.sandbox.mobile.redirect_uri;
+        credentials.CLIENT_ID = glidera.sandbox.mobile.client_id;
+        credentials.CLIENT_SECRET = glidera.sandbox.mobile.client_secret;
       } else {
-        credentials.REDIRECT_URI = 'urn:ietf:wg:oauth:2.0:oob';
-        credentials.CLIENT_ID = 'c402f4a753755456e8c384fb65b7be1d';
-        credentials.CLIENT_SECRET = '3ce826198e3618d0b8ed341ab91fe4e5';
+        credentials.REDIRECT_URI = glidera.sandbox.desktop.redirect_uri;
+        credentials.CLIENT_ID = glidera.sandbox.desktop.client_id;
+        credentials.CLIENT_SECRET = glidera.sandbox.desktop.client_secret;
       }
     } else {
-      credentials.HOST = 'https://glidera.io';
+      credentials.HOST = glidera.production.host;
       if (isCordova) {
-        credentials.REDIRECT_URI = 'copay://glidera';
-        credentials.CLIENT_ID = '9c8023f0ac0128235b7b27a6f2610c83';
-        credentials.CLIENT_SECRET = '30431511407b47f25a83bffd72881d55';
+        credentials.REDIRECT_URI = glidera.production.mobile.redirect_uri;
+        credentials.CLIENT_ID = glidera.production.mobile.client_id;
+        credentials.CLIENT_SECRET = glidera.production.mobile.client_secret;
       } else {
-        credentials.REDIRECT_URI = 'urn:ietf:wg:oauth:2.0:oob';
-        credentials.CLIENT_ID = '8a9e8a9cf155db430c1ea6c7889afed1';
-        credentials.CLIENT_SECRET = '24ddec578f38d5488bfe13601933c05f';
+        credentials.REDIRECT_URI = glidera.production.desktop.redirect_uri;
+        credentials.CLIENT_ID = glidera.production.desktop.client_id;
+        credentials.CLIENT_SECRET = glidera.production.desktop.client_secret;
       }
     };
   };
diff --git a/util/buildExternalServices.js b/util/buildExternalServices.js
new file mode 100755
index 000000000..630d03609
--- /dev/null
+++ b/util/buildExternalServices.js
@@ -0,0 +1,30 @@
+#!/usr/bin/env node
+
+'use strict';
+
+var fs = require('fs');
+var file;
+
+try {
+  file = fs.readFileSync('./externalServices.json', 'utf8');
+} catch(err) {
+  return;
+}
+
+var externalServices = JSON.parse(file);
+if (externalServices.coinbase &&
+    externalServices.coinbase.production.client_id)
+  console.log('Coinbase Production Enabled');
+if (externalServices.coinbase &&
+    externalServices.coinbase.sandbox.client_id)
+  console.log('Coinbase Sandbox Enabled');
+if (externalServices.glidera &&
+    (externalServices.glidera.production.mobile.client_id || externalServices.glidera.production.desktop.client_id))
+  console.log('Glidera Production Enabled');
+if (externalServices.glidera &&
+    (externalServices.glidera.sandbox.mobile.client_id || externalServices.glidera.sandbox.desktop.client_id))
+  console.log('Glidera Sandbox Enabled');
+
+var content = 'window.externalServices=' + JSON.stringify(externalServices) + ';';
+fs.writeFileSync("./src/js/externalServices.js", content);
+
diff --git a/util/coinbase.js b/util/coinbase.js
deleted file mode 100755
index d0bd4006d..000000000
--- a/util/coinbase.js
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-'use strict';
-
-var fs = require('fs');
-var file;
-
-try { 
-    file = fs.readFileSync('./coinbase.json', 'utf8');
-} catch(err) {
-  return;
-}
-
-var json = JSON.parse(file);
-console.log('Coinbase Client ID: ' + json.client_id);
-
-var content = 'window.coinbase_client_id="' + json.client_id + '";';
-content = content + '\nwindow.coinbase_client_secret="' + json.client_secret + '";';
-fs.writeFileSync("./src/js/coinbase.js", content);
-

From f5127d157cd6fc688e140465df6b8c93016dffa9 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 1 Sep 2016 16:56:35 -0300
Subject: [PATCH 24/26] better views in activity

---
 public/views/includes/walletActivity.html | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/public/views/includes/walletActivity.html b/public/views/includes/walletActivity.html
index a4d834e45..9ff11beb7 100644
--- a/public/views/includes/walletActivity.html
+++ b/public/views/includes/walletActivity.html
@@ -26,24 +26,38 @@
 
   <div ng-if="x.type == 'TxProposalRemoved'">
     <i class="icon ion-ios-close-empty size-21" ng-style="{'color':x.wallet.color}"></i>
-    <span translate>Proposal Deleted</span>
+    <span translate>Proposal Deleted</span>: 
+    <i>{{x.message}}</i>
+    <div class="wallet-activity-amount">
+      {{x.amountStr}}:
+    </div>
   </div>
 
   <div ng-if="x.type == 'TxProposalRejected'">
     <i class="icon ion-ios-close-empty size-21" ng-style="{'color':x.wallet.color}"></i>
-    <span translate>Proposal Rejected</span>
+    <span translate>Proposal Rejected</span>:
+    <i>{{x.message}}</i>
+    <div class="wallet-activity-amount">
+      {{x.amountStr}}:
+      </div>
   </div>
 
   <span ng-if="x.type == 'NewTxProposal'">
     <i class="icon ion-arrow-up-c size-21" ng-style="{'color':x.wallet.color}"></i>
-
-    {{x.amountStr}}
+    <span translate>New Proposal</span>:
     <i>{{x.message}}</i>
+    <div class="wallet-activity-amount">
+    {{x.amountStr}} 
+    </div>
   </span>
 
   <span ng-if="x.type == 'TxProposalAcceptedBy'">
     <i class="icon ion-checkmark-round size-21" ng-style="{'color':x.wallet.color}"></i>
     <span translate>Proposal Accepted</span>
+    <i>{{x.message}}</i>
+    <div class="wallet-activity-amount">
+    {{x.amountStr}}
+    </div>
   </span>
 
   <p class="wallet-activity-note">

From dd98e5375a7633afc5c5e907f35a30df151004d0 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 1 Sep 2016 16:58:05 -0300
Subject: [PATCH 25/26] rm log

---
 src/js/controllers/tab-home.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index 592c10c84..e88b3ac95 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -58,7 +58,6 @@ angular.module('copayApp.controllers').controller('tabHomeController',
         profileService.getNotifications({
           limit: 3
         }, function(err, n) {
-          console.log('[tab-home.js.57]', n); //TODO
           if (err) {
             console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
             return;

From 3818c783a028d2f12cd9ea35fb8150660cbfa305 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Thu, 1 Sep 2016 16:57:21 -0300
Subject: [PATCH 26/26] set bws url by default

---
 public/views/preferencesBwsUrl.html | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/public/views/preferencesBwsUrl.html b/public/views/preferencesBwsUrl.html
index 54df1a81f..71542f87f 100644
--- a/public/views/preferencesBwsUrl.html
+++ b/public/views/preferencesBwsUrl.html
@@ -4,13 +4,19 @@
       <i class="icon ion-ios-arrow-thin-left"></i>
     </ion-nav-back-button>
   </ion-nav-bar>
-  <ion-content ng-controller="preferencesBwsUrlController" >
-    <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>
-        <input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="bwsurl">
-      </label>
-      <input type="submit" class="button button-block button-stable" value="{{'Save'|translate}}"></input>
-    </form>
+  <ion-content ng-controller="preferencesBwsUrlController">
+
+    <div class="row no-border">
+      <div class="col col-90">
+        <label class="item item-input item-stacked-label no-border">
+          <span class="input-label" transalate>Wallet Service URL</span>
+          <input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="bwsurl">
+        </label>
+      </div>
+      <div class="col">
+        <i class="icon ion-ios-reload" ng-click="resetDefaultUrl()"></i>
+      </div>
+    </div>
+    <button class="button button-block button-balanced" ng-click="save()" translate>Save</button>
   </ion-content>
 </ion-view>