Merge branch 'main' of github.com:cake-tech/cake_wallet into release-4.2.4

lib/src/screens/buy/widgets/buy_list_item.dart

@@ -27,9 +27,10 @@ class BuyListItem extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final isSelected = selectedProvider?.description == provider.description;
+    final iconColor = isSelected ? Colors.white : Colors.black;
 
     final providerIcon = getBuyProviderIcon(provider.description,
-        isWhiteIconColor: isSelected);
+          iconColor: iconColor);
 
     final backgroundColor = isSelected
           ? Palette.greyBlueCraiola

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

@@ -1,9 +1,6 @@
 import 'package:cake_wallet/buy/buy_provider_description.dart';
 import 'package:cake_wallet/buy/get_buy_provider_icon.dart';
-import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/di.dart';
-import 'package:cake_wallet/store/settings_store.dart';
 
 class OrderRow extends StatelessWidget {
   OrderRow({
@@ -22,11 +19,10 @@ class OrderRow extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final currentTheme = getIt.get<SettingsStore>().currentTheme;
-    final isWhiteIconColor = currentTheme.type != ThemeType.light;
+    final iconColor =
+        Theme.of(context).primaryTextTheme.display4.backgroundColor;
 
-    final providerIcon = getBuyProviderIcon(provider,
-          isWhiteIconColor: isWhiteIconColor);
+    final providerIcon = getBuyProviderIcon(provider, iconColor: iconColor);
 
     return InkWell(
         onTap: onTap,

lib/src/screens/settings/widgets/settings_link_provider_cell.dart

@@ -7,6 +7,7 @@ class SettingsLinkProviderCell extends StandardListRow {
   SettingsLinkProviderCell(
       {@required String title,
         @required this.icon,
+        this.iconColor,
         @required this.link,
         @required this.linkTitle})
       : super(title: title, isSelected: false, onTap: (BuildContext context) => _launchUrl(link) );
@@ -14,10 +15,11 @@ class SettingsLinkProviderCell extends StandardListRow {
   final String icon;
   final String link;
   final String linkTitle;
+  final Color iconColor;
 
   @override
   Widget buildLeading(BuildContext context) =>
-      icon != null ? Image.asset(icon) : null;
+      icon != null ? Image.asset(icon, color: iconColor) : null;
 
   @override
   Widget buildTrailing(BuildContext context) => Text(linkTitle,

lib/src/screens/support/support_page.dart

@@ -19,6 +19,9 @@ class SupportPage extends BasePage {
 
   @override
   Widget body(BuildContext context) {
+    final iconColor =
+        Theme.of(context).accentTextTheme.display4.backgroundColor;
+
     return SectionStandardList(
         sectionCount: 1,
         itemCounter: (int _) => supportViewModel.items.length,
@@ -34,6 +37,7 @@ class SupportPage extends BasePage {
             return SettingsLinkProviderCell(
                 title: item.title,
                 icon: item.icon,
+                iconColor: item.hasIconColor ? iconColor : null,
                 link: item.link,
                 linkTitle: item.linkTitle);
           }