New versions (#1312)

* New versions
Fix issues with Monero.com

* Add sending for Solana tokens exchanges

* Add default keyword for P2WPKH [skip ci]

* chore: Switch solana commitment to confirmed to reduced blockhash expiration (#1313)

* Modify test workflow to send arm64-v8a build only

* Fix workflow build path

* Remove unnecessary reverse of txId

* Show case sensitive evm wallet address

* Revert default Cake Theme
add custom package id for test builds

* Fix workflow script

* Fix workflow

* hash branch name

* hash branch name

* Update versions

* Add user image to Nostr
Add fetching address from text for tokens

* Fix test app package id

* fix: Solana message improvement (#1316)

---------

Co-authored-by: Adegoke David <64401859+Blazebrain@users.noreply.github.com>

lib/bitcoin/cw_bitcoin.dart

@@ -181,11 +181,28 @@ class CWBitcoin extends Bitcoin {
   }
 
   @override
-  BitcoinReceivePageOption getSelectedAddressType(Object wallet) {
+  ReceivePageOption getSelectedAddressType(Object wallet) {
     final bitcoinWallet = wallet as ElectrumWallet;
     return BitcoinReceivePageOption.fromType(bitcoinWallet.walletAddresses.addressPageType);
   }
 
   @override
-  List<BitcoinReceivePageOption> getBitcoinReceivePageOptions() => BitcoinReceivePageOption.all;
+  List<ReceivePageOption> getBitcoinReceivePageOptions() => BitcoinReceivePageOption.all;
+
+  @override
+  BitcoinAddressType getBitcoinAddressType(ReceivePageOption option) {
+    switch (option) {
+      case BitcoinReceivePageOption.p2pkh:
+        return P2pkhAddressType.p2pkh;
+      case BitcoinReceivePageOption.p2sh:
+        return P2shAddressType.p2wpkhInP2sh;
+      case BitcoinReceivePageOption.p2tr:
+        return SegwitAddresType.p2tr;
+      case BitcoinReceivePageOption.p2wsh:
+        return SegwitAddresType.p2wsh;
+      case BitcoinReceivePageOption.p2wpkh:
+      default:
+        return SegwitAddresType.p2wpkh;
+    }
+  }
 }

lib/core/address_validator.dart

@@ -295,6 +295,16 @@ class AddressValidator extends TextValidator {
       case CryptoCurrency.sol:
         return '([^0-9a-zA-Z]|^)[1-9A-HJ-NP-Za-km-z]{43,44}([^0-9a-zA-Z]|\$)';
       default:
+        if (type.tag == CryptoCurrency.eth.title) {
+          return '0x[0-9a-zA-Z]{42}';
+        }
+        if (type.tag == CryptoCurrency.maticpoly.tag) {
+          return '0x[0-9a-zA-Z]{42}';
+        }
+        if (type.tag == CryptoCurrency.sol.title) {
+          return '([^0-9a-zA-Z]|^)[1-9A-HJ-NP-Za-km-z]{43,44}([^0-9a-zA-Z]|\$)';
+        }
+
         return null;
     }
   }

lib/entities/parse_address_from_domain.dart

@@ -51,7 +51,8 @@ class AddressResolver {
     }
 
     final match = RegExp(addressPattern).firstMatch(raw);
-    return match?.group(0)?.replaceAllMapped(RegExp('[^0-9a-zA-Z]|bitcoincash:|nano_'), (Match match) {
+    return match?.group(0)?.replaceAllMapped(RegExp('[^0-9a-zA-Z]|bitcoincash:|nano_'),
+        (Match match) {
       String group = match.group(0)!;
       if (group.startsWith('bitcoincash:') || group.startsWith('nano_')) {
         return group;
@@ -68,7 +69,7 @@ class AddressResolver {
     return emailRegex.hasMatch(address);
   }
 
-
+  // TODO: refactor this to take Crypto currency instead of ticker, or at least pass in the tag as well
   Future<ParsedAddress> resolve(BuildContext context, String text, String ticker) async {
     try {
       if (text.startsWith('@') && !text.substring(1).contains('@')) {
@@ -76,7 +77,8 @@ class AddressResolver {
           final formattedName = text.substring(1);
           final twitterUser = await TwitterApi.lookupUserByName(userName: formattedName);
           final addressFromBio = extractAddressByType(
-              raw: twitterUser.description, type: CryptoCurrency.fromString(ticker));
+              raw: twitterUser.description,
+              type: CryptoCurrency.fromString(ticker, walletCurrency: wallet.currency));
           if (addressFromBio != null) {
             return ParsedAddress.fetchTwitterAddress(
                 address: addressFromBio,
@@ -87,8 +89,9 @@ class AddressResolver {
 
           final pinnedTweet = twitterUser.pinnedTweet?.text;
           if (pinnedTweet != null) {
-            final addressFromPinnedTweet =
-            extractAddressByType(raw: pinnedTweet, type: CryptoCurrency.fromString(ticker));
+            final addressFromPinnedTweet = extractAddressByType(
+                raw: pinnedTweet,
+                type: CryptoCurrency.fromString(ticker, walletCurrency: wallet.currency));
             if (addressFromPinnedTweet != null) {
               return ParsedAddress.fetchTwitterAddress(
                   address: addressFromPinnedTweet,
@@ -108,11 +111,11 @@ class AddressResolver {
           final userName = subText.substring(0, hostNameIndex);
 
           final mastodonUser =
-          await MastodonAPI.lookupUserByUserName(userName: userName, apiHost: hostName);
+              await MastodonAPI.lookupUserByUserName(userName: userName, apiHost: hostName);
 
           if (mastodonUser != null) {
-            String? addressFromBio =
-            extractAddressByType(raw: mastodonUser.note, type: CryptoCurrency.fromString(ticker));
+            String? addressFromBio = extractAddressByType(
+                raw: mastodonUser.note, type: CryptoCurrency.fromString(ticker));
 
             if (addressFromBio != null) {
               return ParsedAddress.fetchMastodonAddress(
@@ -122,7 +125,7 @@ class AddressResolver {
                   profileName: mastodonUser.username);
             } else {
               final pinnedPosts =
-              await MastodonAPI.getPinnedPosts(userId: mastodonUser.id, apiHost: hostName);
+                  await MastodonAPI.getPinnedPosts(userId: mastodonUser.id, apiHost: hostName);
 
               if (pinnedPosts.isNotEmpty) {
                 final userPinnedPostsText = pinnedPosts.map((item) => item.content).join('\n');
@@ -150,7 +153,7 @@ class AddressResolver {
         }
       }
       if (text.hasOnlyEmojis) {
-        if(settingsStore.lookupsYatService) {
+        if (settingsStore.lookupsYatService) {
           if (walletType != WalletType.haven) {
             final addresses = await yatService.fetchYatAddress(text, ticker);
             return ParsedAddress.fetchEmojiAddress(addresses: addresses, name: text);
@@ -166,7 +169,7 @@ class AddressResolver {
       }
 
       if (unstoppableDomains.any((domain) => name.trim() == domain)) {
-        if(settingsStore.lookupsUnstoppableDomains) {
+        if (settingsStore.lookupsUnstoppableDomains) {
           final address = await fetchUnstoppableDomainAddress(text, ticker);
           return ParsedAddress.fetchUnstoppableDomainAddress(address: address, name: text);
         }
@@ -182,7 +185,7 @@ class AddressResolver {
       }
 
       if (formattedName.contains(".")) {
-        if(settingsStore.lookupsOpenAlias) {
+        if (settingsStore.lookupsOpenAlias) {
           final txtRecord = await OpenaliasRecord.lookupOpenAliasRecord(formattedName);
           if (txtRecord != null) {
             final record = await OpenaliasRecord.fetchAddressAndName(
@@ -201,7 +204,11 @@ class AddressResolver {
             String? addressFromBio = extractAddressByType(
                 raw: nostrUserData.about, type: CryptoCurrency.fromString(ticker));
             if (addressFromBio != null) {
-              return ParsedAddress.nostrAddress(address: addressFromBio, name: text);
+              return ParsedAddress.nostrAddress(
+                  address: addressFromBio,
+                  name: text,
+                  profileImageUrl: nostrUserData.picture,
+                  profileName: nostrUserData.name);
             }
           }
         }

lib/entities/parsed_address.dart

@@ -119,11 +119,17 @@ class ParsedAddress {
     );
   }
 
-  factory ParsedAddress.nostrAddress({required String address, required String name}) {
+  factory ParsedAddress.nostrAddress(
+      {required String address,
+      required String name,
+      required String profileImageUrl,
+      required String profileName}) {
     return ParsedAddress(
       addresses: [address],
       name: name,
       parseFrom: ParseFrom.nostr,
+      profileImageUrl: profileImageUrl,
+      profileName: profileName,
     );
   }
 

lib/src/screens/dashboard/pages/address_page.dart

@@ -1,3 +1,4 @@
+import 'package:cake_wallet/bitcoin/bitcoin.dart';
 import 'package:cake_wallet/src/screens/new_wallet/widgets/select_button.dart';
 import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/di.dart';
@@ -6,7 +7,6 @@ import 'package:cake_wallet/src/screens/monero_accounts/monero_account_list_page
 import 'package:cake_wallet/anonpay/anonpay_donation_link_info.dart';
 import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:cw_core/receive_page_option.dart';
-import 'package:cw_bitcoin/bitcoin_receive_page_option.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/present_receive_option_picker.dart';
 import 'package:cake_wallet/src/widgets/gradient_background.dart';
 import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
@@ -28,7 +28,6 @@ import 'package:keyboard_actions/keyboard_actions.dart';
 import 'package:mobx/mobx.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
-import 'package:bitcoin_base/bitcoin_base.dart';
 
 class AddressPage extends BasePage {
   AddressPage({
@@ -230,22 +229,10 @@ class AddressPage extends BasePage {
             );
           }
           break;
-        case BitcoinReceivePageOption.p2pkh:
-          addressListViewModel.setAddressType(P2pkhAddressType.p2pkh);
-          break;
-        case BitcoinReceivePageOption.p2sh:
-          addressListViewModel.setAddressType(P2shAddressType.p2wpkhInP2sh);
-          break;
-        case BitcoinReceivePageOption.p2wpkh:
-          addressListViewModel.setAddressType(SegwitAddresType.p2wpkh);
-          break;
-        case BitcoinReceivePageOption.p2tr:
-          addressListViewModel.setAddressType(SegwitAddresType.p2tr);
-          break;
-        case BitcoinReceivePageOption.p2wsh:
-          addressListViewModel.setAddressType(SegwitAddresType.p2wsh);
-          break;
         default:
+          if (addressListViewModel.type == WalletType.bitcoin) {
+            addressListViewModel.setAddressType(bitcoin!.getBitcoinAddressType(option));
+          }
       }
     });
 

lib/src/screens/send/widgets/extract_address_from_parsed.dart

@@ -53,6 +53,8 @@ Future<String> extractAddressFromParsed(
       title = S.of(context).address_detected;
       content = S.of(context).extracted_address_content('${parsedAddress.name} (Nostr NIP-05)');
       address = parsedAddress.addresses.first;
+      profileImageUrl = parsedAddress.profileImageUrl;
+      profileName = parsedAddress.profileName;
       break;
     case ParseFrom.yatRecord:
       if (parsedAddress.name.isEmpty) {

lib/src/widgets/base_alert_dialog.dart

@@ -1,4 +1,3 @@
-import 'package:cake_wallet/src/screens/receive/widgets/header_tile.dart';
 import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'dart:ui';
 import 'package:cake_wallet/src/widgets/section_divider.dart';

lib/store/settings_store.dart

@@ -790,9 +790,16 @@ abstract class SettingsStoreBase with Store {
     final exchangeStatus = ExchangeApiMode.deserialize(
         raw: sharedPreferences.getInt(PreferencesKey.exchangeStatusKey) ??
             ExchangeApiMode.enabled.raw);
+    final bool isNewInstall = sharedPreferences.getBool(PreferencesKey.isNewInstall) ?? true;
+    final int defaultTheme;
+    if (isNewInstall) {
+      defaultTheme = isMoneroOnly ? ThemeList.moneroDarkTheme.raw : ThemeList.brightTheme.raw;
+    } else {
+      defaultTheme = ThemeType.bright.index;
+    }
     final savedTheme = initialTheme ??
         ThemeList.deserialize(
-            raw: sharedPreferences.getInt(PreferencesKey.currentTheme) ?? (isMoneroOnly ? ThemeList.moneroDarkTheme.raw : ThemeList.cakeDarkTheme.raw));
+            raw: sharedPreferences.getInt(PreferencesKey.currentTheme) ?? defaultTheme);
     final actionListDisplayMode = ObservableList<ActionListDisplayMode>();
     actionListDisplayMode.addAll(deserializeActionlistDisplayModes(
         sharedPreferences.getInt(PreferencesKey.displayActionListModeKey) ?? defaultActionsMode));
@@ -1151,7 +1158,8 @@ abstract class SettingsStoreBase with Store {
         raw: sharedPreferences.getInt(PreferencesKey.exchangeStatusKey) ??
             ExchangeApiMode.enabled.raw);
     currentTheme = ThemeList.deserialize(
-        raw: sharedPreferences.getInt(PreferencesKey.currentTheme) ?? (isMoneroOnly ? ThemeList.moneroDarkTheme.raw : ThemeList.cakeDarkTheme.raw));
+        raw: sharedPreferences.getInt(PreferencesKey.currentTheme) ??
+            (isMoneroOnly ? ThemeList.moneroDarkTheme.raw : ThemeList.brightTheme.raw));
     actionlistDisplayMode = ObservableList<ActionListDisplayMode>();
     actionlistDisplayMode.addAll(deserializeActionlistDisplayModes(
         sharedPreferences.getInt(PreferencesKey.displayActionListModeKey) ?? defaultActionsMode));

lib/twitter/twitter_api.dart

@@ -32,7 +32,10 @@ class TwitterApi {
     }
 
     final Map<String, dynamic> responseJSON = jsonDecode(response.body) as Map<String, dynamic>;
-    if (responseJSON['errors'] != null) {
+    if (responseJSON['errors'] != null &&
+        !responseJSON['errors'][0]['detail']
+            .toString()
+            .contains("Could not find tweet with pinned_tweet_id")) {
       throw Exception(responseJSON['errors'][0]['detail']);
     }
 
@@ -40,20 +43,24 @@ class TwitterApi {
   }
 
   static Tweet? _getPinnedTweet(Map<String, dynamic> responseJSON) {
-    final tweetId = responseJSON['data']['pinned_tweet_id'] as String?;
-    if (tweetId == null || responseJSON['includes'] == null) return null;
+    try {
+      final tweetId = responseJSON['data']['pinned_tweet_id'] as String?;
+      if (tweetId == null || responseJSON['includes'] == null) return null;
 
-    final tweetIncludes = List.from(responseJSON['includes']['tweets'] as List);
-    final pinnedTweetData = tweetIncludes.firstWhere(
-      (tweet) => tweet['id'] == tweetId,
-      orElse: () => null,
-    ) as Map<String, dynamic>?;
+      final tweetIncludes = List.from(responseJSON['includes']['tweets'] as List);
+      final pinnedTweetData = tweetIncludes.firstWhere(
+        (tweet) => tweet['id'] == tweetId,
+        orElse: () => null,
+      ) as Map<String, dynamic>?;
 
-    if (pinnedTweetData == null) return null;
+      if (pinnedTweetData == null) return null;
 
-    final pinnedTweetText =
-        (pinnedTweetData['note_tweet']?['text'] ?? pinnedTweetData['text']) as String;
+      final pinnedTweetText =
+          (pinnedTweetData['note_tweet']?['text'] ?? pinnedTweetData['text']) as String;
 
-    return Tweet(id: tweetId, text: pinnedTweetText);
+      return Tweet(id: tweetId, text: pinnedTweetText);
+    } catch (e) {
+      return null;
+    }
   }
 }

lib/view_model/exchange/exchange_trade_view_model.dart

@@ -162,9 +162,14 @@ abstract class ExchangeTradeViewModelBase with Store {
         wallet.currency == CryptoCurrency.maticpoly &&
         tradesStore.trade!.from.tag == CryptoCurrency.maticpoly.tag;
 
+    bool _isSplToken() =>
+        wallet.currency == CryptoCurrency.sol &&
+        tradesStore.trade!.from.tag == CryptoCurrency.sol.title;
+
     return tradesStore.trade!.from == wallet.currency ||
         tradesStore.trade!.provider == ExchangeProviderDescription.xmrto ||
         _isEthToken() ||
-        _isPolygonToken();
+        _isPolygonToken() ||
+        _isSplToken();
   }
 }