Merge branch 'cake-tech:dev' into dev

lib/cake_pay/src/cards/cake_pay_buy_card_page.dart

@@ -14,6 +14,7 @@ import 'package:cake_wallet/cake_pay/src/widgets/three_checkbox_alert_content_wi
 import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/entities/parsed_address.dart';
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/new-ui/widgets/keyboard_hide_overlay.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
@@ -66,6 +67,9 @@ class CakePayBuyCardPage extends BasePage {
   @override
   bool get gradientAll => true;
 
+  @override
+  bool get resizeToAvoidBottomInset => false;
+
   @override
   AppBarStyle get appBarStyle => AppBarStyle.completelyTransparent;
 
@@ -103,20 +107,9 @@ class CakePayBuyCardPage extends BasePage {
     final card = cakePayBuyCardViewModel.card;
     final vendor = cakePayBuyCardViewModel.vendor;
 
-    return KeyboardActions(
-      disableScroll: true,
-      config: KeyboardActionsConfig(
-          keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-          keyboardBarColor: Theme.of(context).primaryColor,
-          nextFocus: false,
-          actions: [
-            KeyboardActionsItem(
-              focusNode: _amountFieldFocus,
-              toolbarButtons: [(_) => KeyboardDoneButton()],
-            ),
-          ]),
-      child: Container(
-        color: Colors.transparent,
+    return Container(
+      color: Colors.transparent,
+      child: KeyboardHideOverlay(
         child: Column(
           children: [
             RoundedOverlayCards(

lib/cake_pay/src/cards/cake_pay_cards_page.dart

@@ -4,6 +4,7 @@ import 'package:cake_wallet/cake_pay/src/widgets/cake_pay_search_bar_widget.dart
 import 'package:cake_wallet/cake_pay/src/widgets/user_card_item.dart';
 import 'package:cake_wallet/entities/country.dart';
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/new-ui/widgets/keyboard_hide_overlay.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/cake_pay/src/widgets/card_item.dart';
@@ -91,7 +92,7 @@ class CakePayCardsPage extends BasePage {
 
   @override
   Widget body(BuildContext context) {
-    return CakePayCardsPageBody(cardsListViewModel: _cardsListViewModel, titleColor: titleColor);
+    return KeyboardHideOverlay(child:CakePayCardsPageBody(cardsListViewModel: _cardsListViewModel, titleColor: titleColor));
   }
 }
 

lib/new-ui/pages/send_page.dart

@@ -689,7 +689,11 @@ class _NewSendPageState extends State<NewSendPage> {
 
     for(int i=0; i<widget.sendViewModel.outputs.length; i++) {
       if(i < _amountControllers.length) {
-        widget.sendViewModel.outputs[i].cryptoAmount = _amountControllers[i].text;
+        if(_fiatInputMode) {
+          widget.sendViewModel.outputs[i].setFiatAmount(_amountControllers[i].text);
+        } else {
+          widget.sendViewModel.outputs[i].cryptoAmount = _amountControllers[i].text;
+        }
       }
     }