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

…@benisgold/statedump

.detoxrc.js

@@ -6,7 +6,6 @@ module.exports = {
       _: ['e2e'],
     },
   },
-
   devices: {
     'ios.simulator': {
       type: 'ios.simulator',
@@ -23,7 +22,6 @@ module.exports = {
       device: { avdName: 'Pixel_7_Pro_API_34' },
     },
   },
-
   apps: {
     'ios.release': {
       type: 'ios.app',
@@ -48,17 +46,25 @@ module.exports = {
       build: 'cd ./android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug && cd ..',
     },
   },
-
   configurations: {
     'ios.sim.release': {
       app: 'ios.release',
       device: 'ios.simulator',
+      artifacts: {
+        plugins: {
+          screenshot: 'failing',
+        },
+      },
     },
     'ios.sim.debug': {
       app: 'ios.debug',
       device: 'ios.simulator',
+      artifacts: {
+        plugins: {
+          screenshot: 'failing',
+        },
+      },
     },
-
     'android.emu.release': {
       app: 'android.release',
       device: 'android.emulator',

.eslintignore

@@ -3,6 +3,7 @@ src/react-native-animated-charts/Example/node_modules/*
 src/react-native-animated-charts/Example/*
 patches/reanimated/*
 ios/*
+android/*
 node_modules/*
 ./node_modules/**
 **/node_modules/*
@@ -15,3 +16,6 @@ jest.config.js
 .detoxrc.js
 __generated__
 coverage
+src/browser
+src/__swaps__/README.md
+InjectedJSBundle.js

.eslintrc.js

@@ -37,5 +37,7 @@ module.exports = {
         ],
       },
     ],
+    'jest/expect-expect': 'off',
+    'jest/no-disabled-tests': 'off',
   },
 };

.github/workflows/macstadium-clear-cache-all-instances.yml

@@ -1,36 +1,40 @@
-# This is a basic workflow to help you get started with Actions
-
 name: Clear macstadium cache (All instances)
-
-# Controls when the workflow will run
 on: [ workflow_dispatch]
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   clear-cache-ci-1:
     runs-on: ["CI-1"]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/clear-cache
   clear-cache-ci-2:
     runs-on: ["CI-2"]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/clear-cache
   clear-cache-ci-3:
     runs-on: ["CI-3"]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/clear-cache
   clear-cache-ci-4:
     runs-on: ["CI-4"]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/clear-cache
   clear-cache-ci-5:
     runs-on: ["CI-5"]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/clear-cache
+  clear-cache-ci-6:
+    runs-on: ["CI-6"]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/clear-cache
+  clear-cache-ci-7:
+    runs-on: ["CI-7"]
+    steps:
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/clear-cache
 
 

.github/workflows/macstadium-e2e.yml

@@ -1,11 +1,6 @@
-# This is a basic workflow to help you get started with Actions
-
 name: iOS e2e tests
 
-# Controls when the workflow will run
 on: [pull_request, workflow_dispatch]
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "ios-e2e"
   ios-e2e:
@@ -16,32 +11,24 @@ jobs:
       group: ${{ github.workflow }}-${{ github.ref }}
       cancel-in-progress: true
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up github keys
-        run:  echo 'hi 00' && git config core.sshCommand "ssh -i ~/.ssh/id_ed25519 -F /dev/null" &&  echo 'hi 0'
+        run:  git config core.sshCommand "ssh -i ~/.ssh/id_ed25519 -F /dev/null"
 
       - name: Set up ENV vars & scripts
         run: |
           # read local env vars
-          echo 'hi'
           source ~/.bashrc
-           echo 'hi 1'
           # fetch env vars
           git clone git@github.com:rainbow-me/rainbow-env.git
-           echo '2'
           # unpack dotenv
           mv rainbow-env/dotenv .env && rm -rf rainbow-env 
           # run CI scripts
-           echo 'hi 3'
           eval $CI_SCRIPTS
-           echo 'hi 4'
           # tweak dotenv for e2e 
           sed -i''-e "s/\IS_TESTING=false/IS_TESTING=true/" .env && rm -f .env-e
-           echo 'hi 5'
       - name: Install deps via Yarn
         run: yarn setup-ci
 
@@ -60,8 +47,19 @@ jobs:
       - name: Rebuild detox cache
         run: ./node_modules/.bin/detox clean-framework-cache && ./node_modules/.bin/detox build-framework-cache
 
-      - name: Build the app in Release mode
+      - name: Remove old Detox artifacts
+        run: rm -rf ./artifacts/
+
+      - name: Build the app in release mode
         run: ./node_modules/.bin/detox build --configuration ios.sim.release
 
       - name: Run iOS e2e tests
         run: ./node_modules/.bin/detox test -R 5 --configuration ios.sim.release --forceExit --bail
+
+      - name: Upload Test Artifacts
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: detox-artifacts
+          path: artifacts/**
+

.gitignore

@@ -79,6 +79,7 @@ src/screens/ExamplePage.js
 
 #e2e output
 e2e/logs/*/*.xml
+artifacts/*
 
 # android playstore credentials
 pc-api-8090318172169087080-31-b8ee34328314.json
@@ -92,6 +93,7 @@ rainbow-scripts
 
 # Patches
 patches/react-native-webview+13.2.3.patch
+patches/react-native-webview+13.7.0.patch
 
 .eslintcache
 
@@ -111,4 +113,10 @@ __generated__/
 coverage
 
 # VSCode
-.vscode/
+.vscode/
+
+# Zed
+.zed/
+
+# Webpack
+src/browser/InjectedJSBundle.js.LICENSE.txt

.prettierignore

@@ -10,3 +10,4 @@ rainbow-scripts
 .vscode
 __generated__
 coverage
+InjectedJSBundle.js

CHANGELOG.md

@@ -15,6 +15,71 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 
 ### Fixed
 
+## [1.9.19] (https://github.com/rainbow-me/rainbow/releases/tag/v1.9.19)
+
+### Added
+
+- Added Blast to simplehash (#5492)
+- Initialize new swaps configuration (#5498)
+- Initial swaps work (#5500)
+
+### Changed
+
+- Swipe navigator performance refactor (#5479)
+- Transaction and assets cleanup (#5459)
+- Migrated query persist from AsyncStorage to mmkv (#5404, #5524)
+- Webview refactor (#5499)
+- Replaced Segment (#5474)
+- Low fee's on first estimate (#5503)
+- Upgraded reservoir (#5514)
+- Bump reanimated to v3.8.0 (#5517)
+- Changed default theme from light to system (#5518)
+- Updated logic for wallet connect SignTransactionSheet (#5471)
+
+### Fixed
+
+- Fixed reanimated and RNGH imports (#5480)
+- Fixed layout shift for mints carousel card (#5485)
+- Fixed android clipboard alerts (#5486)
+- Fixed weekly earnings points breakdown (#5469)
+- Fixed tappable area on wallet name (#5496)
+- Fixed null deconstruction for wallet connect (#5493)
+- Fixed dark mode theme which impacted ENS confirmation screen (#5502)
+- Fixed initiating render on NFT offers (#5501)
+
+## [1.9.18] (https://github.com/rainbow-me/rainbow/releases/tag/v1.9.18)
+
+### Added
+
+- Added ability to report NFT as spam to simplehash (#5434)
+- Added fallback icons for contract interactions where we may not have nft images (#5456)
+- Added support for Avalanche (#5430)
+- Added support for Blast (#5463)
+
+### Changed
+
+- Removed native advanced settings as dev settings is newly preferred (#5416)
+- App icon refactor (#5444)
+- null safety placed on input filed focus (#5446)
+- Points referrals card refactor (#5367)
+- Removed duplicate rows in sign transaction sheet (#5451)
+- Upgrade reanimated (#5200)
+- Bumped dependencies for Wallet Connect (#5400)
+- Disabled and removed Flipper (#5464)
+- Removed rn-worklet-core package (#5465)
+
+### Fixed
+
+- Fixed rainbow animation on home screen (#5440)
+- Fixed crash when tapping network info button on L2 sends (#5429)
+- Fixed identify calls for analytics (#5442)
+- Polished pending transaction details UI (#5441)
+- Fixed ability to save NFT as an image on device (#5447)
+- Increased number of pixel difference needed to qualify as non-gesture mode navigation (#5460)
+- Fixed approval number formatting (#5457)
+- Fixed mint pending label (#5455)
+- Fixed a null response that was impacting dapps using viem/wagmi (#5454)
+
 ## [1.9.17] (https://github.com/rainbow-me/rainbow/releases/tag/v1.9.17)
 
 ### Added

CODEOWNERS

@@ -63,3 +63,9 @@ src/App.js  @benisgold @skylarbarrera @jinchung
 metro.config.js @skylarbarrera @benisgold 
 metro.transform.js @skylarbarrera @benisgold 
 react-native.config.js  @skylarbarrera @benisgold
+
+# DAPP BROWSER
+src/browser @brunobar79 @skylarbarrera @benisgold
+src/screens/dapp-browser @brunobar79 @skylarbarrera @benisgold
+src/components/DappBrowser @brunobar79 @skylarbarrera @benisgold
+