CAKE-217 | merged 4.1.0 branch into current and resolved problems

4 years ago · dcb892b24c
parent 9a2794fc7c
commit dcb892b24c
2 changed files with 8 additions and 4 deletions
--- 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()
                          ]),
--- 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(