Revert "set launchUrl mode to LaunchMode.externalApplication"
This reverts commit f401dafdca49b3c3b75217b3ac983b65e807ca56.
Serhii committed
May 24, 2024 at 11:52 UTC
50c29ea3ed69b5c1ed40a0e58c61dc544862cf4c
3 files changed
+21
-3
lib/buy/dfx/dfx_buy_provider.dart
+6
-1
@@ -5,6 +5,7 @@ import 'package:cake_wallet/generated/i18n.dart';
5
import 'package:cake_wallet/routes.dart';
6
import 'package:cake_wallet/src/screens/connect_device/connect_device_page.dart';
7
import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
8
+import 'package:cake_wallet/utils/device_info.dart';
9
import 'package:cake_wallet/utils/show_pop_up.dart';
10
import 'package:cake_wallet/view_model/hardware_wallet/ledger_view_model.dart';
11
import 'package:cw_core/wallet_base.dart';
@@ -166,7 +167,11 @@ class DFXBuyProvider extends BuyProvider {
167
});
168
169
if (await canLaunchUrl(uri)) {
169
- await launchUrl(uri, mode: LaunchMode.externalApplication);
170
+ if (DeviceInfo.instance.isMobile) {
171
+ Navigator.of(context).pushNamed(Routes.webViewPage, arguments: [title, uri]);
172
+ } else {
173
+ await launchUrl(uri, mode: LaunchMode.externalApplication);
174
+ }
175
} else {
176
throw Exception('Could not launch URL');
177
}
lib/buy/moonpay/moonpay_provider.dart
+7
-1
@@ -9,9 +9,11 @@ import 'package:cake_wallet/buy/order.dart';
9
import 'package:cake_wallet/exchange/trade_state.dart';
10
import 'package:cake_wallet/generated/i18n.dart';
11
import 'package:cake_wallet/palette.dart';
12
+import 'package:cake_wallet/routes.dart';
13
import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
14
import 'package:cake_wallet/store/settings_store.dart';
15
import 'package:cake_wallet/themes/theme_base.dart';
16
+import 'package:cake_wallet/utils/device_info.dart';
17
import 'package:cw_core/crypto_currency.dart';
18
import 'package:cw_core/wallet_base.dart';
19
import 'package:cw_core/wallet_type.dart';
@@ -270,7 +272,11 @@ class MoonPayProvider extends BuyProvider {
272
}
273
274
if (await canLaunchUrl(uri)) {
273
- await launchUrl(uri, mode: LaunchMode.externalApplication);
275
+ if (DeviceInfo.instance.isMobile) {
276
+ Navigator.of(context).pushNamed(Routes.webViewPage, arguments: ['MoonPay', uri]);
277
+ } else {
278
+ await launchUrl(uri, mode: LaunchMode.externalApplication);
279
+ }
280
} else {
281
throw Exception('Could not launch URL');
282
}
lib/buy/onramper/onramper_buy_provider.dart
+8
-1
@@ -1,8 +1,10 @@
1
import 'package:cake_wallet/.secrets.g.dart' as secrets;
2
import 'package:cake_wallet/buy/buy_provider.dart';
3
import 'package:cake_wallet/generated/i18n.dart';
4
+import 'package:cake_wallet/routes.dart';
5
import 'package:cake_wallet/store/settings_store.dart';
6
import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
7
+import 'package:cake_wallet/utils/device_info.dart';
8
import 'package:cw_core/crypto_currency.dart';
9
import 'package:cw_core/wallet_base.dart';
10
import 'package:flutter/material.dart';
@@ -92,6 +94,11 @@ class OnRamperBuyProvider extends BuyProvider {
94
95
Future<void> launchProvider(BuildContext context, bool? isBuyAction) async {
96
final uri = requestOnramperUrl(context, isBuyAction);
95
- await launchUrl(uri, mode: LaunchMode.externalApplication);
97
+ if (DeviceInfo.instance.isMobile) {
98
+ Navigator.of(context)
99
+ .pushNamed(Routes.webViewPage, arguments: [title, uri]);
100
+ } else {
101
+ await launchUrl(uri);
102
+ }
103
}
104
}