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

Cake 103 change refund address position on exchange screen

lib/src/screens/exchange/exchange_page.dart

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

lib/src/screens/exchange/widgets/exchange_card.dart

@@ -18,6 +18,7 @@ class ExchangeCard extends StatefulWidget {
       this.initialIsAmountEditable,
       this.initialIsAddressEditable,
       this.isAmountEstimated,
+      this.hasRefundAddress = false,
       this.currencies,
       this.onCurrencySelected,
       this.imageArrow,
@@ -38,6 +39,7 @@ class ExchangeCard extends StatefulWidget {
   final bool initialIsAmountEditable;
   final bool initialIsAddressEditable;
   final bool isAmountEstimated;
+  final bool hasRefundAddress;
   final Image imageArrow;
   final Color currencyButtonColor;
   final Color addressButtonsColor;
@@ -228,23 +230,25 @@ class ExchangeCardState extends State<ExchangeCard> {
                 : 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
             ? Padding(
                 padding: EdgeInsets.only(top: 20),
                 child: AddressTextField(
                   controller: addressController,
+                  placeholder: widget.hasRefundAddress
+                      ? S.of(context).refund_address : null,
                   options: [
                     AddressTextFieldOption.paste,
                     AddressTextFieldOption.qrCode,