V4.6.4 bug fixes (#922)

* Fix Concurrent modification exception

* Fix minor UI issues

* Change onramper crypto asset name for Litcoin

* Fix secure storage issue, fetching password/PIN with null

* - Fix Navigation issue while keyboard is displaying
- Remove deprecated screen

* Take currency From/To info from our trade not the returned one

* Fix anon pay fields UI

* Fix Anonpay border/icons UI

* Add extra padding in QR image as a safe layer

* Generalize ignored connection error

* Remove Bio Auth option from desktop

* Fix some Transaction info not parsed correctly

lib/src/screens/dashboard/widgets/address_page.dart

@@ -96,7 +96,10 @@ class AddressPage extends BasePage {
 
   @override
   Widget middle(BuildContext context) =>
-      PresentReceiveOptionPicker(receiveOptionViewModel: receiveOptionViewModel);
+      PresentReceiveOptionPicker(
+        receiveOptionViewModel: receiveOptionViewModel,
+        hasWhiteBackground: currentTheme.type == ThemeType.light,
+      );
 
   @override
   Widget Function(BuildContext, Widget) get rootWrapper =>

lib/src/screens/dashboard/widgets/present_receive_option_picker.dart

@@ -9,14 +9,22 @@ import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 
 class PresentReceiveOptionPicker extends StatelessWidget {
-  PresentReceiveOptionPicker({required this.receiveOptionViewModel});
+  PresentReceiveOptionPicker(
+      {required this.receiveOptionViewModel, this.hasWhiteBackground = false});
 
   final ReceiveOptionViewModel receiveOptionViewModel;
+  final bool hasWhiteBackground;
 
   @override
   Widget build(BuildContext context) {
-    final arrowBottom =
-        Image.asset('assets/images/arrow_bottom_purple_icon.png', color: Colors.white, height: 6);
+    final textIconTheme = hasWhiteBackground
+        ? Theme.of(context).accentTextTheme.headline2!.backgroundColor!
+        : Colors.white;
+    final arrowBottom = Image.asset(
+      'assets/images/arrow_bottom_purple_icon.png',
+      color: textIconTheme,
+      height: 6,
+    );
 
     return TextButton(
       onPressed: () => _showPicker(context),
@@ -40,14 +48,14 @@ class PresentReceiveOptionPicker extends StatelessWidget {
                     fontSize: 18.0,
                     fontWeight: FontWeight.bold,
                     fontFamily: 'Lato',
-                    color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!),
+                    color: textIconTheme),
               ),
               Observer(
                   builder: (_) => Text(receiveOptionViewModel.selectedReceiveOption.toString(),
                       style: TextStyle(
                           fontSize: 10.0,
                           fontWeight: FontWeight.w500,
-                          color: Theme.of(context).textTheme.headline5!.color!)))
+                          color: textIconTheme)))
             ],
           ),
           SizedBox(width: 5),

lib/src/screens/receive/widgets/anonpay_currency_input_field.dart

@@ -32,7 +32,7 @@ class AnonpayCurrencyInputField extends StatelessWidget {
             decoration: BoxDecoration(
               border: Border(
                   bottom: BorderSide(
-                      color: Theme.of(context).accentTextTheme.headline6!.backgroundColor!,
+                      color: Theme.of(context).primaryTextTheme.bodyText1!.color!,
                       width: 1)),
             ),
             child: Padding(

lib/src/screens/receive/widgets/anonpay_input_form.dart

@@ -69,7 +69,7 @@ class AnonInvoiceForm extends StatelessWidget {
             BaseTextFormField(
               controller: nameController,
               focusNode: _nameFocusNode,
-              borderColor: Theme.of(context).accentTextTheme.headline6!.backgroundColor,
+              borderColor: Theme.of(context).primaryTextTheme.bodyText1!.color!,
               suffixIcon: SizedBox(width: 36),
               hintText: S.of(context).optional_name,
               textInputAction: TextInputAction.next,
@@ -88,7 +88,7 @@ class AnonInvoiceForm extends StatelessWidget {
               controller: descriptionController,
               focusNode: _descriptionFocusNode,
               textInputAction: TextInputAction.next,
-              borderColor: Theme.of(context).accentTextTheme.headline6!.backgroundColor,
+              borderColor: Theme.of(context).primaryTextTheme.bodyText1!.color!,
               suffixIcon: SizedBox(width: 36),
               hintText: S.of(context).optional_description,
               placeholderTextStyle: TextStyle(
@@ -104,7 +104,7 @@ class AnonInvoiceForm extends StatelessWidget {
               controller: emailController,
               textInputAction: TextInputAction.next,
               focusNode: _emailFocusNode,
-              borderColor: Theme.of(context).accentTextTheme.headline6!.backgroundColor,
+              borderColor: Theme.of(context).primaryTextTheme.bodyText1!.color!,
               suffixIcon: SizedBox(width: 36),
               keyboardType: TextInputType.emailAddress,
               hintText: S.of(context).optional_email_hint,

lib/src/screens/receive/widgets/currency_input_field.dart

@@ -1,4 +1,3 @@
-import 'package:cake_wallet/core/amount_validator.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cw_core/currency.dart';
 import 'package:flutter/material.dart';
@@ -10,18 +9,20 @@ class CurrencyInputField extends StatelessWidget {
     required this.onTapPicker,
     required this.selectedCurrency,
     this.focusNode,
-    required this.controller,
+    required this.controller, required this.isLight,
   });
+
   final Function() onTapPicker;
   final Currency selectedCurrency;
   final FocusNode? focusNode;
   final TextEditingController controller;
+  final bool isLight;
 
   @override
   Widget build(BuildContext context) {
     final arrowBottomPurple = Image.asset(
       'assets/images/arrow_bottom_purple_icon.png',
-      color: Colors.white,
+      color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
       height: 8,
     );
     final _width = MediaQuery.of(context).size.width;
@@ -38,14 +39,14 @@ class CurrencyInputField extends StatelessWidget {
               keyboardType: TextInputType.numberWithOptions(signed: false, decimal: true),
               inputFormatters: [FilteringTextInputFormatter.allow(RegExp(r'^\d+(\.|\,)?\d{0,8}'))],
               hintText: '0.000',
-              placeholderTextStyle: TextStyle(
+              placeholderTextStyle: isLight ? null : TextStyle(
                 color: Theme.of(context).primaryTextTheme.headline5!.color!,
                 fontWeight: FontWeight.w600,
               ),
               borderColor: Theme.of(context).accentTextTheme.headline6!.backgroundColor!,
-              textColor: Colors.white,
+              textColor: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
               textStyle: TextStyle(
-                color: Colors.white,
+                color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
               ),
               prefixIcon: Padding(
                 padding: EdgeInsets.only(
@@ -68,7 +69,7 @@ class CurrencyInputField extends StatelessWidget {
                             style: TextStyle(
                               fontWeight: FontWeight.w600,
                               fontSize: 16,
-                              color: Colors.white,
+                              color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
                             ),
                           ),
                           if (selectedCurrency.tag != null)
@@ -103,7 +104,8 @@ class CurrencyInputField extends StatelessWidget {
                               style: TextStyle(
                                 fontWeight: FontWeight.w600,
                                 fontSize: 20,
-                                color: Colors.white,
+                                color:
+                                    Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
                               ),
                             ),
                           ),

lib/src/screens/receive/widgets/qr_image.dart

@@ -23,7 +23,7 @@ class QrImage extends StatelessWidget {
       size: size,
       foregroundColor: Colors.black,
       backgroundColor: Colors.white,
-      padding: EdgeInsets.zero,
+      padding: const EdgeInsets.all(8.0),
     );
   }
 }

lib/src/screens/receive/widgets/qr_widget.dart

@@ -119,6 +119,7 @@ class QRWidget extends StatelessWidget {
                       controller: amountController,
                       onTapPicker: () => _presentPicker(context),
                       selectedCurrency: addressListViewModel.selectedCurrency,
+                      isLight: isLight,
                     ),
                   ),
                 ),

lib/src/screens/restore/restore_from_keys.dart

@@ -1,83 +0,0 @@
-import 'package:flutter/services.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/widgets/blockchain_height_widget.dart';
-import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
-
-class RestoreFromKeysFrom extends StatefulWidget {
-  @override
-  _RestoreFromKeysFromState createState() => _RestoreFromKeysFromState();
-}
-
-class _RestoreFromKeysFromState extends State<RestoreFromKeysFrom> {
-  final _formKey = GlobalKey<FormState>();
-  final _blockchainHeightKey = GlobalKey<BlockchainHeightState>();
-  final _nameController = TextEditingController();
-  final _addressController = TextEditingController();
-  final _viewKeyController = TextEditingController();
-  final _spendKeyController = TextEditingController();
-  final _wifController = TextEditingController();
-
-  @override
-  void initState() {
-    // _nameController.addListener(() =>
-    // widget.walletRestorationFromKeysVM.name = _nameController.text);
-    // _addressController.addListener(() =>
-    // widget.walletRestorationFromKeysVM.address = _addressController.text);
-    // _viewKeyController.addListener(() =>
-    // widget.walletRestorationFromKeysVM.viewKey = _viewKeyController.text);
-    // _spendKeyController.addListener(() =>
-    // widget.walletRestorationFromKeysVM.spendKey = _spendKeyController.text);
-    // _wifController.addListener(() =>
-    // widget.walletRestorationFromKeysVM.wif = _wifController.text);
-
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    _nameController.dispose();
-    _addressController.dispose();
-    _viewKeyController.dispose();
-    _spendKeyController.dispose();
-    _wifController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      padding: EdgeInsets.only(left: 24, right: 24),
-      child: Form(
-        key: _formKey,
-        child: Column(children: <Widget>[
-          BaseTextFormField(
-            controller: _addressController,
-            keyboardType: TextInputType.multiline,
-            maxLines: null,
-            hintText: S.of(context).restore_address,
-          ),
-          Container(
-              padding: EdgeInsets.only(top: 20.0),
-              child: BaseTextFormField(
-                controller: _viewKeyController,
-                hintText: S.of(context).restore_view_key_private,
-              )),
-          Container(
-              padding: EdgeInsets.only(top: 20.0),
-              child: BaseTextFormField(
-                controller: _spendKeyController,
-                hintText: S.of(context).restore_spend_key_private,
-              )),
-          BlockchainHeightWidget(
-              key: _blockchainHeightKey,
-              onHeightChange: (height) {
-                // widget.walletRestorationFromKeysVM.height = height;
-                print(height);
-              }),
-        ]),
-      ),
-    );
-  }
-}

lib/src/screens/settings/security_backup_page.dart

@@ -8,6 +8,7 @@ import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arro
 import 'package:cake_wallet/src/screens/settings/widgets/settings_picker_cell.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
 import 'package:cake_wallet/src/widgets/standard_list.dart';
+import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cake_wallet/view_model/settings/security_settings_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
@@ -48,29 +49,30 @@ class SecurityBackupPage extends BasePage {
           ),
         ),
         StandardListSeparator(padding: EdgeInsets.symmetric(horizontal: 24)),
-        Observer(builder: (_) {
-          return SettingsSwitcherCell(
-              title: S.current.settings_allow_biometrical_authentication,
-              value: _securitySettingsViewModel.allowBiometricalAuthentication,
-              onValueChange: (BuildContext context, bool value) {
-                if (value) {
-                  _authService.authenticateAction(context,
-                      onAuthSuccess: (isAuthenticatedSuccessfully) async {
-                    if (isAuthenticatedSuccessfully) {
-                      if (await _securitySettingsViewModel.biometricAuthenticated()) {
+        if (DeviceInfo.instance.isMobile)
+          Observer(builder: (_) {
+            return SettingsSwitcherCell(
+                title: S.current.settings_allow_biometrical_authentication,
+                value: _securitySettingsViewModel.allowBiometricalAuthentication,
+                onValueChange: (BuildContext context, bool value) {
+                  if (value) {
+                    _authService.authenticateAction(context,
+                        onAuthSuccess: (isAuthenticatedSuccessfully) async {
+                      if (isAuthenticatedSuccessfully) {
+                        if (await _securitySettingsViewModel.biometricAuthenticated()) {
+                          _securitySettingsViewModel
+                              .setAllowBiometricalAuthentication(isAuthenticatedSuccessfully);
+                        }
+                      } else {
                         _securitySettingsViewModel
                             .setAllowBiometricalAuthentication(isAuthenticatedSuccessfully);
                       }
-                    } else {
-                      _securitySettingsViewModel
-                          .setAllowBiometricalAuthentication(isAuthenticatedSuccessfully);
-                    }
-                  });
-                } else {
-                  _securitySettingsViewModel.setAllowBiometricalAuthentication(value);
-                }
-              });
-        }),
+                    });
+                  } else {
+                    _securitySettingsViewModel.setAllowBiometricalAuthentication(value);
+                  }
+                });
+          }),
         Observer(builder: (_) {
           return SettingsPickerCell<PinCodeRequiredDuration>(
             title: S.current.require_pin_after,