From 3988389f279b5f7d928d4431c18528d60706d689 Mon Sep 17 00:00:00 2001
From: JDonadio <tanojaja@gmail.com>
Date: Mon, 6 Nov 2017 16:05:32 -0300
Subject: [PATCH] add balance header

---
 src/pages/wallet-details/wallet-details.html | 13 +++--
 src/pages/wallet-details/wallet-details.scss | 36 +++++++++++++
 src/pages/wallet-details/wallet-details.ts   |  2 +
 src/providers/wallet/wallet.ts               | 53 +-------------------
 4 files changed, 50 insertions(+), 54 deletions(-)

diff --git a/src/pages/wallet-details/wallet-details.html b/src/pages/wallet-details/wallet-details.html
index 04cba02d2..70b981c2c 100644
--- a/src/pages/wallet-details/wallet-details.html
+++ b/src/pages/wallet-details/wallet-details.html
@@ -1,9 +1,16 @@
-<ion-header>
-  <ion-navbar>
+<ion-header no-border>
+  <ion-navbar transparent>
     <ion-title>{{wallet.name}}</ion-title>
   </ion-navbar>
 </ion-header>
 
 <ion-content>
-  hello
+  <div class="balance-header">
+    <div class="balance-str">{{wallet.status.availableBalanceStr}}</div>
+    <div class="balance-alt-str">{{alternativeBalanceStr}}</div>
+  </div>
+  
+  <div class="history">
+    
+  </div>
 </ion-content>
\ No newline at end of file
diff --git a/src/pages/wallet-details/wallet-details.scss b/src/pages/wallet-details/wallet-details.scss
index e69de29bb..2cd1e9e68 100644
--- a/src/pages/wallet-details/wallet-details.scss
+++ b/src/pages/wallet-details/wallet-details.scss
@@ -0,0 +1,36 @@
+page-wallet-details {
+  .header {
+    color: color($colors, light);
+    background-color: color($colors, primary);
+  }
+  
+  .toolbar {
+    background: transparent;
+  }
+  
+  .bar-button {
+    color: color($colors, light);
+  }
+  
+  .toolbar-title {
+    color: color($colors, light);
+  }
+  
+  .balance-header {
+    color: color($colors, light);
+    background-color: color($colors, primary);
+    height: 25%;
+    text-align: center;
+  }
+
+  .balance-str {
+   padding-top: 10%;
+    font-size: 30px;
+    font-weight: 600;
+  }
+
+  .balance-alt-str {
+    font-size: 20px;
+    font-weight: 500;
+  }
+}
\ No newline at end of file
diff --git a/src/pages/wallet-details/wallet-details.ts b/src/pages/wallet-details/wallet-details.ts
index 61ed87f6d..9838750fe 100644
--- a/src/pages/wallet-details/wallet-details.ts
+++ b/src/pages/wallet-details/wallet-details.ts
@@ -8,6 +8,7 @@ import { WalletProvider } from '../../providers/wallet/wallet';
 })
 export class WalletDetailsPage {
   public wallet: any;
+  public alternativeBalanceStr: string;
 
   constructor(
     private navParams: NavParams,
@@ -29,6 +30,7 @@ export class WalletDetailsPage {
   getTxHistory(force?: boolean) {
     this.walletProvider.getTxHistory_(this.wallet, {force: force}).then((txh) => {
       this.wallet.completeHistory = txh;
+      this.alternativeBalanceStr = this.wallet.status.totalBalanceAlternative + ' USD'; //TODO use tx-format provider
     }).catch((err) => {
       console.log(err);
     });
diff --git a/src/providers/wallet/wallet.ts b/src/providers/wallet/wallet.ts
index b18414cff..09f270d4c 100644
--- a/src/providers/wallet/wallet.ts
+++ b/src/providers/wallet/wallet.ts
@@ -375,13 +375,11 @@ export class WalletProvider {
       this.logger.debug('Updating Transaction History');
 
       this.getTxsFromLocal(wallet.credentials.walletId).then((txsFromLocal) => {
-        console.log('TX FROM LOCAL:', txsFromLocal);
         if (!lodash.isEmpty(txsFromLocal) && !opts.force) return resolve(txsFromLocal);
 
         this.getTxsFromServer(wallet, 0, null, 10).then((txsFromServer) => {
-          console.log('TX FROM SERVER:', txsFromServer);
 
-          this.updateTxHistory(wallet, txsFromLocal, txsFromServer);
+          this.updateTxHistory_(wallet, txsFromLocal, txsFromServer);
         }).catch((err) => {
           this.logger.debug('Error getting txs from server');
           return reject(err);
@@ -393,7 +391,7 @@ export class WalletProvider {
     });
   }
 
-  private updateTxHistory(wallet: any, txsFromLocal: any, txsFromServer?: any) {
+  private updateTxHistory_(wallet: any, txsFromLocal: any, txsFromServer?: any) {
     let array = lodash.compact(txsFromLocal.concat(txsFromServer));
     let newHistory = lodash.uniqBy(array, (x: any) => {
       return x.txid;
@@ -459,53 +457,6 @@ export class WalletProvider {
     });
   }
 
-  private updateLocalTxHistory_(wallet: any, opts: any) {
-    return new Promise((resolve, reject) => {
-      opts = opts ? opts : {};
-      let FIRST_LIMIT = 5;
-      let LIMIT = 50;
-      let requestLimit = FIRST_LIMIT;
-      let walletId = wallet.credentials.walletId;
-      let progressFn = opts.progressFn || function () { };
-      let foundLimitTx = [];
-
-      // if (opts.feeLevels) {
-      //   opts.lowAmount = this.getLowAmount(wallet, opts.feeLevels);
-      // };
-
-      // let fixTxsUnit = (txs: any): void => {
-      //   if (!txs || !txs[0] || !txs[0].amountStr) return;
-
-      //   let cacheCoin: string = txs[0].amountStr.split(' ')[1];
-
-      //   if (cacheCoin == 'bits') {
-
-      //     this.logger.debug('Fixing Tx Cache Unit to: ' + wallet.coin)
-      //     lodash.each(txs, (tx: any) => {
-      //       tx.amountStr = this.txFormatProvider.formatAmountStr(wallet.coin, tx.amount);
-      //       tx.feeStr = this.txFormatProvider.formatAmountStr(wallet.coin, tx.fees);
-      //     });
-      //   };
-      // };
-
-      this.getTxsFromLocal(walletId).then((txsFromLocal: any) => {
-        if (lodash.isEmpty(txsFromLocal)) {
-          console.log('No local transactions available');
-          return resolve(null);
-        }
-        // fixTxsUnit(txsFromLocal);
-        // First update
-        // progressFn(txsFromLocal, 0);
-        wallet.completeHistory = txsFromLocal;
-
-        // Second update
-
-      }).catch((err) => {
-        return reject(err);
-      });
-    });
-  }
-
   private updateHistoryFromServer() {
     return new Promise((resolve, reject) => {