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

OleksandrSobol committed Dec 18, 2020 at 21:24 UTC dcb892b24c89311b9a73f4eea092ba1e6799c55a
2 files changed +8 -4
lib/src/screens/dashboard/widgets/trade_row.dart
+4 -2
@@ -44,14 +44,16 @@ class TradeRow extends StatelessWidget {
44 style: TextStyle(
45 fontSize: 16,
46 fontWeight: FontWeight.w500,
47 - color: Colors.white
47 + color: Theme.of(context).accentTextTheme.
48 + display3.backgroundColor
49 )),
50 formattedAmount != null
51 ? Text(formattedAmount + ' ' + amountCrypto,
52 style: TextStyle(
53 fontSize: 16,
54 fontWeight: FontWeight.w500,
54 - color: Colors.white
55 + color: Theme.of(context).accentTextTheme.
56 + display3.backgroundColor
57 ))
58 : Container()
59 ]),
lib/src/screens/dashboard/widgets/transaction_raw.dart
+4 -2
@@ -57,12 +57,14 @@ class TransactionRow extends StatelessWidget {
57 style: TextStyle(
58 fontSize: 16,
59 fontWeight: FontWeight.w500,
60 - color: Colors.white)),
60 + color: Theme.of(context).accentTextTheme.
61 + display3.backgroundColor)),
62 Text(formattedAmount,
63 style: TextStyle(
64 fontSize: 16,
65 fontWeight: FontWeight.w500,
65 - color: Colors.white))
66 + color: Theme.of(context).accentTextTheme.
67 + display3.backgroundColor))
68 ]),
69 SizedBox(height: 5),
70 Row(