Merge pull request #918 from BlueWallet/fix

Fix

ios/Podfile.lock

@@ -210,6 +210,8 @@ PODS:
     - React
   - react-native-slider (2.0.8):
     - React
+  - react-native-viewpager (3.3.0):
+    - React
   - react-native-webview (6.11.1):
     - React
   - React-RCTActionSheet (0.61.5):
@@ -251,7 +253,7 @@ PODS:
     - React
   - RemobileReactNativeQrcodeLocalImage (1.0.4):
     - React
-  - RNCAsyncStorage (1.6.2):
+  - RNCAsyncStorage (1.7.1):
     - React
   - RNDefaultPreference (1.4.1):
     - React
@@ -265,13 +267,13 @@ PODS:
     - React
   - RNQuickAction (0.3.13):
     - React
-  - RNRate (1.0.1):
+  - RNRate (1.1.10):
     - React
   - RNReactNativeHapticFeedback (1.9.0):
     - React
   - RNSecureKeyStore (1.0.0):
     - React
-  - RNSentry (1.2.1):
+  - RNSentry (1.3.1):
     - React
     - Sentry (~> 4.4.0)
   - RNShare (2.0.0):
@@ -319,6 +321,7 @@ DEPENDENCIES:
   - react-native-image-picker (from `../node_modules/react-native-image-picker`)
   - react-native-randombytes (from `../node_modules/react-native-randombytes`)
   - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
+  - "react-native-viewpager (from `../node_modules/@react-native-community/viewpager`)"
   - react-native-webview (from `../node_modules/react-native-webview`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
   - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
@@ -340,7 +343,7 @@ DEPENDENCIES:
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
   - RNHandoff (from `../node_modules/react-native-handoff`)
   - RNQuickAction (from `../node_modules/react-native-quick-actions`)
-  - RNRate (from `../node_modules/react-native-rate/ios`)
+  - RNRate (from `../node_modules/react-native-rate`)
   - RNReactNativeHapticFeedback (from `../node_modules/react-native-haptic-feedback`)
   - RNSecureKeyStore (from `../node_modules/react-native-secure-key-store/ios`)
   - "RNSentry (from `../node_modules/@sentry/react-native`)"
@@ -407,6 +410,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-randombytes"
   react-native-slider:
     :path: "../node_modules/@react-native-community/slider"
+  react-native-viewpager:
+    :path: "../node_modules/@react-native-community/viewpager"
   react-native-webview:
     :path: "../node_modules/react-native-webview"
   React-RCTActionSheet:
@@ -448,7 +453,7 @@ EXTERNAL SOURCES:
   RNQuickAction:
     :path: "../node_modules/react-native-quick-actions"
   RNRate:
-    :path: "../node_modules/react-native-rate/ios"
+    :path: "../node_modules/react-native-rate"
   RNReactNativeHapticFeedback:
     :path: "../node_modules/react-native-haptic-feedback"
   RNSecureKeyStore:
@@ -497,6 +502,7 @@ SPEC CHECKSUMS:
   react-native-image-picker: 3637d63fef7e32a230141ab4660d3ceb773c824f
   react-native-randombytes: 991545e6eaaf700b4ee384c291ef3d572e0b2ca8
   react-native-slider: b2f361499888302147205f17f6fffa921a7bda70
+  react-native-viewpager: 118e65d8c65c56fe48d12a35cdcf1fe7e027a366
   react-native-webview: f11ac6c8bcaba5b71ddda1c12a10c8ea059b080f
   React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76
   React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360
@@ -510,17 +516,17 @@ SPEC CHECKSUMS:
   ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd
   ReactNativePrivacySnapshot: cc295e45dc22810e9ff2c93380d643de20a77015
   RemobileReactNativeQrcodeLocalImage: 57aadc12896b148fb5e04bc7c6805f3565f5c3fa
-  RNCAsyncStorage: 5ae4d57458804e99f73d427214442a6b10a53856
+  RNCAsyncStorage: 8539fc80a0075fcc9c8e2dff84cd22dc5bf1dacf
   RNDefaultPreference: 12d246dd2222e66dadcd76cc1250560663befc3a
   RNDeviceInfo: 12faae605ba42a1a5041c3c41a77834bc23f049d
   RNFS: 90d1a32d3bc8f75cc7fc3dd2f67506049664346b
   RNGestureHandler: 911d3b110a7a233a34c4f800e7188a84b75319c6
   RNHandoff: d3b0754cca3a6bcd9b25f544f733f7f033ccf5fa
   RNQuickAction: 6d404a869dc872cde841ad3147416a670d13fa93
-  RNRate: 29be49c24b314c4e8ec09d848c3965f61cb0be47
+  RNRate: d44a8bca6ee08f5d890ecccddaec2810955ffbb3
   RNReactNativeHapticFeedback: 2566b468cc8d0e7bb2f84b23adc0f4614594d071
   RNSecureKeyStore: f1ad870e53806453039f650720d2845c678d89c8
-  RNSentry: 9b1d983b2d5d1c215ba6490348fd2a4cc23a8a9d
+  RNSentry: 6458ba85aa3f8ae291abed4f72abbd7080839c71
   RNShare: 8b171d4b43c1d886917fdd303bf7a4b87167b05c
   RNSVG: 8ba35cbeb385a52fd960fd28db9d7d18b4c2974f
   RNVectorIcons: 0bb4def82230be1333ddaeee9fcba45f0b288ed4

screen/wallets/list.js

@@ -337,32 +337,32 @@ export default class WalletsList extends Component {
       return <BlueLoading />;
     }
     return (
-      <View style={{ flex: 1, backgroundColor: '#000000' }} testID="WalletsList" accessible>
+      <SafeBlueArea>
-        <NavigationEvents
+        <View style={{ flex: 1, backgroundColor: '#000000' }} testID="WalletsList" accessible>
-          onDidFocus={() => {
+          <NavigationEvents
-            this.redrawScreen();
+            onDidFocus={() => {
-            this.setState({ cameraPreviewIsPaused: this.state.viewPagerIndex === 1 || this.viewPagerRef.current.index === undefined });
+              this.redrawScreen();
-          }}
+              this.setState({ cameraPreviewIsPaused: this.state.viewPagerIndex === 1 || this.viewPagerRef.current.index === undefined });
-          onWillBlur={() => this.setState({ cameraPreviewIsPaused: true })}
+            }}
-        />
+            onWillBlur={() => this.setState({ cameraPreviewIsPaused: true })}
-        <ScrollView contentContainerStyle={{ flex: 1 }}>
+          />
-          <ViewPager
+          <ScrollView contentContainerStyle={{ flex: 1 }}>
-            style={styles.wrapper}
+            <ViewPager
-            onPageSelected={this.onPageSelected}
+              style={styles.wrapper}
-            initialPage={1}
+              onPageSelected={this.onPageSelected}
-            ref={this.viewPagerRef}
+              initialPage={1}
-            showPageIndicator={false}
+              ref={this.viewPagerRef}
-          >
+              showPageIndicator={false}
-            <View style={styles.scanQRWrapper}>
+            >
-              <ScanQRCode
+              <View style={styles.scanQRWrapper}>
-                cameraPreviewIsPaused={this.state.cameraPreviewIsPaused}
+                <ScanQRCode
-                onBarScanned={this.onBarScanned}
+                  cameraPreviewIsPaused={this.state.cameraPreviewIsPaused}
-                showCloseButton={false}
+                  onBarScanned={this.onBarScanned}
-                initialCameraStatusReady={false}
+                  showCloseButton={false}
-                launchedBy={this.props.navigation.state.routeName}
+                  initialCameraStatusReady={false}
-              />
+                  launchedBy={this.props.navigation.state.routeName}
-            </View>
+                />
-            <SafeBlueArea>
+              </View>
               <View style={styles.walletsListWrapper}>
                 {this.renderNavigationHeader()}
                 <ScrollView
@@ -423,10 +423,10 @@ export default class WalletsList extends Component {
                   </BlueList>
                 </ScrollView>
               </View>
-            </SafeBlueArea>
+            </ViewPager>
-          </ViewPager>
+          </ScrollView>
-        </ScrollView>
+        </View>
-      </View>
+      </SafeBlueArea>
     );
   }
 }