cancel yat address request for haven wallet (#396)
Serhii committed
Jun 28, 2022 at 18:46 UTC
9b9e211c081e3b13dccafc1bbc9214f84c076da2
2 files changed
+9
-4
lib/di.dart
+2
-1
@@ -639,7 +639,8 @@ Future setup(
639
640
getIt.registerFactory(() => YatService());
641
642
- getIt.registerFactory(() => AddressResolver(yatService: getIt.get<YatService>()));
642
+ getIt.registerFactory(() => AddressResolver(yatService: getIt.get<YatService>(),
643
+ walletType: getIt.get<AppStore>().wallet.type));
644
645
getIt.registerFactoryParam<FullscreenQRPage, String, bool>(
646
(String qrData, bool isLight) => FullscreenQRPage(qrData: qrData, isLight: isLight,));
lib/entities/parse_address_from_domain.dart
+7
-3
@@ -3,14 +3,16 @@ import 'package:cake_wallet/entities/openalias_record.dart';
3
import 'package:cake_wallet/entities/parsed_address.dart';
4
import 'package:cake_wallet/entities/unstoppable_domain_address.dart';
5
import 'package:cake_wallet/entities/emoji_string_extension.dart';
6
+import 'package:cw_core/wallet_type.dart';
7
import 'package:flutter/foundation.dart';
8
import 'package:cake_wallet/entities/fio_address_provider.dart';
9
10
class AddressResolver {
11
11
- AddressResolver({@required this.yatService});
12
+ AddressResolver({@required this.yatService, this.walletType});
13
14
final YatService yatService;
15
+ final WalletType walletType;
16
17
static const unstoppableDomains = [
18
'crypto',
@@ -36,8 +38,10 @@ class AddressResolver {
38
39
}
40
if (text.hasOnlyEmojis) {
39
- final addresses = await yatService.fetchYatAddress(text, ticker);
40
- return ParsedAddress.fetchEmojiAddress(addresses: addresses, name: text);
41
+ if (walletType != WalletType.haven) {
42
+ final addresses = await yatService.fetchYatAddress(text, ticker);
43
+ return ParsedAddress.fetchEmojiAddress(addresses: addresses, name: text);
44
+ }
45
}
46
final formattedName = OpenaliasRecord.formatDomainName(text);
47
final domainParts = formattedName.split('.');