Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-453-silent-payments

 Conflicts:

	lib/di.dart

lib/di.dart

@@ -14,6 +14,7 @@ import 'package:cake_wallet/buy/robinhood/robinhood_buy_provider.dart';
 import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/core/backup_service.dart';
 import 'package:cake_wallet/core/key_service.dart';
+import 'package:cake_wallet/core/secure_storage.dart';
 import 'package:cake_wallet/core/wallet_connect/wallet_connect_key_service.dart';
 import 'package:cake_wallet/core/wallet_connect/wc_bottom_sheet_service.dart';
 import 'package:cake_wallet/core/wallet_connect/web3wallet_service.dart';
@@ -126,6 +127,7 @@ import 'package:cake_wallet/src/screens/support/support_page.dart';
 import 'package:cake_wallet/src/screens/support_chat/support_chat_page.dart';
 import 'package:cake_wallet/src/screens/support_other_links/support_other_links_page.dart';
 import 'package:cake_wallet/src/screens/trade_details/trade_details_page.dart';
+import 'package:cake_wallet/src/screens/transaction_details/rbf_details_page.dart';
 import 'package:cake_wallet/src/screens/transaction_details/transaction_details_page.dart';
 import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_details_page.dart';
 import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_list_page.dart';
@@ -149,6 +151,7 @@ import 'package:cake_wallet/store/templates/send_template_store.dart';
 import 'package:cake_wallet/store/wallet_list_store.dart';
 import 'package:cake_wallet/store/yat/yat_store.dart';
 import 'package:cake_wallet/themes/theme_list.dart';
+import 'package:cake_wallet/tron/tron.dart';
 import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cake_wallet/utils/payment_request.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
@@ -181,6 +184,7 @@ import 'package:cake_wallet/view_model/ionia/ionia_gift_card_details_view_model.
 import 'package:cake_wallet/view_model/ionia/ionia_gift_cards_list_view_model.dart';
 import 'package:cake_wallet/view_model/ionia/ionia_payment_status_view_model.dart';
 import 'package:cake_wallet/view_model/ionia/ionia_purchase_merch_view_model.dart';
+import 'package:cake_wallet/view_model/link_view_model.dart';
 import 'package:cake_wallet/view_model/monero_account_list/account_list_item.dart';
 import 'package:cake_wallet/view_model/monero_account_list/monero_account_edit_or_create_view_model.dart';
 import 'package:cake_wallet/view_model/monero_account_list/monero_account_list_view_model.dart';
@@ -224,6 +228,7 @@ import 'package:cake_wallet/view_model/wallet_seed_view_model.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/nano_account.dart';
 import 'package:cw_core/node.dart';
+import 'package:cw_core/receive_page_option.dart';
 import 'package:cw_core/transaction_info.dart';
 import 'package:cw_core/unspent_coins_info.dart';
 import 'package:cw_core/wallet_info.dart';
@@ -235,7 +240,6 @@ import 'package:get_it/get_it.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:cake_wallet/core/secure_storage.dart';
 
 import 'buy/dfx/dfx_buy_provider.dart';
 import 'core/totp_request_details.dart';
@@ -800,8 +804,8 @@ Future<void> setup({
 
   getIt.registerFactory(() => ConnectionSyncPage(getIt.get<DashboardViewModel>()));
 
-  getIt.registerFactory(
-      () => SecurityBackupPage(getIt.get<SecuritySettingsViewModel>(), getIt.get<AuthService>()));
+  getIt.registerFactory(() => SecurityBackupPage(getIt.get<SecuritySettingsViewModel>(),
+      getIt.get<AuthService>(), getIt.get<AppStore>().wallet!.isHardwareWallet));
 
   getIt.registerFactory(() => PrivacyPage(getIt.get<PrivacySettingsViewModel>()));
 

lib/src/screens/contact/contact_page.dart

@@ -46,6 +46,7 @@ class ContactPage extends BasePage {
   final TextEditingController _nameController;
   final TextEditingController _currencyTypeController;
   final TextEditingController _addressController;
+  bool _isEffectsApplied = false;
 
   @override
   Widget body(BuildContext context) {
@@ -53,15 +54,7 @@ class ContactPage extends BasePage {
         color: Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor,
         height: 8);
 
-    reaction((_) => contactViewModel.state, (ExecutionState state) {
-      if (state is FailureState) {
-        _onContactSavingFailure(context, state.error);
-      }
-
-      if (state is ExecutedSuccessfullyState) {
-        _onContactSavedSuccessfully(context);
-      }
-    });
+    _setEffects(context);
 
     return Observer(
       builder: (_) => ScrollableWithBottomSection(
@@ -177,4 +170,22 @@ class ContactPage extends BasePage {
 
   void _onContactSavedSuccessfully(BuildContext context) =>
       Navigator.of(context).pop();
+
+  void _setEffects(BuildContext context) {
+    if (_isEffectsApplied) {
+      return;
+    }
+
+    _isEffectsApplied = true;
+
+    reaction((_) => contactViewModel.state, (ExecutionState state) {
+      if (state is FailureState) {
+        _onContactSavingFailure(context, state.error);
+      }
+
+      if (state is ExecutedSuccessfullyState) {
+        _onContactSavedSuccessfully(context);
+      }
+    });
+  }
 }

lib/src/screens/settings/security_backup_page.dart

@@ -9,14 +9,13 @@ import 'package:cake_wallet/src/screens/pin_code/pin_code_widget.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arrow.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_picker_cell.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
-import 'package:cake_wallet/src/widgets/standard_list.dart';
 import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cake_wallet/view_model/settings/security_settings_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 
 class SecurityBackupPage extends BasePage {
-  SecurityBackupPage(this._securitySettingsViewModel, this._authService);
+  SecurityBackupPage(this._securitySettingsViewModel, this._authService, [this._isHardwareWallet = false]);
 
   final AuthService _authService;
 
@@ -25,18 +24,21 @@ class SecurityBackupPage extends BasePage {
 
   final SecuritySettingsViewModel _securitySettingsViewModel;
 
+  final bool _isHardwareWallet;
+
   @override
   Widget body(BuildContext context) {
     return Container(
         padding: EdgeInsets.only(top: 10),
         child: Column(mainAxisSize: MainAxisSize.min, children: [
+          if (!_isHardwareWallet)
             SettingsCellWithArrow(
               title: S.current.show_keys,
               handler: (_) => _authService.authenticateAction(
                 context,
                 route: Routes.showKeys,
-              conditionToDetermineIfToUse2FA: _securitySettingsViewModel
-                  .shouldRequireTOTP2FAForAllSecurityAndBackupSettings,
+                conditionToDetermineIfToUse2FA:
+                    _securitySettingsViewModel.shouldRequireTOTP2FAForAllSecurityAndBackupSettings,
               ),
             ),
           SettingsCellWithArrow(

lib/view_model/dashboard/dashboard_view_model.dart

@@ -569,6 +569,7 @@ abstract class DashboardViewModelBase with Store {
 
   Future<ServicesResponse> getServicesStatus() async {
     try {
+      if (isEnabledBulletinAction) {
           final res = await http.get(Uri.parse("https://service-api.cakewallet.com/v1/active-notices"));
 
           if (res.statusCode < 200 || res.statusCode >= 300) {
@@ -587,6 +588,10 @@ abstract class DashboardViewModelBase with Store {
             hasUpdates,
             currentSha,
           );
+      }
+      else {
+          return ServicesResponse([], false, '');
+        }
     } catch (_) {
       return ServicesResponse([], false, '');
     }