Merge branch 'main' into CAKE-278-implement-fixed-rate-flow-for-changenow

This commit is contained in:
M
2021-03-01 19:34:15 +02:00
19 changed files with 217 additions and 80 deletions
@@ -28,9 +28,11 @@ void showInformation(
final information = exchangeTradeViewModel.isSendable
? S.current.exchange_result_confirm(
trade.amount ?? fetchingLabel, trade.from.toString(), walletName)
trade.amount ?? fetchingLabel, trade.from.toString(), walletName) +
exchangeTradeViewModel.extraInfo
: S.current.exchange_result_description(
trade.amount ?? fetchingLabel, trade.from.toString());
trade.amount ?? fetchingLabel, trade.from.toString()) +
exchangeTradeViewModel.extraInfo;
showPopUp<void>(
context: context,
@@ -148,6 +150,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
padding: EdgeInsets.all(5),
decoration: BoxDecoration(
border: Border.all(
width: 3,
color: Theme.of(context)
.accentTextTheme
.subtitle
@@ -48,6 +48,7 @@ class QRWidget extends StatelessWidget {
padding: EdgeInsets.all(5),
decoration: BoxDecoration(
border: Border.all(
width: 3,
color: Theme.of(context).accentTextTheme.
display3.backgroundColor
)