Skip to content

Commit

Permalink
Merge pull request #909 from SonicWizard/next
Browse files Browse the repository at this point in the history
Added blockchain switcher and broadcast transaction page
  • Loading branch information
bitjson authored Mar 27, 2018
2 parents b4a8ddd + 24e5b37 commit 30852fd
Show file tree
Hide file tree
Showing 19 changed files with 256 additions and 133 deletions.
118 changes: 40 additions & 78 deletions app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -67,4 +67,4 @@
"node": ">=8"
},
"license": "MIT"
}
}
3 changes: 1 addition & 2 deletions app/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -26,7 +26,6 @@ import { BlocksProvider } from '../providers/blocks/blocks';
InsightApp,
HomePage,
BlocksPage,
BroadcastTxPage,
NodeStatusPage,
VerifyMessagePage
],
Expand Down
14 changes: 14 additions & 0 deletions app/src/assets/img/currency_logos/bch.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions app/src/assets/img/currency_logos/btc.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions app/src/assets/img/currency_logos/ltc.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 12 additions & 1 deletion app/src/components/denomination/denomination.html
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Loading

0 comments on commit 30852fd

Please sign in to comment.