Merge pull request #909 from SonicWizard/next

Added blockchain switcher and broadcast transaction page
bitpay · Mar 27, 2018 · 30852fd · 30852fd
2 parents b4a8ddd + 24e5b37
commit 30852fd
Show file tree

Hide file tree

Showing 19 changed files with 256 additions and 133 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -46,7 +46,7 @@
     "@types/jasmine": "2.5.41",
     "@types/node": "7.0.4",
     "codecov": "2.2.0",
-    "ionic": "3.19.1",
+    "ionic": "3.20.0",
     "jasmine-core": "2.5.2",
     "jasmine-spec-reporter": "3.2.0",
     "karma": "1.4.1",
@@ -67,4 +67,4 @@
     "node": ">=8"
   },
   "license": "MIT"
-}
+}
diff --git a/app/src/app/app.module.ts b/app/src/app/app.module.ts
@@ -5,7 +5,7 @@ import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';
 import { StatusBar } from '@ionic-native/status-bar';
 import { SplashScreen } from '@ionic-native/splash-screen';
 import { InsightApp } from './app.component';
-import { PagesModule, HomePage, BlocksPage, BroadcastTxPage, NodeStatusPage, VerifyMessagePage } from '../pages';
+import { PagesModule, HomePage, BlocksPage, NodeStatusPage, VerifyMessagePage } from '../pages';
 import { BlocksService, StorageService } from '../services';
 import { ApiProvider } from '../providers/api/api';
 import { CurrencyProvider } from '../providers/currency/currency';
@@ -26,7 +26,6 @@ import { BlocksProvider } from '../providers/blocks/blocks';
     InsightApp,
     HomePage,
     BlocksPage,
-    BroadcastTxPage,
     NodeStatusPage,
     VerifyMessagePage
   ],

diff --git a/app/src/assets/img/currency_logos/bch.svg b/app/src/assets/img/currency_logos/bch.svg
diff --git a/app/src/assets/img/currency_logos/btc.svg b/app/src/assets/img/currency_logos/btc.svg
diff --git a/app/src/assets/img/currency_logos/ltc.svg b/app/src/assets/img/currency_logos/ltc.svg
diff --git a/app/src/components/denomination/denomination.html b/app/src/components/denomination/denomination.html
@@ -1,4 +1,15 @@
-<ion-list radio-group [(ngModel)]="currency.currencySymbol" (ionChange)="currency.setCurrency(currency.currencySymbol)">
+<ion-list radio-group [(ngModel)]="currencyProvider.currencySymbol" (ionChange)="currencyProvider.setCurrency(currencyProvider.currencySymbol)">
+  <ion-list-header *ngIf="switcherOn">
+    Blockchain
+  </ion-list-header>
+
+  <ion-row *ngIf="switcherOn">
+    <ion-col *ngFor="let explorer of currencyProvider.explorers">
+      <button (click)="changeExplorer(explorer)" ion-item detail-none class="text-button" text-center>
+        <img src="assets/img/currency_logos/{{ explorer.ticker.toLowerCase() }}.svg" class="logo"/></button>
+    </ion-col>
+  </ion-row>
+
   <ion-list-header>
     Units
   </ion-list-header>