diff --git a/src/components/RecipientAddress/index.js b/src/components/RecipientAddress/index.js
index 450ac44f..745ca3b0 100644
--- a/src/components/RecipientAddress/index.js
+++ b/src/components/RecipientAddress/index.js
@@ -45,7 +45,7 @@ const BackgroundLayer = styled(Box)`
 type Props = {
   value: string,
   // return false if it can't be changed (invalid info)
-  onChange: (string, { amount?: number, currency?: CryptoCurrency }) => ?boolean,
+  onChange: (string, ?{ amount?: number, currency?: CryptoCurrency }) => ?boolean,
   withQrCode: boolean,
 }
 
diff --git a/src/components/modals/Send/01-step-amount.js b/src/components/modals/Send/01-step-amount.js
index e9f6bbf6..b0efaec3 100644
--- a/src/components/modals/Send/01-step-amount.js
+++ b/src/components/modals/Send/01-step-amount.js
@@ -17,6 +17,7 @@ const AccountField = ({ onChange, value, t }: *) => (
   </Box>
 )
 
+// TODO we should use isRecipientValid & provide a feedback to user
 const RecipientField = ({ bridge, account, transaction, onChangeTransaction, t }: *) => (
   <Box flow={1}>
     <Label>
@@ -26,9 +27,8 @@ const RecipientField = ({ bridge, account, transaction, onChangeTransaction, t }
     <RecipientAddress
       withQrCode
       value={bridge.getTransactionRecipient(account, transaction)}
-      onChange={(recipient, { amount, currency }) => {
-        console.log(recipient, amount, currency, account.currency)
-        // TODO we should use isRecipientValid & provide a feedback to user
+      onChange={(recipient, maybeExtra) => {
+        const { amount, currency } = maybeExtra || {}
         if (currency && currency.scheme !== account.currency.scheme) return false
         let t = transaction
         if (amount) {