Coinbase connection issues and logout from tab-setting

www/views/coinbase.html

@@ -3,11 +3,6 @@
     <ion-nav-back-button>
     </ion-nav-back-button>
     <ion-nav-title>Coinbase</ion-nav-title>
-    <ion-nav-buttons side="secondary">
-      <button ng-show="accountId" class="button no-border" ui-sref="tabs.buyandsell.coinbase.preferences">
-        <i class="icon ion-ios-settings"></i>
-      </button>
-    </ion-nav-buttons>
   </ion-nav-bar>
 
   <ion-content>

www/views/modals/coinbase-confirmation.html

@@ -1,18 +0,0 @@
-<ion-modal-view ng-controller="coinbaseConfirmationController">
-  <div class="m20tp text-center">
-    <div class="row">
-    <h1 class="text-center m20b p20h">Are you sure you would like to log out of your Coinbase account?</h1>
-    <p class="text-gray p20h">You will need to log back in to buy or sell bitcoin in Copay.</p>
-    <div class="large-6 medium-6 small-6 columns">
-      <button class="button light-gray expand outline round" ng-click="cancel()">
-        <i class="fi-arrow-left"></i> <span class="tu">Back</span>
-      </button>
-    </div>
-    <div class="large-6 medium-6 small-6 columns">
-      <button class="button warning expand round" ng-click="ok()">
-        <span>Log out</span>
-      </button>
-    </div>
-    </div>
-  </div>
-</ion-modal-view>

www/views/preferencesCoinbase.html

@@ -1,60 +1,62 @@
-<div
-  class="topbar-container"
-  ng-include="'views/includes/topbar.html'"
-  ng-init="titleSection='Preferences'; goBackToState = 'coinbase'; noColor = true">
-</div>
+<ion-view>
+  <ion-nav-bar class="bar-royal">
+    <ion-nav-back-button>
+    </ion-nav-back-button>
+    <ion-nav-title>Preferences</ion-nav-title>
+  </ion-nav-bar>
 
-<div class="content coinbase-preferences" ng-controller="preferencesCoinbaseController as coinbase">
+  <ion-content>
 
-  <ul ng-if="index.coinbaseAccount && !index.coinbaseError" class="no-bullet m0">
-    <h4 class="title m0">Account</h4>
-    <li>
-    <span>ID</span>
-    <span class="right text-gray enable_text_select">
-      {{index.coinbaseAccount.id}}
-    </span>
-    </li>
-    <li>
-    <span>Name</span>
-    <span class="right text-gray">
-      {{index.coinbaseAccount.name}}
-    </span>
-    </li>
-    <li>
-    <span>Balance</span>
-    <span class="right text-gray">
-      {{index.coinbaseAccount.balance.amount}} {{index.coinbaseAccount.balance.currency}}
-    </span>
-    </li>
-    <li>
-    <span>Native Balance</span>
-    <span class="right text-gray">
-      {{index.coinbaseAccount.native_balance.amount}} {{index.coinbaseAccount.native_balance.currency}}
-    </span>
-    </li>
+    <ul ng-if="coinbaseAccount && !error" class="list">
+      <div class="item item-divider">
+        Account
+      </div>
+      <li class="item">
+        <span>ID</span>
+        <span class="item-note">
+          {{coinbaseAccount.id}}
+        </span>
+      </li>
+      <li class="item">
+        <span>Name</span>
+        <span class="item-note">
+          {{coinbaseAccount.name}}
+        </span>
+      </li>
+      <li class="item">
+        <span>Balance</span>
+        <span class="item-note">
+          {{coinbaseAccount.balance.amount}} {{coinbaseAccount.balance.currency}}
+        </span>
+      </li>
+      <li class="item">
+        <span>Native Balance</span>
+        <span class="item-note">
+          {{coinbaseAccount.native_balance.amount}} {{coinbaseAccount.native_balance.currency}}
+        </span>
+      </li>
 
-    <h4 class="title m0">User Information</h4>
-    <li>
-    <span>ID</span>
-    <span class="right text-gray enable_text_select">
-      {{index.coinbaseUser.id}}
-    </span>
-    </li>
-    <li>
-    <span>Email</span>
-    <span class="right text-gray">
-      {{index.coinbaseUser.email}}
-    </span>
-    </li>
-  </ul>
-  <ul class="no-bullet m0">
-    <h4></h4>
-    <li ng-click="coinbase.revokeToken(index.coinbaseTestnet)">
-      <i class="icon-arrow-right3 size-24 right text-gray"></i>
-      <span class="text-warning">Log out</span>
-    </li>
-  </ul>
-  <h4></h4>
+      <div class="item item-divider">
+        User Information
+      </div>
+      <li class="item">
+        <span>ID</span>
+        <span class="item-note">
+          {{coinbaseUser.id}}
+        </span>
+      </li>
+      <li class="item">
+        <span>Email</span>
+        <span class="item-note">
+          {{coinbaseUser.email}}
+        </span>
+      </li>
 
-</div>
-<div class="extra-margin-bottom"></div>
+      <div class="item item-divider"></div>
+      <li class="item" ng-click="revokeToken()">
+        <span>Log out</span>
+      </li>
+    </ul>
+
+  </ion-content>
+</ion-view>

www/views/tab-settings.html

@@ -133,6 +133,13 @@
         <i class="icon bp-arrow-right"></i>
       </a>
 
+      <a class="item item-icon-right"
+         ng-if="coinbaseEnabled && coinbaseToken"
+         ui-sref="tabs.preferences.coinbase">
+        <img src="img/coinbase-logo.png" width="90"/>
+        <i class="icon bp-arrow-right"></i>
+      </a>
+
       <div class="item item-divider"></div>
 
       <a class="item item-icon-right item-icon-left" href ui-sref="tabs.advanced">