Merge pull request #18 from Mikeli2016/master

add check conditions when create wallet and delete useless component
nebulaai · Mar 4, 2020 · de467d6 · de467d6
2 parents f15400f + 86741a4
commit de467d6
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 278 deletions.
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -2,8 +2,6 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes} from '@angular/router';
 import { ManageComponent } from './manage/manage.component';
 import { AddWalletComponent } from './manage/add-wallet/add-wallet.component';
-// import { MnemonicComponent } from './manage/mnemonic/mnemonic.component';
-// import { VerifyMnemonicComponent } from './manage/verify-mnemonic/verify-mnemonic.component';
 import { ImportWalletComponent } from './manage/import-wallet/import-wallet.component';
 import { NotfoundComponent } from './notfound/notfound.component';
 import { DetailsComponent } from './manage/details/details.component';
@@ -24,8 +22,6 @@ const routes: Routes = [
     ]
   },
   { path: 'add-wallet', component: AddWalletComponent, outlet: 'popup'},
-  // { path: 'mnemonic', component: MnemonicComponent, outlet: 'popup'},
-  // { path: 'verify-mnemonic', component: VerifyMnemonicComponent, outlet: 'popup'},
   { path: 'import-wallet', component: ImportWalletComponent, outlet: 'popup'},  
   { path: 'export-key', component: ExportKeyComponent, outlet: 'popup'},  
   { path: 'export-keystore', component: ExportKeystoreComponent, outlet: 'popup'}, 

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -8,8 +8,6 @@ import { HeadComponent } from './head/head.component';
 import { AppRoutingModule } from './/app-routing.module';
 import { FormsModule } from '@angular/forms';
 import { AddWalletComponent } from './manage/add-wallet/add-wallet.component';
-// import { MnemonicComponent } from './manage/mnemonic/mnemonic.component';
-// import { VerifyMnemonicComponent } from './manage/verify-mnemonic/verify-mnemonic.component';
 import { ImportWalletComponent } from './manage/import-wallet/import-wallet.component';
 import { NotfoundComponent } from './notfound/notfound.component';
 import { DetailsComponent } from './manage/details/details.component';
@@ -35,8 +33,6 @@ import { TranslationService } from './translation.service';
     ManageComponent,
     HeadComponent,
     AddWalletComponent,
-    // MnemonicComponent,
-    // VerifyMnemonicComponent,
     ImportWalletComponent,
     NotfoundComponent,
     DetailsComponent,

diff --git a/src/app/manage/add-wallet/add-wallet.component.ts b/src/app/manage/add-wallet/add-wallet.component.ts
@@ -75,12 +75,18 @@ export class AddWalletComponent implements OnInit {
         this.newAccount['address'] = pkey;
         this.newAccount['privateKey'] = privateKey;
         this.newAccount['keystore'] = keystore;
-        const newAcc = new Account(this.newAccount);
-        this.walletService.addAccount(newAcc);
-        this.walletService.clearAccountDetail();
-        this.downloadKeystore(keystore);
-
-        this.router.navigateByUrl('/dashboard/main');
+
+        if(this.newAccount['mnemonic']!=null && this.newAccount['mnemonic']!="" && this.newAccount['address'].substring(0,4)!="0x95"){
+          const newAcc = new Account(this.newAccount);
+          this.walletService.addAccount(newAcc);
+          this.walletService.clearAccountDetail();
+          this.downloadKeystore(keystore);
+          this.router.navigateByUrl('/dashboard/main');
+        }
+        else{
+          alert("We are sorry. Create wallet failed, please try again.")
+        }
+
       } catch (e) {
         console.error(e);
       }

diff --git a/src/app/manage/mnemonic/mnemonic.component.html b/src/app/manage/mnemonic/mnemonic.component.html
diff --git a/src/app/manage/mnemonic/mnemonic.component.spec.ts b/src/app/manage/mnemonic/mnemonic.component.spec.ts
diff --git a/src/app/manage/mnemonic/mnemonic.component.ts b/src/app/manage/mnemonic/mnemonic.component.ts
diff --git a/src/app/manage/verify-mnemonic/verify-mnemonic.component.html b/src/app/manage/verify-mnemonic/verify-mnemonic.component.html
diff --git a/src/app/manage/verify-mnemonic/verify-mnemonic.component.spec.ts b/src/app/manage/verify-mnemonic/verify-mnemonic.component.spec.ts
diff --git a/src/app/manage/verify-mnemonic/verify-mnemonic.component.ts b/src/app/manage/verify-mnemonic/verify-mnemonic.component.ts
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -2,12 +2,11 @@
 // The build system defaults to the dev environment which uses `environment.ts`, but if you do
 // `ng build --env=prod` then `environment.prod.ts` will be used instead.
 // The list of which env maps to which file can be found in `.angular-cli.json`.
-let isPro = true;
+let isPro = false;
 export const environment = {
   production: isPro, 
 
   network: (isPro?"https://api.nbai.io":"http://192.168.88.217:8545"),
   apiUrl: (isPro?"https://api1.nbai.io":'http://192.168.88.217:8093'),
-  scanUrl: (isPro?"https://scan.nbai.io/#/":'http://192.168.88.216:8080/NBAITestExploer/#/')
-
+  scanUrl: (isPro?"https://scan.nbai.io/#/":'http://192.168.88.216:8080/NBAITestExploer/#/')  
 };