Skip to content

Commit 30852fd

Browse files
authored
Merge pull request #909 from SonicWizard/next
Added blockchain switcher and broadcast transaction page
2 parents b4a8ddd + 24e5b37 commit 30852fd

File tree

19 files changed

+256
-133
lines changed

19 files changed

+256
-133
lines changed

app/package-lock.json

Lines changed: 40 additions & 78 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"@types/jasmine": "2.5.41",
4747
"@types/node": "7.0.4",
4848
"codecov": "2.2.0",
49-
"ionic": "3.19.1",
49+
"ionic": "3.20.0",
5050
"jasmine-core": "2.5.2",
5151
"jasmine-spec-reporter": "3.2.0",
5252
"karma": "1.4.1",
@@ -67,4 +67,4 @@
6767
"node": ">=8"
6868
},
6969
"license": "MIT"
70-
}
70+
}

app/src/app/app.module.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';
55
import { StatusBar } from '@ionic-native/status-bar';
66
import { SplashScreen } from '@ionic-native/splash-screen';
77
import { InsightApp } from './app.component';
8-
import { PagesModule, HomePage, BlocksPage, BroadcastTxPage, NodeStatusPage, VerifyMessagePage } from '../pages';
8+
import { PagesModule, HomePage, BlocksPage, NodeStatusPage, VerifyMessagePage } from '../pages';
99
import { BlocksService, StorageService } from '../services';
1010
import { ApiProvider } from '../providers/api/api';
1111
import { CurrencyProvider } from '../providers/currency/currency';
@@ -26,7 +26,6 @@ import { BlocksProvider } from '../providers/blocks/blocks';
2626
InsightApp,
2727
HomePage,
2828
BlocksPage,
29-
BroadcastTxPage,
3029
NodeStatusPage,
3130
VerifyMessagePage
3231
],
Lines changed: 14 additions & 0 deletions
Loading
Lines changed: 15 additions & 0 deletions
Loading
Lines changed: 16 additions & 0 deletions
Loading

app/src/components/denomination/denomination.html

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
1-
<ion-list radio-group [(ngModel)]="currency.currencySymbol" (ionChange)="currency.setCurrency(currency.currencySymbol)">
1+
<ion-list radio-group [(ngModel)]="currencyProvider.currencySymbol" (ionChange)="currencyProvider.setCurrency(currencyProvider.currencySymbol)">
2+
<ion-list-header *ngIf="switcherOn">
3+
Blockchain
4+
</ion-list-header>
5+
6+
<ion-row *ngIf="switcherOn">
7+
<ion-col *ngFor="let explorer of currencyProvider.explorers">
8+
<button (click)="changeExplorer(explorer)" ion-item detail-none class="text-button" text-center>
9+
<img src="assets/img/currency_logos/{{ explorer.ticker.toLowerCase() }}.svg" class="logo"/></button>
10+
</ion-col>
11+
</ion-row>
12+
213
<ion-list-header>
314
Units
415
</ion-list-header>

0 commit comments

Comments
 (0)