Merge branch 'main' into CAKE-296-remove-xmr-to-xrp-and-xmr-to-xlm-exchange-pairs

lib/core/fiat_conversion_service.dart

@@ -16,7 +16,8 @@ Future<double> _fetchPrice(Map<String, dynamic> args) async {
   try {
     final fiatStringified = fiat.toString();
     final uri =
-        Uri.https(fiatApiAuthority, fiatApiPath, {'convert': fiatStringified});
+        Uri.https(fiatApiAuthority, fiatApiPath,
+            <String, String> {'convert': fiatStringified});
     final response = await get(uri.toString());
 
     if (response.statusCode != 200) {

lib/entities/transaction_history.dart

@@ -1,4 +1,4 @@
-import 'package:rxdart/rxdart.dart';
+import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/entities/transaction_info.dart';
 
 abstract class TransactionHistory {

lib/entities/wallet.dart

@@ -1,4 +1,4 @@
-import 'package:rxdart/rxdart.dart';
+import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/entities/sync_status.dart';
 import 'package:cake_wallet/entities/transaction_history.dart';
 import 'package:cake_wallet/entities/wallet_type.dart';

lib/src/screens/auth/auth_page.dart

@@ -142,7 +142,7 @@ class AuthPageState extends State<AuthPage> {
                 : Container(),
             backgroundColor: Theme.of(context).backgroundColor,
             border: null),
-        resizeToAvoidBottomPadding: false,
+        resizeToAvoidBottomInset: false,
         body: PinCode((pin, _) => widget.authViewModel.auth(password: pin),
             (_) => null, widget.authViewModel.pinLength, false, _pinCodeKey));
   }

lib/src/screens/base_page.dart

@@ -28,7 +28,7 @@ abstract class BasePage extends StatelessWidget {
 
   Color get titleColor => null;
 
-  bool get resizeToAvoidBottomPadding => true;
+  bool get resizeToAvoidBottomInset => true;
 
   bool get extendBodyBehindAppBar => false;
 
@@ -138,7 +138,7 @@ abstract class BasePage extends StatelessWidget {
     final root = Scaffold(
         key: _scaffoldKey,
         backgroundColor: _backgroundColor,
-        resizeToAvoidBottomPadding: resizeToAvoidBottomPadding,
+        resizeToAvoidBottomInset: resizeToAvoidBottomInset,
         extendBodyBehindAppBar: extendBodyBehindAppBar,
         endDrawer: endDrawer,
         appBar: appBar(context),

lib/src/screens/pin_code/pin_code_widget.dart

@@ -101,7 +101,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
 
   @override
   Widget build(BuildContext context) => Scaffold(
-      key: _key, body: body(context), resizeToAvoidBottomPadding: false);
+      key: _key, body: body(context), resizeToAvoidBottomInset: false);
 
   Widget body(BuildContext context) {
     final deleteIconImage = Image.asset(

lib/src/screens/welcome/welcome_page.dart

@@ -16,7 +16,7 @@ class WelcomePage extends BasePage {
         backgroundColor: Theme
             .of(context)
             .backgroundColor,
-        resizeToAvoidBottomPadding: false,
+        resizeToAvoidBottomInset: false,
         body: body(context));
   }
 

lib/utils/show_pop_up.dart

@@ -7,8 +7,7 @@ Future<T> showPopUp<T>({
   Color barrierColor,
   bool useSafeArea = false,
   bool useRootNavigator = true,
-  RouteSettings routeSettings,
-  Widget child,
+  RouteSettings routeSettings
 }) {
   return showDialog<T>(
       context: context,
@@ -17,6 +16,5 @@ Future<T> showPopUp<T>({
       barrierColor: barrierColor,
       useSafeArea: useSafeArea,
       useRootNavigator: useRootNavigator,
-      routeSettings: routeSettings,
-      child: child);
+      routeSettings: routeSettings);
 }