Merge branch 'SonicWizard-master'

app/.gitignore

@@ -12,6 +12,8 @@ log.txt
 .vscode/
 npm-debug.log*
 
+.sourcemaps/
+
 .idea/
 .sass-cache/
 .tmp/

app/package.json

@@ -67,4 +67,4 @@
     "node": ">=8"
   },
   "license": "MIT"
-}
+}

app/src/app/app.component.ts

@@ -3,11 +3,7 @@ import { Platform, MenuController, Nav } from 'ionic-angular';
 import { StatusBar } from '@ionic-native/status-bar';
 import { SplashScreen } from '@ionic-native/splash-screen';
 import {
-  HomePage,
-  BlocksPage,
-  BroadcastTxPage
-  // NodeStatusPage,
-  // VerifyMessagePage
+  HomePage
 } from '../pages';
 
 @Component({
@@ -41,8 +37,8 @@ export class InsightApp {
     // set our app's pages
     this.pages = [
       { title: 'Home', component: HomePage },
-      { title: 'Blocks', component: BlocksPage },
-      { title: 'Broadcast Transaction', component: BroadcastTxPage }
+      { title: 'Blocks', component: 'blocks' },
+      { title: 'Broadcast Transaction', component: 'BroadcastTxPage' }
       // { title: 'Verify Signed Message', component: VerifyMessagePage },
       // { title: 'Node Status', component: NodeStatusPage }
     ];

app/src/app/app.module.ts

@@ -19,9 +19,7 @@ import { BlocksProvider } from '../providers/blocks/blocks';
     BrowserModule,
     HttpModule,
     PagesModule,
-    IonicModule.forRoot(InsightApp, {
-      locationStrategy: 'path'
-    })
+    IonicModule.forRoot(InsightApp)
   ],
   bootstrap: [IonicApp],
   entryComponents: [

app/src/components/latest-blocks/latest-blocks.ts

@@ -1,7 +1,6 @@
 import { Component, NgZone, Input } from '@angular/core';
 import { BlocksProvider } from '../../providers/blocks/blocks';
 import { NavController } from 'ionic-angular';
-import { BlocksPage } from '../../pages';
 
 /**
  * Generated class for the LatestBlocksComponent component.
@@ -63,7 +62,7 @@ export class LatestBlocksComponent {
   }
 
   public goToBlocks(): void {
-    this.navCtrl.push(BlocksPage);
+    this.navCtrl.push('blocks');
   }
 
   private ngOnDestroy(): void {

app/src/pages/address/address.html

@@ -7,7 +7,7 @@
     <ion-spinner name="crescent"></ion-spinner>
   </div>
 
-  <div *ngIf="!loading">
+  <div *ngIf="!loading" class="page-content">
     <h1>Address</h1>
     <p class="ellipsis"><b>Address</b> {{ address.addrStr }}</p>
     <p>{{ currency.getConvertedNumber(address.balance) | number:'1.0-8' }} {{ currency.currencySymbol }}</p>

app/src/pages/blocks/blocks.ts

@@ -10,7 +10,7 @@ import { BlocksProvider } from '../../providers/blocks/blocks';
  */
 @IonicPage({
   name: 'blocks',
-  segment: 'blocks/'
+  segment: 'blocks'
 })
 @Component({
   selector: 'page-blocks',