Merge branch 'develop' of github.com:rainbow-me/rainbow into develop

* 'develop' of github.com:rainbow-me/rainbow:
  Only hold the active tab ref in BrowserContext (#5579)
  Dapp browser: disable tab closing for empty state (#5573)
  Browser: fix ref assignment, back/forward navigation (#5578)
  Browser: fully eliminate reloading issues (#5576)
  browser: static trending dapps (#5561)
  bump swaps sdk (#5574)
  fix gitignore (#5571)
  bump (#5570)
  Fix browser context menu not updating (#5569)
  ⚡️ Fast browser (#5566)
  [APP-1049]: (feat): Backups V2 (#5310)
  fix: search by contract address (#5563)

.gitignore

@@ -92,8 +92,7 @@ ios/Extras.json
 rainbow-scripts
 
 # Patches
-patches/react-native-webview+13.2.3.patch
-patches/react-native-webview+13.7.0.patch
+patches/react-native-webview*
 
 .eslintcache
 

ios/Podfile.lock

@@ -11,6 +11,14 @@ PODS:
     - React-Core
     - SSZipArchive (~> 2.2.2)
   - DoubleConversion (1.1.6)
+  - FasterImage (1.3.4):
+    - FasterImage/Nuke (= 1.3.4)
+    - FasterImage/NukeUI (= 1.3.4)
+    - React-Core
+  - FasterImage/Nuke (1.3.4):
+    - React-Core
+  - FasterImage/NukeUI (1.3.4):
+    - React-Core
   - FBLazyVector (0.72.3)
   - FBReactNativeSpec (0.72.3):
     - RCT-Folly (= 2021.07.22.00)
@@ -581,7 +589,7 @@ PODS:
     - React-Core
   - react-native-view-shot (3.8.0):
     - React-Core
-  - react-native-webview (13.7.0):
+  - react-native-webview (13.8.2):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
   - react-native-widgetkit (1.0.9):
@@ -824,6 +832,7 @@ DEPENDENCIES:
   - BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
   - CodePush (from `../node_modules/react-native-code-push`)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
+  - "FasterImage (from `../node_modules/@candlefinance/faster-image`)"
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
   - Firebase
@@ -1004,6 +1013,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-code-push"
   DoubleConversion:
     :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
+  FasterImage:
+    :path: "../node_modules/@candlefinance/faster-image"
   FBLazyVector:
     :path: "../node_modules/react-native/Libraries/FBLazyVector"
   FBReactNativeSpec:
@@ -1242,6 +1253,7 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   CodePush: 9eddecce05cd10491e2673b259c85885a462be33
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
+  FasterImage: 283258273b862374eb2ede3ef9576149fd83deb3
   FBLazyVector: 4cce221dd782d3ff7c4172167bba09d58af67ccb
   FBReactNativeSpec: c6bd9e179757b3c0ecf815864fae8032377903ef
   Firebase: 07150e75d142fb9399f6777fa56a187b17f833a0
@@ -1324,7 +1336,7 @@ SPEC CHECKSUMS:
   react-native-version-number: b415bbec6a13f2df62bf978e85bc0d699462f37f
   react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253
   react-native-view-shot: 6b7ed61d77d88580fed10954d45fad0eb2d47688
-  react-native-webview: 4e7d637b43eddec107016d316ae75f7063a3075c
+  react-native-webview: 19aba9db98e183484969202c1181a00159b7724b
   react-native-widgetkit: efb6680df237463bbe1be3a4d1a1578a1b0bb08f
   React-NativeModulesApple: c57f3efe0df288a6532b726ad2d0322a9bf38472
   React-perflogger: 6bd153e776e6beed54c56b0847e1220a3ff92ba5

package.json

@@ -64,6 +64,7 @@
   "dependencies": {
     "@bankify/react-native-animate-number": "0.2.1",
     "@bradgarropy/use-countdown": "1.4.1",
+    "@candlefinance/faster-image": "1.3.4",
     "@capsizecss/core": "3.0.0",
     "@ensdomains/address-encoder": "0.2.16",
     "@ensdomains/content-hash": "2.5.7",
@@ -98,7 +99,7 @@
     "@notifee/react-native": "5.6.0",
     "@rainbow-me/provider": "0.0.11",
     "@rainbow-me/react-native-animated-number": "0.0.2",
-    "@rainbow-me/swaps": "0.10.0",
+    "@rainbow-me/swaps": "0.12.0",
     "@react-native-async-storage/async-storage": "1.18.2",
     "@react-native-camera-roll/camera-roll": "5.7.1",
     "@react-native-clipboard/clipboard": "1.13.2",
@@ -272,7 +273,7 @@
     "react-native-video": "5.2.1",
     "react-native-view-shot": "3.8.0",
     "react-native-vision-camera": "3.6.4",
-    "react-native-webview": "13.7.0",
+    "react-native-webview": "13.8.2",
     "react-native-widgetkit": "1.0.9",
     "react-navigation-backhandler": "2.0.1",
     "react-primitives": "0.8.1",

src/__swaps__/screens/Swap/components/GestureHandlerV1Button.tsx

@@ -1,15 +1,16 @@
+import ConditionalWrap from 'conditional-wrap';
 import React from 'react';
 import { StyleProp, ViewProps, ViewStyle } from 'react-native';
 import { TapGestureHandler, TapGestureHandlerGestureEvent } from 'react-native-gesture-handler';
-import Animated, { useAnimatedGestureHandler } from 'react-native-reanimated';
+import Animated, { runOnJS, useAnimatedGestureHandler } from 'react-native-reanimated';
 import { ButtonPressAnimation } from '@/components/animations';
-import ConditionalWrap from 'conditional-wrap';
 import { IS_IOS } from '@/env';
 
 type GestureHandlerButtonProps = {
   children: React.ReactNode;
   disableButtonPressWrapper?: boolean;
   disabled?: boolean;
+  onPressJS?: () => void;
   onPressStartWorklet?: () => void;
   onPressWorklet?: () => void;
   pointerEvents?: ViewProps['pointerEvents'];
@@ -18,13 +19,19 @@ type GestureHandlerButtonProps = {
 };
 
 /**
- * @description This button runs its press functions directly on the UI thread,
- * which is useful when working with Reanimated, as it allows for the instant
- * manipulation of shared values without any dependence on the JS thread.
+ * @description This button can execute press functions directly on the UI thread,
+ * which is useful when working with Reanimated, as it allows for instantly
+ * manipulating shared values without any dependence on the JS thread.
  *
  * 👉 Intended for use with react-native-gesture-handler v1
  *
- * Its onPress props accept worklets, which need to be tagged with `'worklet';`
+ * ———
+ *
+ * 🔵 `onPressWorklet`
+ * -
+ * 🔵 `onPressStartWorklet`
+ * -
+ * - To execute code on the UI thread, pass a function tagged with `'worklet';`
  * like so:
  *
  * ```
@@ -33,11 +40,26 @@ type GestureHandlerButtonProps = {
  *    opacity.value = withTiming(1);
  *  };
  * ```
+ * ———
+ *
+ * 🟢 `onPressJS`
+ * -
+ * - If you need to simultaneously execute code on the JS thread, rather than
+ * using runOnJS within your worklet, you can pass a function via `onPressJS`:
+ *
+ * ```
+ * const [fromJSThread, setFromJSThread] = useState(false);
+ *
+ * const onPressJS = () => {
+ *   setFromJSThread(true);
+ * };
+ * ```
  */
 export function GestureHandlerV1Button({
   children,
   disableButtonPressWrapper = false,
   disabled = false,
+  onPressJS,
   onPressStartWorklet,
   onPressWorklet,
   pointerEvents = 'box-only',
@@ -50,24 +72,21 @@ export function GestureHandlerV1Button({
     },
     onActive: () => {
       if (onPressWorklet) onPressWorklet();
+      if (onPressJS) runOnJS(onPressJS)();
     },
   });
 
   return (
     <ConditionalWrap
-      condition={IS_IOS}
+      condition={IS_IOS && !disableButtonPressWrapper}
       wrap={children => (
-        <ButtonPressAnimation
-          disabled={disabled}
-          scaleTo={disableButtonPressWrapper ? 1 : scaleTo}
-          useLateHaptic={disableButtonPressWrapper}
-        >
+        <ButtonPressAnimation scaleTo={disabled ? 1 : scaleTo} useLateHaptic={disabled}>
           {children}
         </ButtonPressAnimation>
       )}
     >
       {/* @ts-expect-error Property 'children' does not exist on type */}
-      <TapGestureHandler onGestureEvent={pressHandler}>
+      <TapGestureHandler enabled={!disabled} onGestureEvent={pressHandler}>
         <Animated.View accessible accessibilityRole="button" pointerEvents={pointerEvents} style={style}>
           {children}
         </Animated.View>

src/__swaps__/screens/Swap/components/SearchInput.tsx

@@ -60,7 +60,7 @@ export const SearchInput = ({
                     handleExitSearch();
                     setIsFocused(false);
                   }}
-                  onChange={(value: string) => setQuery(value)}
+                  onChange={e => setQuery(e.nativeEvent.text)}
                   onFocus={() => {
                     handleFocusSearch();
                     setIsFocused(true);