From dcb892b24c89311b9a73f4eea092ba1e6799c55a Mon Sep 17 00:00:00 2001
From: OleksandrSobol <dr.alexander.sobol@gmail.com>
Date: Fri, 18 Dec 2020 21:24:05 +0200
Subject: [PATCH] CAKE-217 | merged 4.1.0 branch into current and resolved
 problems

---
 lib/src/screens/dashboard/widgets/trade_row.dart       | 6 ++++--
 lib/src/screens/dashboard/widgets/transaction_raw.dart | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/src/screens/dashboard/widgets/trade_row.dart b/lib/src/screens/dashboard/widgets/trade_row.dart
index 3860b5010..449c4d016 100644
--- a/lib/src/screens/dashboard/widgets/trade_row.dart
+++ b/lib/src/screens/dashboard/widgets/trade_row.dart
@@ -44,14 +44,16 @@ class TradeRow extends StatelessWidget {
                                 style: TextStyle(
                                     fontSize: 16,
                                     fontWeight: FontWeight.w500,
-                                    color: Colors.white
+                                    color: Theme.of(context).accentTextTheme.
+                                    display3.backgroundColor
                                 )),
                             formattedAmount != null
                                 ? Text(formattedAmount + ' ' + amountCrypto,
                                 style: TextStyle(
                                     fontSize: 16,
                                     fontWeight: FontWeight.w500,
-                                    color: Colors.white
+                                    color: Theme.of(context).accentTextTheme.
+                                    display3.backgroundColor
                                 ))
                                 : Container()
                           ]),
diff --git a/lib/src/screens/dashboard/widgets/transaction_raw.dart b/lib/src/screens/dashboard/widgets/transaction_raw.dart
index 914579897..23a3eccec 100644
--- a/lib/src/screens/dashboard/widgets/transaction_raw.dart
+++ b/lib/src/screens/dashboard/widgets/transaction_raw.dart
@@ -57,12 +57,14 @@ class TransactionRow extends StatelessWidget {
                                 style: TextStyle(
                                     fontSize: 16,
                                     fontWeight: FontWeight.w500,
-                                    color: Colors.white)),
+                                    color: Theme.of(context).accentTextTheme.
+                                    display3.backgroundColor)),
                             Text(formattedAmount,
                                 style: TextStyle(
                                     fontSize: 16,
                                     fontWeight: FontWeight.w500,
-                                    color: Colors.white))
+                                    color: Theme.of(context).accentTextTheme.
+                                    display3.backgroundColor))
                           ]),
                       SizedBox(height: 5),
                       Row(