Merge pull request #10256 from Gamboster/ref/createNewKeyLogic

Ref: create new key logic

Author: cmgustavo

src/pages/add/add.html

@@ -22,7 +22,7 @@
         <div class="item-title" translate>Join Shared Wallet</div>
         <span class="item-subtitle" translate>Requires invitation to join</span>
       </button>
-      <button class="list-button" ion-item (click)="goToImportWallet()" *ngIf="!keyId">
+      <button class="list-button" ion-item (click)="goToImportWallet()">
         <ion-icon item-start>
           <img src="assets/img/add-wallet/import.svg" />
         </ion-icon>

src/pages/add/add.ts

@@ -15,7 +15,6 @@ import { Logger } from '../../providers';
   templateUrl: 'add.html'
 })
 export class AddPage {
-  public allowMultiplePrimaryWallets: boolean;
   public keyId: string;
   public isOnboardingFlow: boolean;
   public isZeroState: boolean;

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

@@ -243,7 +243,6 @@ export class ImportWalletPage {
     if (wallets && wallets[0]) {
       this.profileProvider.setBackupGroupFlag(wallets[0].credentials.keyId);
     }
-    this.allowMultiplePrimaryWallets();
 
     // using setRoot(TabsPage) as workaround when coming from scanner
     this.app
@@ -254,17 +253,6 @@ export class ImportWalletPage {
       });
   }
 
-  private allowMultiplePrimaryWallets(): void {
-    let config = this.configProvider.get();
-    const allowMultiplePrimaryWallets = config.allowMultiplePrimaryWallets;
-    if (allowMultiplePrimaryWallets) return;
-
-    let opts = {
-      allowMultiplePrimaryWallets: true
-    };
-    this.configProvider.set(opts);
-  }
-
   private importExtendedPrivateKey(xPrivKey, opts) {
     this.onGoingProcessProvider.set('importingWallet');
     this.profileProvider

src/pages/settings/advanced/advanced.html

@@ -22,19 +22,6 @@
     </label-tip>
   </ion-list>
   <ion-list class="settings-list bp-list">
-    <ion-item class="with-label no-border" *ngIf="nrKeys==1">
-      <ion-label>{{
-        'Support Wallets with Different Keys' | translate
-      }}</ion-label>
-      <ion-toggle [(ngModel)]="allowMultiplePrimaryWallets" (ionChange)="allowMultiplePrimaryWalletsChange()"></ion-toggle>
-    </ion-item>
-    <label-tip class="info" type="info" header="no-header" *ngIf="nrKeys==1">
-      <div label-tip-body>
-        <div translate>
-          If enabled, the new wallets may have different keys and will require a new backup.
-        </div>
-      </div>
-    </label-tip>
     <button ion-item *ngIf="oldProfileAvailable && wallets && wallets[0]" class="with-label no-border" (click)="openWalletRecoveryPage()" translate>
       Recover old wallets
     </button>

src/pages/settings/advanced/advanced.ts

@@ -17,8 +17,6 @@ import { WalletRecoverPage } from './wallet-recover-page/wallet-recover-page';
 })
 export class AdvancedPage {
   public spendUnconfirmed: boolean;
-  public allowMultiplePrimaryWallets: boolean;
-  public nrKeys: number;
   public isCopay: boolean;
   public oldProfileAvailable: boolean;
   public wallets;
@@ -54,14 +52,6 @@ export class AdvancedPage {
     let config = this.configProvider.get();
 
     this.spendUnconfirmed = config.wallet.spendUnconfirmed;
-
-    const opts = {
-      showHidden: true
-    };
-    const wallets = this.profileProvider.getWallets(opts);
-    this.nrKeys = _.values(_.groupBy(wallets, 'keyId')).length;
-
-    this.allowMultiplePrimaryWallets = config.allowMultiplePrimaryWallets;
   }
 
   public spendUnconfirmedChange(): void {
@@ -73,13 +63,6 @@ export class AdvancedPage {
     this.configProvider.set(opts);
   }
 
-  public allowMultiplePrimaryWalletsChange(): void {
-    let opts = {
-      allowMultiplePrimaryWallets: this.allowMultiplePrimaryWallets
-    };
-    this.configProvider.set(opts);
-  }
-
   public openWalletRecoveryPage() {
     this.navCtrl.push(WalletRecoverPage);
   }

src/pages/settings/settings.html

@@ -53,8 +53,8 @@ <h4>Learn where you can spend your crypto today.</h4>
           {{walletsGroup.length}} Wallet<span *ngIf="walletsGroup.length > 1">s</span>
         </ion-note>
       </button>
-      <button ion-item class="create-button" *ngIf="walletsGroups && walletsGroups[0] && allowMultiplePrimaryWallets" (click)="goToAddView()" translate>
-        Create New Key
+      <button ion-item class="create-button" *ngIf="walletsGroups && walletsGroups[0]" (click)="goToAddView()" translate>
+        Create or Import a Key
       </button>
 
       <ion-item-divider>{{'Preferences' | translate}}</ion-item-divider>

src/pages/settings/settings.ts

@@ -41,7 +41,6 @@ import { WalletSettingsPage } from './wallet-settings/wallet-settings';
   templateUrl: 'settings.html'
 })
 export class SettingsPage {
-  public allowMultiplePrimaryWallets: boolean;
   public appName: string;
   public currentLanguageName: string;
   public languages;
@@ -101,9 +100,6 @@ export class SettingsPage {
       this.config && this.config.lock && this.config.lock.method
         ? this.config.lock.method.toLowerCase()
         : null;
-
-    this.allowMultiplePrimaryWallets =
-      this.config.allowMultiplePrimaryWallets || this.walletsGroups.length != 1;
   }
 
   ionViewDidEnter() {

src/providers/address/address.spec.ts

@@ -9,7 +9,7 @@ describe('AddressProvider', () => {
     addressProvider = testBed.get(AddressProvider);
   });
 
-  fdescribe('getCoinAndNetwork', () => {
+  describe('getCoinAndNetwork', () => {
     const testVectors: any[] = [
       // Bech32
       ['bc1q9225pawdj2dlwsk3dd8phudsap6vjp7fg3nwdl', 'btc', 'livenet'],

src/providers/config/config.ts

@@ -103,8 +103,6 @@ export interface Config {
     bch: string;
     eth: string;
   };
-
-  allowMultiplePrimaryWallets: boolean;
 }
 
 @Injectable()
@@ -231,9 +229,7 @@ export class ConfigProvider {
         btc: 'insight.bitcore.io/#/BTC/',
         bch: 'insight.bitcore.io/#/BCH/',
         eth: 'insight.bitcore.io/#/ETH/'
-      },
-
-      allowMultiplePrimaryWallets: false
+      }
     };
   }
 

src/providers/incoming-data/incoming-data.spec.ts

@@ -4,7 +4,6 @@ import { AppProvider, PopupProvider } from '..';
 import { TestUtils } from '../../test';
 import { ActionSheetProvider } from '../action-sheet/action-sheet';
 import { BwcProvider } from '../bwc/bwc';
-import { ConfigProvider } from '../config/config';
 import { Logger } from '../logger/logger';
 import { ProfileProvider } from '../profile/profile';
 import { IncomingDataProvider } from './incoming-data';
@@ -17,7 +16,6 @@ describe('Provider: Incoming Data Provider', () => {
   let loggerSpy;
   let eventsSpy;
   let actionSheetSpy;
-  let configProvider;
   let profileProvider;
 
   class AppProviderMock {
@@ -63,12 +61,6 @@ describe('Provider: Incoming Data Provider', () => {
         }
       }
     ]);
-
-    configProvider = testBed.get(ConfigProvider);
-
-    spyOn(configProvider, 'get').and.returnValue({
-      allowMultiplePrimaryWallets: true
-    });
   });
 
   describe('Function: SCANNER Redir', () => {
@@ -113,9 +105,9 @@ describe('Provider: Incoming Data Provider', () => {
     it('Should handle Join Wallet', () => {
       let data =
         'copay:RTpopkn5KBnkxuT7x4ummDKx3Lu1LvbntddBC4ssDgaqP7DkojT8ccxaFQEXY4f3huFyMewhHZLbtc';
-      let stateParams = { url: data, isJoin: true };
+      let stateParams = { keyId: 'keyId1', url: data };
       let nextView = {
-        name: 'AddWalletPage',
+        name: 'JoinWalletPage',
         params: stateParams
       };
 
@@ -130,9 +122,9 @@ describe('Provider: Incoming Data Provider', () => {
     it('Should handle Old Join Wallet', () => {
       let data =
         'RTpopkn5KBnkxuT7x4ummDKx3Lu1LvbntddBC4ssDgaqP7DkojT8ccxaFQEXY4f3huFyMewhHZLbtc';
-      let stateParams = { url: data, isJoin: true };
+      let stateParams = { keyId: 'keyId1', url: data };
       let nextView = {
-        name: 'AddWalletPage',
+        name: 'JoinWalletPage',
         params: stateParams
       };