Merge pull request #1102 from gre/fix/1099

Fixes #1099

src/components/modals/Send/steps/01-step-amount.js

@@ -45,6 +45,7 @@ export default ({
       {account &&
         bridge &&
         transaction && (
+          <Fragment key={account.id}>
             <RecipientField
               autoFocus={openedFromAccount}
               account={account}
@@ -53,38 +54,28 @@ export default ({
               onChangeTransaction={onChangeTransaction}
               t={t}
             />
-        )}
 
-      {account &&
-        bridge &&
-        transaction && (
             <AmountField
-            key={account.id}
               account={account}
               bridge={bridge}
               transaction={transaction}
               onChangeTransaction={onChangeTransaction}
               t={t}
             />
-        )}
 
-      {account &&
+            {FeesField && (
-        bridge &&
-        transaction &&
-        FeesField && (
               <FeesField account={account} value={transaction} onChange={onChangeTransaction} />
             )}
 
-      {account &&
+            {AdvancedOptionsField && (
-        bridge &&
-        transaction &&
-        AdvancedOptionsField && (
               <AdvancedOptionsField
                 account={account}
                 value={transaction}
                 onChange={onChangeTransaction}
               />
             )}
+          </Fragment>
+        )}
     </Box>
   )
 }