V4.6.7 v1.3.8 (#971)

* - Replace payfura widget with direct browser link
- Remove Payfura widget class as it is duplicate for the web view page

* Revert removing swipe to delete wallet feature

* Pump app versions and update release notes

assets/text/Monerocom_Release_Notes.txt

@@ -1,6 +1,3 @@
-Opt-in to Cake 2FA for security. More info: https://guides.cakewallet.com/docs/advanced-features/authentication/#cake-2fa
+Enable iPad/Tablet separate layout from mobile UI
-Auto generate restore height for Monero restore QR codes
+SideShift update and fixes
-Hausa and Yoruba languages
+Bug Fixes
-Additional privacy settings
-Update Monero to 0.18.2.2
-Refactoring and bug fixes

assets/text/Release_Notes.txt

@@ -1,6 +1,4 @@
-Opt-in to Cake 2FA for security. More info: https://guides.cakewallet.com/docs/advanced-features/authentication/#cake-2fa
+Enable iPad/Tablet separate layout from mobile UI
-Auto generate restore height for Monero restore QR codes
+SideShift update and fixes
-Hausa and Yoruba languages
+Add MoonPay sell
-Additional privacy settings
+Bug Fixes
-Update Monero to 0.18.2.2
-Refactoring and bug fixes

lib/di.dart

@@ -1,7 +1,6 @@
 import 'package:cake_wallet/anonpay/anonpay_api.dart';
 import 'package:cake_wallet/anonpay/anonpay_info_base.dart';
 import 'package:cake_wallet/anonpay/anonpay_invoice_info.dart';
-import 'package:cake_wallet/buy/moonpay/moonpay_buy_provider.dart';
 import 'package:cake_wallet/buy/onramper/onramper_buy_provider.dart';
 import 'package:cake_wallet/buy/payfura/payfura_buy_provider.dart';
 import 'package:cake_wallet/core/yat_service.dart';
@@ -14,7 +13,6 @@ import 'package:cake_wallet/ionia/ionia_tip.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/anonpay_details/anonpay_details_page.dart';
 import 'package:cake_wallet/src/screens/buy/webview_page.dart';
-import 'package:cake_wallet/src/screens/buy/payfura_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/desktop_dashboard_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart';
 import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart';
@@ -685,8 +683,6 @@ Future setup({
         wallet: getIt.get<AppStore>().wallet!,
       ));
 
-  getIt.registerFactory(() => PayFuraPage(getIt.get<PayfuraBuyProvider>()));
-
   getIt.registerFactory(() => ExchangeViewModel(
         getIt.get<AppStore>().wallet!,
         _tradesSource,

lib/entities/main_actions.dart

@@ -1,12 +1,10 @@
 import 'package:cake_wallet/buy/moonpay/moonpay_buy_provider.dart';
 import 'package:cake_wallet/buy/onramper/onramper_buy_provider.dart';
-import 'package:cake_wallet/buy/payfura/payfura_buy_provider.dart';
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.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/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:cw_core/wallet_type.dart';
@@ -60,12 +58,9 @@ class MainActions {
           break;
         case WalletType.monero:
           if (viewModel.isEnabledBuyAction) {
-            if (DeviceInfo.instance.isMobile) {
+            // final uri = getIt.get<PayfuraBuyProvider>().requestUrl();
-              Navigator.of(context).pushNamed(Routes.payfuraPage);
+            final uri = Uri.parse("https://monero.com/trade");
-            } else {
+            await launchUrl(uri);
-              final uri = getIt.get<PayfuraBuyProvider>().requestUrl();
-              await launchUrl(uri);
-            }
           }
           break;
         default:

lib/router.dart

@@ -9,7 +9,6 @@ import 'package:cake_wallet/src/screens/backup/backup_page.dart';
 import 'package:cake_wallet/src/screens/backup/edit_backup_password_page.dart';
 import 'package:cake_wallet/src/screens/buy/buy_webview_page.dart';
 import 'package:cake_wallet/src/screens/buy/webview_page.dart';
-import 'package:cake_wallet/src/screens/buy/payfura_page.dart';
 import 'package:cake_wallet/src/screens/buy/pre_order_page.dart';
 import 'package:cake_wallet/src/screens/restore/sweeping_wallet_page.dart';
 import 'package:cake_wallet/src/screens/receive/anonpay_invoice_page.dart';
@@ -97,8 +96,6 @@ import 'package:cake_wallet/ionia/ionia_any_pay_payment_info.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/node.dart';
 
-import 'buy/moonpay/moonpay_buy_provider.dart';
-
 late RouteSettings currentRouteSettings;
 
 Route<dynamic> createRoute(RouteSettings settings) {
@@ -528,9 +525,6 @@ Route<dynamic> createRoute(RouteSettings settings) {
           param1: title,
           param2: url));
 
-    case Routes.payfuraPage:
-      return CupertinoPageRoute<void>(builder: (_) => getIt.get<PayFuraPage>());
-
     case Routes.advancedPrivacySettings:
       final type = settings.arguments as WalletType;
 

lib/routes.dart

@@ -81,7 +81,6 @@ class Routes {
   static const anonPayInvoicePage = '/anon_pay_invoice_page';
   static const anonPayReceivePage = '/anon_pay_receive_page';
   static const anonPayDetailsPage = '/anon_pay_details_page';
-  static const payfuraPage = '/pay_fura_page';
   static const desktop_actions = '/desktop_actions';
   static const transactionsPage = '/transactions_page';
   static const setup_2faPage = '/setup_2fa_page';

lib/src/screens/buy/payfura_page.dart

@@ -1,58 +0,0 @@
-import 'package:cake_wallet/buy/payfura/payfura_buy_provider.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_inappwebview/flutter_inappwebview.dart';
-import 'package:permission_handler/permission_handler.dart';
-
-class PayFuraPage extends BasePage {
-  PayFuraPage(this._PayfuraBuyProvider);
-
-  final PayfuraBuyProvider _PayfuraBuyProvider;
-
-  @override
-  String get title => S.current.buy;
-
-  @override
-  Widget body(BuildContext context) {
-    return PayFuraPageBody(_PayfuraBuyProvider);
-  }
-}
-
-class PayFuraPageBody extends StatefulWidget {
-  PayFuraPageBody(this._PayfuraBuyProvider);
-
-  final PayfuraBuyProvider _PayfuraBuyProvider;
-
-  Uri get uri => _PayfuraBuyProvider.requestUrl();
-
-  @override
-  PayFuraPageBodyState createState() => PayFuraPageBodyState();
-}
-
-class PayFuraPageBodyState extends State<PayFuraPageBody> {
-  PayFuraPageBodyState();
-
-  @override
-  Widget build(BuildContext context) {
-    return InAppWebView(
-      initialOptions: InAppWebViewGroupOptions(
-        crossPlatform: InAppWebViewOptions(transparentBackground: true),
-      ),
-      initialUrlRequest: URLRequest(url: widget.uri),
-      androidOnPermissionRequest: (_, __, resources) async {
-        bool permissionGranted = await Permission.camera.status == PermissionStatus.granted;
-        if (!permissionGranted) {
-          permissionGranted = await Permission.camera.request().isGranted;
-        }
-
-        return PermissionRequestResponse(
-          resources: resources,
-          action: permissionGranted
-              ? PermissionRequestResponseAction.GRANT
-              : PermissionRequestResponseAction.DENY,
-        );
-      },
-    );
-  }
-}

lib/src/screens/wallet_list/wallet_list_page.dart

@@ -149,26 +149,12 @@ class WalletListBodyState extends State<WalletListBody> {
 
                     return wallet.isCurrent
                         ? row
-                        : Row(children: [
+                        : Slidable(
-                            Expanded(child: row),
+                            key: Key('${wallet.key}'),
-                            GestureDetector(
+                            startActionPane: _actionPane(wallet),
-                              onTap: () => _removeWallet(wallet),
+                            endActionPane: _actionPane(wallet),
-                              child: Container(
+                            child: row,
-                                height: 40,
+                          );
-                                width: 44,
-                                padding: EdgeInsets.only(right: 20),
-                                child: Center(
-                                  child: Image.asset('assets/images/trash.png',
-                                      height: 16,
-                                      width: 16,
-                                      color: Theme.of(context)
-                                          .primaryTextTheme
-                                          .titleLarge!
-                                          .color),
-                                ),
-                              ),
-                            )
-                          ]);
                   }),
             ),
           ),
@@ -291,4 +277,18 @@ class WalletListBodyState extends State<WalletListBody> {
       _progressBar = null;
     });
   }
+
+  ActionPane _actionPane(WalletListItem wallet) => ActionPane(
+    motion: const ScrollMotion(),
+    extentRatio: 0.3,
+    children: [
+      SlidableAction(
+        onPressed: (_) => _removeWallet(wallet),
+        backgroundColor: Colors.red,
+        foregroundColor: Colors.white,
+        icon: CupertinoIcons.delete,
+        label: S.of(context).delete,
+      ),
+    ],
+  );
 }

scripts/android/app_env.sh

@@ -14,14 +14,14 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
 APP_ANDROID_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.3.7"
+MONERO_COM_VERSION="1.3.8"
-MONERO_COM_BUILD_NUMBER=50
+MONERO_COM_BUILD_NUMBER=51
 MONERO_COM_BUNDLE_ID="com.monero.app"
 MONERO_COM_PACKAGE="com.monero.app"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.6.6"
+CAKEWALLET_VERSION="4.6.7"
-CAKEWALLET_BUILD_NUMBER=160
+CAKEWALLET_BUILD_NUMBER=161
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 

scripts/ios/app_env.sh

@@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
 APP_IOS_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.3.7"
+MONERO_COM_VERSION="1.3.8"
-MONERO_COM_BUILD_NUMBER=48
+MONERO_COM_BUILD_NUMBER=49
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.6.6"
+CAKEWALLET_VERSION="4.6.7"
-CAKEWALLET_BUILD_NUMBER=155
+CAKEWALLET_BUILD_NUMBER=159
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 HAVEN_NAME="Haven"

scripts/macos/app_env.sh

@@ -15,8 +15,8 @@ if [ -n "$1" ]; then
 fi
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="1.0.5"
+CAKEWALLET_VERSION="1.0.6"
-CAKEWALLET_BUILD_NUMBER=24
+CAKEWALLET_BUILD_NUMBER=25
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then