diff --git a/lib/src/screens/exchange_trade/exchange_trade_page.dart b/lib/src/screens/exchange_trade/exchange_trade_page.dart index 26851d248..e43b8d8f1 100644 --- a/lib/src/screens/exchange_trade/exchange_trade_page.dart +++ b/lib/src/screens/exchange_trade/exchange_trade_page.dart @@ -227,7 +227,7 @@ class ExchangeTradeState extends State { final sendingState = widget.exchangeTradeViewModel.sendViewModel.state; - return trade.from == CryptoCurrency.xmr && + return widget.exchangeTradeViewModel.isSendable && !(sendingState is TransactionCommitted) ? LoadingPrimaryButton( isDisabled: trade.inputAddress == null || @@ -235,9 +235,7 @@ class ExchangeTradeState extends State { isLoading: sendingState is IsExecutingState, onPressed: () => widget.exchangeTradeViewModel.confirmSending(), - text: trade.provider == ExchangeProviderDescription.xmrto - ? S.of(context).confirm - : S.of(context).send_xmr, + text: S.of(context).confirm, color: Theme.of(context).accentTextTheme.body2.color, textColor: Colors.white) : Offstage(); diff --git a/lib/src/screens/send/send_page.dart b/lib/src/screens/send/send_page.dart index 26955c13c..083b28ebe 100644 --- a/lib/src/screens/send/send_page.dart +++ b/lib/src/screens/send/send_page.dart @@ -133,7 +133,8 @@ class SendPage extends BasePage { if (uri != null) { address = uri.path; - amount = uri.queryParameters['tx_amount']; + amount = uri.queryParameters['tx_amount'] ?? + uri.queryParameters['amount']; } else { address = uri.toString(); } @@ -750,8 +751,7 @@ class SendPage extends BasePage { } Future _setTransactionPriority(BuildContext context) async { - final items = - TransactionPriority.forWalletType(sendViewModel.walletType); + final items = TransactionPriority.forWalletType(sendViewModel.walletType); final selectedItem = items.indexOf(sendViewModel.transactionPriority); await showPopUp( diff --git a/lib/src/screens/send/send_template_page.dart b/lib/src/screens/send/send_template_page.dart index b53117309..e84751fbe 100644 --- a/lib/src/screens/send/send_template_page.dart +++ b/lib/src/screens/send/send_template_page.dart @@ -113,7 +113,8 @@ class SendTemplatePage extends BasePage { if (uri != null) { address = uri.path; - amount = uri.queryParameters['tx_amount']; + amount = uri.queryParameters['tx_amount'] ?? + uri.queryParameters['amount']; } else { address = uri.toString(); }