Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2024-11-17 09:47:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #115 from cake-tech/CAKE-103-change-refund-address-position-on-exchange-screen

Browse source 
Cake 103 change refund address position on exchange screen
This commit is contained in:
M 2020-10-06 14:40:41 +03:00
commit 7aacfb55fa
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/src/screens/exchange/exchange_page.dart
View file

@ -173,6 +173,7 @@ class ExchangePage extends BasePage {
initialIsAddressEditable: initialIsAddressEditable:
exchangeViewModel.isDepositAddressEnabled, exchangeViewModel.isDepositAddressEnabled,
isAmountEstimated: false, isAmountEstimated: false,
hasRefundAddress: true,
currencies: CryptoCurrency.all, currencies: CryptoCurrency.all,
onCurrencySelected: (currency) => onCurrencySelected: (currency) =>
exchangeViewModel.changeDepositCurrency( exchangeViewModel.changeDepositCurrency(

28
lib/src/screens/exchange/widgets/exchange_card.dart
View file

@ -18,6 +18,7 @@ class ExchangeCard extends StatefulWidget {
this.initialIsAmountEditable, this.initialIsAmountEditable,
this.initialIsAddressEditable, this.initialIsAddressEditable,
this.isAmountEstimated, this.isAmountEstimated,
this.hasRefundAddress = false,
this.currencies, this.currencies,
this.onCurrencySelected, this.onCurrencySelected,
this.imageArrow, this.imageArrow,
@ -38,6 +39,7 @@ class ExchangeCard extends StatefulWidget {
final bool initialIsAmountEditable; final bool initialIsAmountEditable;
final bool initialIsAddressEditable; final bool initialIsAddressEditable;
final bool isAmountEstimated; final bool isAmountEstimated;
final bool hasRefundAddress;
final Image imageArrow; final Image imageArrow;
final Color currencyButtonColor; final Color currencyButtonColor;
final Color addressButtonsColor; final Color addressButtonsColor;
@ -228,23 +230,25 @@ class ExchangeCardState extends State<ExchangeCard> {
: Offstage(), : Offstage(),
]), ]),
), ),
_isAddressEditable !_isAddressEditable && widget.hasRefundAddress
? Offstage() ? Padding(
: Padding( padding: EdgeInsets.only(top: 20),
padding: EdgeInsets.only(top: 20), child: Text(
child: Text( S.of(context).refund_address,
S.of(context).refund_address, style: TextStyle(
style: TextStyle( fontSize: 14,
fontSize: 14, fontWeight: FontWeight.w500,
fontWeight: FontWeight.w500, color:
color: Theme.of(context).textTheme.subhead.decorationColor),
Theme.of(context).textTheme.subhead.decorationColor), ))
)), : Offstage(),
_isAddressEditable _isAddressEditable
? Padding( ? Padding(
padding: EdgeInsets.only(top: 20), padding: EdgeInsets.only(top: 20),
child: AddressTextField( child: AddressTextField(
controller: addressController, controller: addressController,
placeholder: widget.hasRefundAddress
? S.of(context).refund_address : null,
options: [ options: [
AddressTextFieldOption.paste, AddressTextFieldOption.paste,
AddressTextFieldOption.qrCode, AddressTextFieldOption.qrCode,