Upgrade to NativeScript 6

.gitignore

@@ -2,6 +2,7 @@
 hooks/
 node_modules/
 platforms/
+.migration_backup/
 
 # NativeScript Template
 *.js.map

nsconfig.json

@@ -1,4 +1,4 @@
 {
   "appResourcesPath": "App_Resources",
   "appPath": "src"
-}
+}

package.json

@@ -5,7 +5,7 @@
   "nativescript": {
     "id": "org.odinblockchain.messenger",
     "tns-android": {
-      "version": "5.1.0"
+      "version": "6.0.0"
     }
   },
   "readme": "NativeScript Application",
@@ -49,47 +49,47 @@
     "android.run.reg": "tns run android --bundle --env.environment=reg"
   },
   "dependencies": {
-    "@angular/animations": "~7.0.0",
-    "@angular/common": "~7.0.0",
-    "@angular/compiler": "~7.0.0",
-    "@angular/core": "~7.0.0",
-    "@angular/forms": "~7.0.0",
-    "@angular/http": "~7.0.0",
-    "@angular/platform-browser": "~7.0.0",
-    "@angular/platform-browser-dynamic": "~7.0.0",
-    "@angular/router": "~7.0.0",
+    "@angular/animations": "8.0.0",
+    "@angular/common": "8.0.0",
+    "@angular/compiler": "8.0.0",
+    "@angular/core": "8.0.0",
+    "@angular/forms": "8.0.0",
+    "@angular/http": "8.0.0-beta.10",
+    "@angular/platform-browser": "8.0.0",
+    "@angular/platform-browser-dynamic": "8.0.0",
+    "@angular/router": "8.0.0",
+    "@nstudio/nativescript-floatingactionbutton": "^1.0.0",
+    "@nstudio/nativescript-snackbar": "^1.0.0",
     "buffer": "^5.2.1",
     "hashids": "^1.2.2",
     "moment": "^2.24.0",
-    "nativescript-angular": "~7.0.0",
+    "nativescript-angular": "8.0.2",
     "nativescript-appversion": "^1.4.1",
     "nativescript-clipboard": "^1.1.7",
     "nativescript-electrumx-client": "0.1.20",
-    "nativescript-floatingactionbutton": "^5.0.0",
     "nativescript-libsignal-protocol": "^0.2.0",
     "nativescript-orientation": "^2.2.1",
     "nativescript-platform-css": "^1.6.6",
-    "nativescript-plugin-firebase": "^8.1.1",
+    "nativescript-plugin-firebase": "9.0.2",
     "nativescript-randombytes": "^1.0.0",
-    "nativescript-snackbar": "^4.0.0",
     "nativescript-sqlite": "^2.3.3",
     "nativescript-theme-core": "~1.0.4",
-    "nativescript-ui-listview": "^6.4.1",
-    "nativescript-ui-sidedrawer": "~5.0.0",
+    "nativescript-ui-listview": "7.0.0",
+    "nativescript-ui-sidedrawer": "7.0.0",
     "reflect-metadata": "~0.1.10",
     "rxjs": "~6.3.0",
     "sha.js": "^2.4.11",
-    "tns-core-modules": "^5.1.2",
-    "zone.js": "~0.8.18"
+    "tns-core-modules": "6.0.1",
+    "zone.js": "0.9.1"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "^7.2.13",
+    "@angular/compiler-cli": "8.0.0",
     "@nativescript/schematics": "^0.5.2",
-    "@ngtools/webpack": "~7.1.0",
+    "@ngtools/webpack": "8.0.0",
     "codelyzer": "~4.5.0",
-    "nativescript-dev-sass": "^1.7.0",
-    "nativescript-dev-typescript": "~0.7.0",
-    "nativescript-dev-webpack": "^0.21.1",
-    "tslint": "~5.11.0"
+    "nativescript-dev-webpack": "^1.0.1",
+    "tslint": "~5.11.0",
+    "node-sass": "4.12.0",
+    "typescript": "3.4.5"
   }
 }

src/app/app.component.ts

@@ -9,7 +9,7 @@ import { isAndroid, isIOS, device, screen } from 'tns-core-modules/platform';
 import { DrawerTransitionBase, RadSideDrawer, SlideInOnTopTransition } from 'nativescript-ui-sidedrawer';
 import { filter } from 'rxjs/operators';
 import * as Clipboard from 'nativescript-clipboard';
-import { SnackBar } from "nativescript-snackbar";
+import { SnackBar } from "@nstudio/nativescript-snackbar";
 import { environment } from '~/environments/environment';
 
 import { PreferencesService } from '~/app/shared/preferences.service';
@@ -18,7 +18,7 @@ import { messaging } from "nativescript-plugin-firebase/messaging";
 require('nativescript-platform-css');
 const firebase = require("nativescript-plugin-firebase");
 
-registerElement('Fab', () => require('nativescript-floatingactionbutton').Fab);
+registerElement('Fab', () => require('@nstudio/nativescript-floatingactionbutton').Fab);
 
 const getCircularReplacer = () => {
   const seen = new WeakSet;

src/app/app.module.ts

@@ -10,7 +10,7 @@ import { PreferencesService } from './shared/preferences.service';
 import { UserModel } from './shared/user.model';
 import { WalletModel } from './shared/wallet.model';
 import { OSMClientService } from './shared/osm-client.service';
-import { SnackBar } from 'nativescript-snackbar';
+import { SnackBar } from '@nstudio/nativescript-snackbar';
 import { WalletClientService } from './shared/wallet-client.service';
 import { RouteReuseStrategy } from '@angular/router';
 import { CustomRouteReuse } from './custom-route-reuse';

src/app/contact/add/add.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { RouterExtensions } from 'nativescript-angular/router';
 
-import { SnackBar } from 'nativescript-snackbar';
+import { SnackBar } from '@nstudio/nativescript-snackbar';
 import { alert } from 'tns-core-modules/ui/dialogs';
 import { OSMClientService } from '~/app/shared/osm-client.service';
 import * as app from 'tns-core-modules/application';
@@ -22,7 +22,7 @@ export interface IAddContact {
 	moduleId: module.id,
 	selector: 'ContactAdd',
 	templateUrl: './add.component.html',
-	styleUrls: ['./add.component.css']
+	styleUrls: ['./add.component.scss']
 })
 export class AddComponent implements OnInit {
   public contact: IAddContact;

src/app/contact/edit/edit.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit, AfterViewInit } from '@angular/core';
 import { RouterExtensions } from "nativescript-angular/router";
 
-import { SnackBar } from 'nativescript-snackbar';
+import { SnackBar } from '@nstudio/nativescript-snackbar';
 import { alert, confirm } from 'tns-core-modules/ui/dialogs';
 import * as app from 'tns-core-modules/application';
 import { IdentityService } from '~/app/shared/services/identity.service';
@@ -24,7 +24,7 @@ export interface IAddContact {
 	moduleId: module.id,
 	selector: 'ContactEdit',
 	templateUrl: './edit.component.html',
-	styleUrls: ['./edit.component.css']
+	styleUrls: ['./edit.component.scss']
 })
 export class EditComponent implements OnInit, AfterViewInit {
 

src/app/contact/list/list.component.ts

@@ -7,7 +7,7 @@ import { GridLayout } from 'tns-core-modules/ui/layouts/grid-layout';
 import { RouterExtensions } from 'nativescript-angular/router';
 import { IdentityService } from '~/app/shared/services/identity.service';
 import { Contact, Message } from '~/app/shared/models/messenger';
-import { SnackBar } from 'nativescript-snackbar';
+import { SnackBar } from '@nstudio/nativescript-snackbar';
 import { device } from 'tns-core-modules/platform/platform';
 
 const firebase = require('nativescript-plugin-firebase');
@@ -17,7 +17,7 @@ declare var android: any;
 	moduleId: module.id,
 	selector: 'ContactList',
 	templateUrl: './list.component.html',
-	styleUrls: ['./list.component.css']
+	styleUrls: ['./list.component.scss']
 })
 export class ListComponent implements OnInit {
   public friends: Contact[];

src/app/create-account/conversation/conversation.component.ts

@@ -4,7 +4,7 @@ import { Component, Input } from "@angular/core";
   selector: "CreateConversationScreen, [CreateConversationScreen]",
   moduleId: module.id,
   templateUrl: "./conversation.component.html",
-  styleUrls: ['./conversation.component.css']
+  styleUrls: ['./conversation.component.scss']
 })
 export class CreateConversationScreenComponent {
   @Input() active: boolean;

src/app/create-account/generate/generate.component.ts

@@ -12,7 +12,7 @@ import { ClientService } from '~/app/shared/services/client.service';
 import { Account } from '~/app/shared/models/identity';
 import { alert } from 'tns-core-modules/ui/dialogs/dialogs';
 import * as Clipboard from 'nativescript-clipboard';
-import { SnackBar } from 'nativescript-snackbar';
+import { SnackBar } from '@nstudio/nativescript-snackbar';
 import { RouterExtensions } from 'nativescript-angular/router';
 import * as utils from 'tns-core-modules/utils/utils';
 
@@ -22,10 +22,10 @@ const firebase = require('nativescript-plugin-firebase');
   selector: 'GenerateScreen',
   moduleId: module.id,
   templateUrl: './generate.component.html',
-  styleUrls: ['./generate.component.css']
+  styleUrls: ['./generate.component.scss']
 })
 export class GenerateScreenComponent implements OnInit, OnDestroy {
-  @ViewChild('generateLayout') generateLayout: ElementRef;
+  @ViewChild('generateLayout', {static: true}) generateLayout: ElementRef;
 
   public accountGenerated: boolean;
   public entropyCreated: boolean;

src/app/create-account/index/index.component.ts

@@ -16,10 +16,10 @@ declare var android: any;
   selector: 'CreateAccountIndex',
   moduleId: module.id,
   templateUrl: './index.component.html',
-  styleUrls: ['./index.component.css']
+  styleUrls: ['./index.component.scss']
 })
 export class IndexComponent implements OnInit, AfterViewInit {
-  @ViewChild('slideContent') slideElement: ElementRef;
+  @ViewChild('slideContent', {static: true}) slideElement: ElementRef;
 
   public currentSlideIndex: number;
   public packageVersion: string;

src/app/create-account/shield/shield.component.ts

@@ -4,7 +4,7 @@ import { Component, Input } from "@angular/core";
   selector: "ShieldConversationScreen, [ShieldConversationScreen]",
   moduleId: module.id,
   templateUrl: "./shield.component.html",
-  styleUrls: ['./shield.component.css']
+  styleUrls: ['./shield.component.scss']
 })
 export class ShieldConversationScreenComponent {
   @Input() active: boolean;

src/app/create-account/wallet/wallet.component.ts

@@ -4,7 +4,7 @@ import { Component, Input } from "@angular/core";
   selector: "WalletConversationScreen, [WalletConversationScreen]",
   moduleId: module.id,
   templateUrl: "./wallet.component.html",
-  styleUrls: ['./wallet.component.css']
+  styleUrls: ['./wallet.component.scss']
 })
 export class WalletConversationScreenComponent {
   @Input() active: boolean;

src/app/help/help.component.ts

@@ -4,15 +4,15 @@ import * as app from 'tns-core-modules/application';
 import * as utilityModule from 'tns-core-modules/utils/utils';
 import { PreferencesService } from '../shared/preferences.service';
 import { environment } from '~/environments/environment.tns';
-import { SnackBar } from 'nativescript-snackbar';
+import { SnackBar } from '@nstudio/nativescript-snackbar';
 
 const firebase = require('nativescript-plugin-firebase');
 
 @Component({
 	moduleId: module.id,
 	selector: 'help',
 	templateUrl: './help.component.html',
-	styleUrls: ['./help.component.css']
+	styleUrls: ['./help.component.scss']
 })
 export class HelpComponent implements OnInit {
   private versionTouches: number;

src/app/home/home.component.ts

@@ -9,7 +9,7 @@ import { Account } from '~/app/shared/models/identity';
     selector: 'Splashscreen',
     moduleId: module.id,
     templateUrl: './home.component.html',
-    styleUrls: ['./home.component.css']
+    styleUrls: ['./home.component.scss']
 })
 export class HomeComponent implements OnInit, OnDestroy {
   public currentActivity: string;

src/app/messenger/index/index.component.scss

@@ -1,11 +1,7 @@
 @import "~/app-variables.scss";
 
 .backbtn {
-  // background-image: url('https://via.placeholder.com/50');
-  // background-size: contain;
-  // background-repeat: no-repeat;
   z-index: 99;
-
   background: rgb(255,89,162);
   background: linear-gradient(to right, rgb(255,89,162) 0%,rgb(255,233,123) 100%);
   filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff59a2', endColorstr='#ffe97b',GradientType=1 );

src/app/messenger/index/index.component.ts

@@ -7,7 +7,7 @@ import { GridLayout } from 'tns-core-modules/ui/layouts/grid-layout';
 import { RouterExtensions } from 'nativescript-angular/router';
 import { IdentityService } from '~/app/shared/services/identity.service';
 import { Contact } from '~/app/shared/models/messenger';
-import { SnackBar } from 'nativescript-snackbar';
+import { SnackBar } from '@nstudio/nativescript-snackbar';
 import { device } from 'tns-core-modules/platform/platform';
 
 const firebase = require('nativescript-plugin-firebase');
@@ -17,7 +17,7 @@ declare var android: any;
 	moduleId: module.id,
 	selector: 'MessengerIndex',
 	templateUrl: './index.component.html',
-	styleUrls: ['./index.component.css']
+	styleUrls: ['./index.component.scss']
 })
 export class IndexComponent implements OnInit {
   public friends: Contact[];

src/app/messenger/message/message.component.ts

@@ -11,7 +11,7 @@ import { Contact, Message } from '~/app/shared/models/messenger';
 import { IdentityService } from '~/app/shared/services/identity.service';
 import { Account } from '~/app/shared/models/identity';
 import { RadListView } from 'nativescript-ui-listview';
-import { SnackBar } from 'nativescript-snackbar';
+import { SnackBar } from '@nstudio/nativescript-snackbar';
 import { Page } from 'tns-core-modules/ui/page/page';
 import { Subscription } from 'rxjs';
 
@@ -21,11 +21,11 @@ const firebase = require('nativescript-plugin-firebase');
 	moduleId: module.id,
 	selector: 'message',
 	templateUrl: './message.component.html',
-	styleUrls: ['./message.component.css']
+	styleUrls: ['./message.component.scss']
 })
 export class MessageComponent implements OnInit, AfterViewInit {
-  @ViewChild('listView') lv: ElementRef;
-  @ViewChild('textfield') tf: ElementRef;
+  @ViewChild('listView', {static: false}) lv: ElementRef;
+  @ViewChild('textfield', {static: false}) tf: ElementRef;
 
   list: RadListView;
   textfield: TextField;

src/app/settings/developer/index.component.ts

@@ -13,10 +13,10 @@ const firebase = require('nativescript-plugin-firebase');
   selector: 'Developer',
   moduleId: module.id,
   templateUrl: './index.component.html',
-  styleUrls: ['./index.component.css']
+  styleUrls: ['./index.component.scss']
 })
 export class DeveloperComponent implements OnInit, AfterViewInit, OnDestroy {
-  @ViewChild('listView') lv: ElementRef;
+  @ViewChild('listView', {static: true}) lv: ElementRef;
   list: RadListView;
 
   public subItems: Log[] = [];

src/app/settings/identity/identity.component.ts

@@ -10,7 +10,7 @@ declare var android: any;
   selector: 'IdentityComponent',
   moduleId: module.id,
   templateUrl: './identity.component.html',
-  styleUrls: ['./identity.component.css']
+  styleUrls: ['./identity.component.scss']
 })
 export class IdentityComponent implements OnInit {
   public backupActive: boolean;

src/app/settings/index/index.component.ts

@@ -11,7 +11,7 @@ import { IdentityService } from '~/app/shared/services/identity.service';
 import { StorageService } from '~/app/shared';
 import { RouterExtensions } from 'nativescript-angular/router';
 import * as Clipboard from 'nativescript-clipboard';
-import { SnackBar } from 'nativescript-snackbar';
+import { SnackBar } from '@nstudio/nativescript-snackbar';
 
 const firebase = require('nativescript-plugin-firebase');
 declare var android: any;
@@ -21,7 +21,7 @@ declare var java: any;
   selector: 'SettingsIndex',
   moduleId: module.id,
   templateUrl: './index.component.html',
-  styleUrls: ['./index.component.css']
+  styleUrls: ['./index.component.scss']
 })
 export class IndexComponent implements OnInit {
   public preferences: any;

src/app/settings/metrics/metrics.component.ts

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { RouterExtensions } from 'nativescript-angular/router';
 import { PreferencesService } from '~/app/shared/preferences.service';
 import { messaging } from 'nativescript-plugin-firebase/messaging';
-import { SnackBar } from 'nativescript-snackbar';
+import { SnackBar } from '@nstudio/nativescript-snackbar';
 import { IdentityService } from '~/app/shared/services/identity.service';
 import { connectionType, getConnectionType } from 'tns-core-modules/connectivity';
 
@@ -12,7 +12,7 @@ const firebase = require('nativescript-plugin-firebase');
   selector: 'Metrics',
   moduleId: module.id,
   templateUrl: './metrics.component.html',
-  styleUrls: ['./metrics.component.css']
+  styleUrls: ['./metrics.component.scss']
 })
 export class MetricsComponent {
   public metricPreferences: any;

src/app/settings/notifications/notifications.component.ts

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { RouterExtensions } from 'nativescript-angular/router';
 import { PreferencesService } from '~/app/shared/preferences.service';
 import { messaging } from 'nativescript-plugin-firebase/messaging';
-import { SnackBar } from 'nativescript-snackbar';
+import { SnackBar } from '@nstudio/nativescript-snackbar';
 import { IdentityService } from '~/app/shared/services/identity.service';
 import { connectionType, getConnectionType } from 'tns-core-modules/connectivity';
 
@@ -12,7 +12,7 @@ const firebase = require('nativescript-plugin-firebase');
   selector: 'Notifications',
   moduleId: module.id,
   templateUrl: './notifications.component.html',
-  styleUrls: ['./notifications.component.css']
+  styleUrls: ['./notifications.component.scss']
 })
 export class NotificationsComponent {
   public chatPreferences: any;