From c340c78dedfcd02eee167d56a6529b5f2bfa9067 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 19 Aug 2016 14:38:28 -0300
Subject: [PATCH] fix index

---
 public/views/backup.html     |  4 ++--
 public/views/buyAndSell.html | 42 ++++++++++++++++++++----------------
 src/js/controllers/backup.js |  2 ++
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/public/views/backup.html b/public/views/backup.html
index f97f50008..299e9cc14 100644
--- a/public/views/backup.html
+++ b/public/views/backup.html
@@ -162,7 +162,7 @@
               translate>Finish
             </button>
             <!-- hide this in multisig just to show less text -->
-            <div class="row m20t"  ng-show="index.n==1">
+            <div class="row m20t"  ng-show="n==1">
               <div class="columns size-10 text-gray">
                 <div class="p10t line-t">
                   <span translate>You can safely install your wallet on another device and use it from multiple devices at the same time.</span>
@@ -182,7 +182,7 @@
           <p class="text-gray columns" translate>
             Failed to verify backup. Please check your information
           </p>
-          <div class="columns size-10 text-gray extra-padding-bottom" ng-show="index.n==1">
+          <div class="columns size-10 text-gray extra-padding-bottom" ng-show="n==1">
             <div class="p10t line-t">
               <span translate>You can safely install your wallet on another device and use it from multiple devices at the same time.</span>
               <a href="#" ng-click="$root.openExternalLink('https://github.com/bitpay/copay/blob/master/README.md#copay-backups-and-recovery')" translate>
diff --git a/public/views/buyAndSell.html b/public/views/buyAndSell.html
index 00fee79d6..597a8c73c 100644
--- a/public/views/buyAndSell.html
+++ b/public/views/buyAndSell.html
@@ -1,20 +1,24 @@
-<div
-  class="topbar-container"
-  ng-include="'views/includes/topbar.html'"
-  ng-init="titleSection='Buy and Sell'; closeToHome = true; noColor = true">
-</div>
+<ion-view>
+  <ion-nav-bar class="bar-stable">
+    <ion-nav-buttons side="primary">
+      <button class="button no-border" ui-sref="tabs.home">
+        Back
+      </button>
+    </ion-nav-buttons>
+    <ion-nav-title translate>Buy and sell</ion-nav-title>
+  </ion-nav-bar>
+  <ion-content>
+    <ion-list>
+      <ion-item class="item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="glidera">
+        <img src="img/glidera-logo.png" width="150">
+        <i class="icon ion-chevron-right icon-accessory"></i>
+      </ion-item>
+      <ion-item class="item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="coinbase">
+        <img src="img/coinbase-logo.png" width="150">
+        <i class="icon ion-chevron-right icon-accessory"></i>
+      </ion-item>
 
-<div class="content">
-<ul class="no-bullet manage text-center">
-  <li class="white m20t" ng-show="index.glideraEnabled">
-		<a  href ui-sref="glidera">
-      <img src="img/glidera-logo.png" width="150">
-		</a>
-	</li>
-  <li class="white m20t" ng-show="index.coinbaseEnabled">
-		<a  href ui-sref="coinbase">
-      <img src="img/coinbase-logo.png" width="150">
-		</a>
-	</li>
-</ul>
-</div>
+
+    </ion-list>
+  </ion-content>
+</ion-view>
diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js
index 14213b7dc..93659d5d8 100644
--- a/src/js/controllers/backup.js
+++ b/src/js/controllers/backup.js
@@ -6,6 +6,8 @@ angular.module('copayApp.controllers').controller('backupController',
     var wallet = profileService.getWallet($stateParams.walletId);
     $scope.customWords = [];
     $scope.walletName = wallet.credentials.walletName;
+    $scope.n = wallet.n;
+
     $scope.credentialsEncrypted = wallet.isPrivKeyEncrypted;
 
     $scope.init = function() {