diff --git a/App.js b/App.js
index 56319ac47..7229c67c7 100644
--- a/App.js
+++ b/App.js
@@ -336,7 +336,7 @@ const App = () => {
           <Notifications onProcessNotifications={processPushNotifications} />
           {renderClipboardContentModal()}
         </NavigationContainer>
-      {walletsInitialized && !isDesktop && <WatchConnectivity />}
+        {walletsInitialized && !isDesktop && <WatchConnectivity />}
       </View>
       <DeviceQuickActions />
       <WalletImport />
diff --git a/screen/receive/details.js b/screen/receive/details.js
index 1550cc372..08bd25f25 100644
--- a/screen/receive/details.js
+++ b/screen/receive/details.js
@@ -164,29 +164,31 @@ const ReceiveDetails = () => {
             </>
           )}
           <TouchableWithoutFeedback style={styles.qrCodeContainer} testID="BitcoinAddressQRCodeContainer" onLongPress={showToolTipMenu}>
-            <ToolTipMenu
-              ref={toolTip}
-              anchorRef={qrCode}
-              actions={[
-                {
-                  id: 'shareQRCode',
-                  text: loc.receive.details_share,
-                  onPress: handleShareQRCode,
-                },
-              ]}
-            />
+            <>
+              <ToolTipMenu
+                ref={toolTip}
+                anchorRef={qrCode}
+                actions={[
+                  {
+                    id: 'shareQRCode',
+                    text: loc.receive.details_share,
+                    onPress: handleShareQRCode,
+                  },
+                ]}
+              />
 
-            <QRCode
-              value={bip21encoded}
-              logo={require('../../img/qr-code.png')}
-              size={(is.ipad() && 300) || 300}
-              logoSize={90}
-              color="#000000"
-              logoBackgroundColor={colors.brandingColor}
-              backgroundColor="#FFFFFF"
-              ecl="H"
-              getRef={qrCode}
-            />
+              <QRCode
+                value={bip21encoded}
+                logo={require('../../img/qr-code.png')}
+                size={(is.ipad() && 300) || 300}
+                logoSize={90}
+                color="#000000"
+                logoBackgroundColor={colors.brandingColor}
+                backgroundColor="#FFFFFF"
+                ecl="H"
+                getRef={qrCode}
+              />
+            </>
           </TouchableWithoutFeedback>
           <BlueCopyTextToClipboard text={isCustom ? bip21encoded : address} />
         </View>
diff --git a/screen/wallets/details.js b/screen/wallets/details.js
index e32d60cd5..75f0cf610 100644
--- a/screen/wallets/details.js
+++ b/screen/wallets/details.js
@@ -14,6 +14,7 @@ import {
   Linking,
   StyleSheet,
   StatusBar,
+  ScrollView,
   PermissionsAndroid,
   InteractionManager,
   ActivityIndicator,
@@ -33,7 +34,6 @@ import {
   MultisigHDWallet,
   HDAezeedWallet,
 } from '../../class';
-import { ScrollView } from 'react-native-gesture-handler';
 import loc from '../../loc';
 import { useTheme, useRoute, useNavigation } from '@react-navigation/native';
 import RNFS from 'react-native-fs';
diff --git a/screen/wallets/pleaseBackupLNDHub.js b/screen/wallets/pleaseBackupLNDHub.js
index af7bf9064..9a71f989b 100644
--- a/screen/wallets/pleaseBackupLNDHub.js
+++ b/screen/wallets/pleaseBackupLNDHub.js
@@ -1,8 +1,7 @@
 import React, { useCallback, useContext, useEffect, useState } from 'react';
 import { useNavigation, useRoute, useTheme } from '@react-navigation/native';
-import { View, StyleSheet, BackHandler, StatusBar } from 'react-native';
+import { View, StyleSheet, ScrollView, BackHandler, StatusBar } from 'react-native';
 import QRCode from 'react-native-qrcode-svg';
-import { ScrollView } from 'react-native-gesture-handler';
 
 import { BlueButton, BlueCopyTextToClipboard, BlueSpacing20, BlueTextCentered, SafeBlueArea } from '../../BlueComponents';
 import navigationStyle from '../../components/navigationStyle';