fix(EWM-282): add account bugs (#521)

* fix(EWM-282): get seed by any public key * fix(EWM-282): use master key to get password --------- Co-authored-by: Egor Komarov <egor.komarov@bf.rocks>
broxus · Sep 20, 2024 · 8fb79f9 · 8fb79f9
1 parent 07bba78
commit 8fb79f9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/lib/feature/wallet/add_account/add_account_confirm/add_account_confirm_model.dart b/lib/feature/wallet/add_account/add_account_confirm/add_account_confirm_model.dart
@@ -18,8 +18,12 @@ class AddAccountConfirmModel extends ElementaryModel {
  final NekotonRepository _nekotonRepository;
 
  Future<List<BiometricType>> getAvailableBiometry(PublicKey publicKey) async {
+ final seed = _nekotonRepository.seedList.findSeedByAnyPublicKey(publicKey);
+ if (seed == null) return [];
+
  final isBiometryEnabled = _biometryService.enabled;
- final hasKeyPassword = await _biometryService.hasKeyPassword(publicKey);
+ final hasKeyPassword =
+ await _biometryService.hasKeyPassword(seed.publicKey);
 
  if (isBiometryEnabled && hasKeyPassword) {
  return _biometryService.getAvailableBiometry();
@@ -29,9 +33,12 @@ class AddAccountConfirmModel extends ElementaryModel {
  }
 
  Future<String?> requestBiometry(PublicKey publicKey) async {
+ final seed = _nekotonRepository.seedList.findSeedByAnyPublicKey(publicKey);
+ if (seed == null) return null;
+
  try {
  final password = await _biometryService.getKeyPassword(
- publicKey: publicKey,
+ publicKey: seed.publicKey,
  localizedReason: LocaleKeys.biometryAuthReason.tr(),
  );
 

diff --git a/lib/feature/wallet/add_account/add_account_type/add_account_type_model.dart b/lib/feature/wallet/add_account/add_account_type/add_account_type_model.dart
@@ -49,7 +49,7 @@ class AddAccountTypeModel extends ElementaryModel {
  required PublicKey publicKey,
  required String password,
  }) async {
- final seed = _nekotonRepository.seedList.findSeed(publicKey)!;
+ final seed = _nekotonRepository.seedList.findSeedByAnyPublicKey(publicKey)!;
 
  if (!seed.masterKey.createdAccountTypes.contains(walletType)) {
  return seed.masterKey;