From 7e850066f24ddcc040ecda39a4ca6447cae2606f Mon Sep 17 00:00:00 2001
From: Dorian MARCO <dorian.marco@e-is.pro>
Date: Wed, 19 Feb 2025 08:47:56 +0100
Subject: [PATCH] fix(auth.modal) check loginMethod to use correct method
---
src/app/account/auth/auth.modal.ts | 62 +++++++++++++++---------------
1 file changed, 32 insertions(+), 30 deletions(-)
diff --git a/src/app/account/auth/auth.modal.ts b/src/app/account/auth/auth.modal.ts
index 3117b1b..7b7eafd 100644
--- a/src/app/account/auth/auth.modal.ts
+++ b/src/app/account/auth/auth.modal.ts
@@ -81,41 +81,43 @@ export class AuthModal implements OnInit, AuthModalOptions {
// Disable the form
this.form.disable();
- if (data.v2.mnemonic.includes('//')) {
- const account = await this.accountService.addAccount(data);
- return this.modalCtrl.dismiss(account, <AuthModalRole>'VALIDATE');
- }
+ if (this.loginMethod === 'v2') {
+ if (data.v2.mnemonic.includes('//')) {
+ const account = await this.accountService.addAccount(data);
+ return this.modalCtrl.dismiss(account, <AuthModalRole>'VALIDATE');
+ }
- // Scan for derivations
- const derivations = await this.accountService.scanDerivations(data.v2.mnemonic);
+ // Scan for derivations
+ const derivations = await this.accountService.scanDerivations(data.v2.mnemonic);
- // Only one derivation: use it
- let selectedDerivationAccount: DerivationAccount;
- if (derivations?.length === 1) {
- selectedDerivationAccount = derivations[0];
- }
+ // Only one derivation: use it
+ let selectedDerivationAccount: DerivationAccount;
+ if (derivations?.length === 1) {
+ selectedDerivationAccount = derivations[0];
+ }
- // Many derivation: let the user choose
- else if (derivations?.length > 1) {
- const modal = await this.modalCtrl.create({
- component: DerivationSelectionComponent,
- componentProps: {
- mnemonic: data.v2.mnemonic,
- derivations,
- },
- });
-
- await modal.present();
- const res = await modal.onDidDismiss();
- if (AccountUtils.isDerivationAccount(res?.data)) {
- selectedDerivationAccount = res.data;
+ // Many derivation: let the user choose
+ else if (derivations?.length > 1) {
+ const modal = await this.modalCtrl.create({
+ component: DerivationSelectionComponent,
+ componentProps: {
+ mnemonic: data.v2.mnemonic,
+ derivations,
+ },
+ });
+
+ await modal.present();
+ const res = await modal.onDidDismiss();
+ if (AccountUtils.isDerivationAccount(res?.data)) {
+ selectedDerivationAccount = res.data;
+ }
}
- }
- // Update mnemonic, to use the derivation
- if (selectedDerivationAccount) {
- console.info(`[auth] Will use derivation: ${selectedDerivationAccount?.derivation}`);
- data.v2.mnemonic += selectedDerivationAccount?.derivation;
+ // Update mnemonic, to use the derivation
+ if (selectedDerivationAccount) {
+ console.info(`[auth] Will use derivation: ${selectedDerivationAccount?.derivation}`);
+ data.v2.mnemonic += selectedDerivationAccount?.derivation;
+ }
}
const account = await this.accountService.addAccount(data);
--
GitLab