Prepare for merge

README.md

@@ -203,7 +203,7 @@ Since version 1.5, Copay uses the root `m/48'` for hardware multisignature walle
 
 ## Bitcore Wallet Service
 
-Copay depends on [Bitcore Wallet Service](https://github.com/particl/bitcore-wallet-service) (BWS) for blockchain information, networking and Copayer synchronization. A BWS instance can be setup and operational within minutes or you can use a public instance like `http://localhost:3232`. Switching between BWS instances is very simple and can be done with a click from within Copay. BWS also allows Copay to interoperate with other wallets like [Bitcore Wallet CLI](https://github.com/particl/bitcore-wallet).
+Copay depends on [Bitcore Wallet Service](https://github.com/particl/bitcore-wallet-service) (BWS) for blockchain information, networking and Copayer synchronization. A BWS instance can be setup and operational within minutes or you can use a public instance like `https://bws.particl.io`. Switching between BWS instances is very simple and can be done with a click from within Copay. BWS also allows Copay to interoperate with other wallets like [Bitcore Wallet CLI](https://github.com/particl/bitcore-wallet).
 
 Please note that Copay v5.3.0 and above use CSP to restrict network access. To use a custom BWS see [CSP announcement](https://github.com/bitpay/copay/blob/master/CSP.md).
 

app-template/config-template.xml

@@ -20,7 +20,7 @@
     <access origin="https://api.coinbase.com" />
     <access origin="https://coinbase.com" />
     <access origin="https://api.coinmarketcap.com" />
-    <access origin="http://localhost:3232" />
+    <access origin="https://*.particl.io" />
     <allow-navigation href="gap://ready" />
     <preference name="AndroidPersistentFileLocation" value="Internal" />
     <preference name="iosPersistentFileLocation" value="Library" />

app-template/index-template.html

@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
   <meta name="format-detection" content="telephone=no">
   <meta name="msapplication-tap-highlight" content="no">
-  <meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-eval' gap: https://bws.bitpay.com https://bitpay.com https://test.bitpay.com https://auth.shapeshift.io https://shapeshift.io https://api.coinbase.com https://coinbase.com https://api.coinmarketcap.com http://localhost:3232; img-src 'self' data:; style-src 'self' 'unsafe-inline'; font-src 'self' data:">
+  <meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-eval' gap: https://bws.bitpay.com https://bitpay.com https://test.bitpay.com https://auth.shapeshift.io https://shapeshift.io https://api.coinbase.com https://coinbase.com https://api.coinmarketcap.com https://*.particl.io; img-src 'self' data:; style-src 'self' 'unsafe-inline'; font-src 'self' data:">
 
   <link rel="shortcut icon" href="assets/img/app/favicon.ico">
   <link rel="manifest" href="manifest.json">

src/components/components.ts

@@ -5,7 +5,6 @@ import { ClipboardCardPage } from './clipboard-card/clipboard-card';
 import { EditableItemComponent } from './editable-item/editable-item';
 import { EXPANDABLE_HEADER_COMPONENTS } from './expandable-header/expandable-header';
 import { LabelTip } from './label-tip/label-tip';
-import { ProgressBarComponent } from './progress-bar/progress-bar';
 import { SearchBarComponent } from './search-bar/search-bar';
 
 export const COMPONENTS = [
@@ -16,6 +15,5 @@ export const COMPONENTS = [
   EditableItemComponent,
   LabelTip,
   ClipboardCardPage,
-  SearchBarComponent,
-  ProgressBarComponent
+  SearchBarComponent
 ];

src/pages/add/create-wallet/create-wallet.spec.ts

@@ -39,7 +39,7 @@ describe('CreateWalletPage', () => {
         n: 3,
         myName: 'test',
         networkName: 'livenet',
-        bwsurl: 'http://localhost:3232/bws/api',
+        bwsurl: 'https://bws.particl.io/bws/api',
         singleAddress: false,
         coin: 'btc',
         mnemonic: 'mom mom mom mom mom mom mom mom mom mom mom mom',
@@ -53,7 +53,7 @@ describe('CreateWalletPage', () => {
       instance.createForm.value.totalCopayers = 3;
       instance.createForm.value.testnetEnabled = false;
       instance.createForm.value.derivationPath = "m/44'/0'/0'";
-      instance.createForm.value.bwsURL = 'http://localhost:3232/bws/api';
+      instance.createForm.value.bwsURL = 'https://bws.particl.io/bws/api';
       instance.createForm.value.singleAddress = false;
       instance.createForm.value.coin = 'btc';
       instance.createForm.value.selectedSeed = 'set';

src/pages/add/import-wallet/import-wallet.spec.ts

@@ -91,7 +91,7 @@ describe('ImportWalletPage', () => {
       testBed.createComponent(ImportWalletPage);
       let info = {
         derivationPath: "m/44'/0'/0'",
-        bwsURL: 'http://localhost:3232/bws/api',
+        bwsURL: 'https://bws.particl.io/bws/api',
         coin: 'btc',
         words: 'mom mom mom mom mom mom mom mom mom mom mom mom',
         backupText: 'test'
@@ -116,7 +116,7 @@ describe('ImportWalletPage', () => {
 
       let info = {
         derivationPath: "m/44'/0'/0'",
-        bwsURL: 'http://localhost:3232/bws/api',
+        bwsURL: 'https://bws.particl.io/bws/api',
         coin: 'btc',
         words: 'mom1 mom2 mom3 mom4 mom5 mom6 mom7 mom8 mom9 mom10 mom11 mom12',
         backupText: 'test'

src/pages/cold-staking/cold-staking.html

@@ -56,4 +56,4 @@
       {{'Disable Cold Staking' | translate}}
     </button>
   </div>
-</ion-footer>
+</ion-footer>

src/pages/cold-staking/enable/enable.html

@@ -26,4 +26,5 @@
       {{'Enable Cold Staking' | translate}}
     </button>
 
-  </ion-content>
+  </ion-content>
+

src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-service-url/wallet-service-url.ts

@@ -80,15 +80,15 @@ export class WalletServiceUrlPage {
     switch (this.walletServiceForm.value.bwsurl) {
       case 'prod':
       case 'production':
-        bws = 'http://localhost:3232/bws/api';
+        bws = 'https://bws.particl.io/bws/api';
         break;
       case 'sta':
       case 'staging':
         bws = 'https://bws-staging.b-pay.net/bws/api';
         break;
       case 'loc':
       case 'local':
-        bws = 'http://localhost:3232/bws/api';
+        bws = 'https://bws.particl.io/bws/api';
         break;
     }
     if (bws) {

src/pages/wallet-details/wallet-details.ts

@@ -235,8 +235,7 @@ export class WalletDetailsPage extends WalletTabsChild {
       opts = opts || {};
       this.updateStatus(opts.force);
       this.updateTxHistory(opts.retry);
-      this.isStaking =
-        this.walletProvider.getStakingConfig(this.wallet) !== null;
+      this.isStaking = this.walletProvider.isStaking(this.wallet);
     },
     2000,
     {

src/pages/wallet-tabs/wallet-tabs.ts

@@ -113,7 +113,6 @@ export class WalletTabsPage {
     this.events.unsubscribe('bwsEvent');
     this.events.unsubscribe('Wallet/setAddress');
     this.events.unsubscribe('Wallet/disableHardwareKeyboard');
-    this.events.unsubscribe('status:updated');
   }
 
   private updateDesktopOnFocus() {

src/providers/bwc/bwc.ts

@@ -41,7 +41,7 @@ export class BwcProvider {
 
     // note opts use `bwsurl` all lowercase;
     let bwc = new BWC({
-      baseUrl: opts.bwsurl || 'http://localhost:3232/bws/api',
+      baseUrl: opts.bwsurl || 'https://bws.particl.io/bws/api',
       verbose: opts.verbose,
       timeout: 100000,
       transports: ['polling']

src/providers/config/config.ts

@@ -165,7 +165,7 @@ export class ConfigProvider {
 
       // Bitcore wallet service URL
       bws: {
-        url: 'http://localhost:3232/bws/api'
+        url: 'https://bws.particl.io/bws/api'
       },
 
       download: {