Merge pull request #1391 from LedgerHQ/master

Master

package.json

@@ -3,7 +3,7 @@
   "productName": "Ledger Live",
   "description": "Ledger Live - Desktop",
   "repository": "https://github.com/LedgerHQ/ledger-live-desktop",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "author": "Ledger",
   "license": "MIT",
   "scripts": {

src/components/RecipientAddress/index.js

@@ -85,27 +85,23 @@ class RecipientAddress extends PureComponent<Props, State> {
     const { onChange, withQrCode, value, ...rest } = this.props
     const { qrReaderOpened } = this.state
 
+    const renderRight = withQrCode ? (
+      <Right onClick={this.handleClickQrCode}>
+        <IconQrCode size={16} />
+        {qrReaderOpened && (
+          <Fragment>
+            <BackgroundLayer />
+            <WrapperQrCode>
+              <QRCodeCameraPickerCanvas onPick={this.handleOnPick} />
+            </WrapperQrCode>
+          </Fragment>
+        )}
+      </Right>
+    ) : null
+
     return (
       <Box relative justifyContent="center">
-        <Input
-          {...rest}
-          value={value}
-          withQrCode={withQrCode}
-          onChange={onChange}
-          renderRight={
-            <Right onClick={this.handleClickQrCode}>
-              <IconQrCode size={16} />
-              {qrReaderOpened && (
-                <Fragment>
-                  <BackgroundLayer />
-                  <WrapperQrCode>
-                    <QRCodeCameraPickerCanvas onPick={this.handleOnPick} />
-                  </WrapperQrCode>
-                </Fragment>
-              )}
-            </Right>
-          }
-        />
+        <Input {...rest} value={value} onChange={onChange} renderRight={renderRight} />
       </Box>
     )
   }

src/components/modals/Send/fields/RecipientField.js

@@ -79,7 +79,7 @@ class RecipientField<Transaction> extends Component<Props<Transaction>, { isVali
         />
         <RecipientAddress
           autoFocus={autoFocus}
-          withQrCode
+          withQrCode={false}
           error={
             !value || isValid
               ? null