diff --git a/lib/view_model/dashboard/dashboard_view_model.dart b/lib/view_model/dashboard/dashboard_view_model.dart index 3ecfedb2c..9bf08248d 100644 --- a/lib/view_model/dashboard/dashboard_view_model.dart +++ b/lib/view_model/dashboard/dashboard_view_model.dart @@ -14,6 +14,7 @@ import 'package:cake_wallet/exchange/exchange_provider_description.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/monero/monero.dart'; import 'package:cake_wallet/src/widgets/alert_with_one_action.dart'; +import 'package:cake_wallet/utils/device_info.dart'; import 'package:cake_wallet/utils/show_pop_up.dart'; import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cake_wallet/utils/tor.dart'; @@ -578,7 +579,8 @@ abstract class DashboardViewModelBase with Store { bool get showPayjoinCard => wallet.type == WalletType.bitcoin && settingsStore.showPayjoinCard && - !settingsStore.usePayjoin; + !settingsStore.usePayjoin && + DeviceInfo.instance.isMobile; @observable bool backgroundSyncEnabled = false; @@ -1073,7 +1075,7 @@ abstract class DashboardViewModelBase with Store { })); } } - + @action void setSyncAll(bool value) => settingsStore.currentSyncAll = value; @@ -1120,7 +1122,7 @@ abstract class DashboardViewModelBase with Store { } } - static ServicesResponse? cachedServicesResponse; + static ServicesResponse? cachedServicesResponse; Future getServicesStatus() async { if (cachedServicesResponse != null) { diff --git a/lib/view_model/settings/privacy_settings_view_model.dart b/lib/view_model/settings/privacy_settings_view_model.dart index e70383c6e..22032b7d3 100644 --- a/lib/view_model/settings/privacy_settings_view_model.dart +++ b/lib/view_model/settings/privacy_settings_view_model.dart @@ -5,6 +5,7 @@ import 'package:cake_wallet/ethereum/ethereum.dart'; import 'package:cake_wallet/polygon/polygon.dart'; import 'package:cake_wallet/store/settings_store.dart'; import 'package:cake_wallet/tron/tron.dart'; +import 'package:cake_wallet/utils/device_info.dart'; import 'package:cw_core/balance.dart'; import 'package:cw_core/transaction_history.dart'; import 'package:cw_core/transaction_info.dart'; @@ -115,7 +116,7 @@ abstract class PrivacySettingsViewModelBase with Store { bool get canUseMempoolFeeAPI => _wallet.type == WalletType.bitcoin; - bool get canUsePayjoin => _wallet.type == WalletType.bitcoin; + bool get canUsePayjoin => _wallet.type == WalletType.bitcoin && DeviceInfo.instance.isMobile; @action void setShouldSaveRecipientAddress(bool value) => diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh index f315bc370..fc2b2cb9f 100644 --- a/scripts/android/app_env.sh +++ b/scripts/android/app_env.sh @@ -15,14 +15,14 @@ APP_ANDROID_TYPE=$1 MONERO_COM_NAME="Monero.com" MONERO_COM_VERSION="5.3.0" -MONERO_COM_BUILD_NUMBER=131 +MONERO_COM_BUILD_NUMBER=132 MONERO_COM_BUNDLE_ID="com.monero.app" MONERO_COM_PACKAGE="com.monero.app" MONERO_COM_SCHEME="monero.com" CAKEWALLET_NAME="Cake Wallet" CAKEWALLET_VERSION="5.3.0" -CAKEWALLET_BUILD_NUMBER=272 +CAKEWALLET_BUILD_NUMBER=273 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet" CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet" CAKEWALLET_SCHEME="cakewallet" diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh index 2defbd67a..f6a82a606 100644 --- a/scripts/ios/app_env.sh +++ b/scripts/ios/app_env.sh @@ -13,12 +13,12 @@ APP_IOS_TYPE=$1 MONERO_COM_NAME="Monero.com" MONERO_COM_VERSION="5.3.0" -MONERO_COM_BUILD_NUMBER=132 +MONERO_COM_BUILD_NUMBER=133 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" CAKEWALLET_VERSION="5.3.0" -CAKEWALLET_BUILD_NUMBER=331 +CAKEWALLET_BUILD_NUMBER=332 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" diff --git a/scripts/linux/app_env.sh b/scripts/linux/app_env.sh index 0baeeff0b..c3ef423a1 100755 --- a/scripts/linux/app_env.sh +++ b/scripts/linux/app_env.sh @@ -15,7 +15,7 @@ fi CAKEWALLET_NAME="Cake Wallet" CAKEWALLET_VERSION="5.3.0" -CAKEWALLET_BUILD_NUMBER=63 +CAKEWALLET_BUILD_NUMBER=64 if ! [[ " ${TYPES[*]} " =~ " ${APP_LINUX_TYPE} " ]]; then echo "Wrong app type." diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh index a97999c77..f192ddf34 100755 --- a/scripts/macos/app_env.sh +++ b/scripts/macos/app_env.sh @@ -17,12 +17,12 @@ fi MONERO_COM_NAME="Monero.com" MONERO_COM_VERSION="5.3.0" -MONERO_COM_BUILD_NUMBER=60 +MONERO_COM_BUILD_NUMBER=61 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" CAKEWALLET_VERSION="5.3.0" -CAKEWALLET_BUILD_NUMBER=125 +CAKEWALLET_BUILD_NUMBER=126 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then