Merge branch 'develop' into swaps-deeplink

rainbow-me · Nov 25, 2024 · 9f83d34 · 9f83d34
2 parents 247d71c + 9209139
commit 9f83d34
Show file tree

Hide file tree

Showing 261 changed files with 2,088 additions and 11,236 deletions.
diff --git a/.github/workflows/macstadium-tests.yml b/.github/workflows/macstadium-tests.yml
@@ -117,7 +117,7 @@ jobs:
       cancel-in-progress: true
     permissions:
       contents: read
-    timeout-minutes: 60
+    timeout-minutes: 90
     needs: install-deps
     steps:
       - name: Checkout repo
@@ -170,4 +170,4 @@ jobs:
 
       - name: Detox iOS e2e tests
         run: |
-          ./scripts/run-retry-tests.sh 3
+          ./scripts/run-retry-tests.sh 3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,41 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 
 ### Fixed
 
+## [1.9.45] (https://github.com/rainbow-me/rainbow/releases/tag/v1.9.45)
+
+### Added
+
+- Upgraded to new notifications endpoint for notifications v2 (#6190, #6223, #6229, #6251)
+- Added option to sort NFTs by ascending and descending (#6068)
+- We added isHardwareWallet to swap analytic events (#6238)
+
+### Changed
+
+- Featured results now uses redirect_url for recents (#6203)
+- Removed direct usage of web3Provider (#6200)
+- Now using backend endpoint for determining output based quotes for Swaps v2 (#6212)
+- We now navigate back to last screen after swap confirmation (#6207)
+- ChainSelector row is now fixed at top of list in swaps v2 (#6206)
+- Removed all of WC v1 (#6214)
+- Removed unused references and did updates to ExplainSheet (#6222)
+- Removed Swaps v1 code (#6181, #6250)
+- Updated featured results to use native card styling (#6246)
+- We now exclude hardware wallet related transactions from TTS tracking (#6247)
+- We are now subtracting hidden assets from total wallet balances (#6205)
+- We converted discover screen content to typescript (#6226)
+
+### Fixed
+
+- Fixed broken context menus on asset expanded state in search results (#6209)
+- Fixed a bug with positions total value display (#6185)
+- Fixed CI build issues (#6232, #6225, #6244, #6248)
+- Fixed a crash with animated inputs (#6227)
+- Fixed a bug where balance would show as NaN value (#6239)
+- Fixed transaction details not showing native asset symbol but always showing ETH instead (#6245)
+- Fixed a bug where an empty account balances prevents a swap from being done (#6243)
+- Fixed a bug where Apecoin wasn’t being set as the inputAsset when set as the preferred network (#6252)
+- Fixed a bug where change wallet sheet was missing balance value (#6253)
+
 ## [1.9.44] (https://github.com/rainbow-me/rainbow/releases/tag/v1.9.44)
 
 ### Fixed

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -135,8 +135,8 @@ android {
         applicationId "me.rainbow"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 238
-        versionName "1.9.45"
+        versionCode 239
+        versionName "1.9.46"
         missingDimensionStrategy 'react-native-camera', 'general'
         renderscriptTargetApi 23
         renderscriptSupportModeEnabled true

diff --git a/bitrise.yml b/bitrise.yml
@@ -203,20 +203,8 @@ workflows:
                 set -x
                 # write your script here
                 touch .env
-                echo "DATA_ORIGIN=$DATA_ORIGIN" >> .env
-                echo "INFURA_PROJECT_ID=$INFURA_PROJECT_ID" >> .env
-                echo "INFURA_PROJECT_ID_DEV=$INFURA_PROJECT_ID_DEV" >> .env
-                echo "REACT_APP_SEGMENT_API_WRITE_KEY=$REACT_APP_SEGMENT_API_WRITE_KEY" >> .env
-                echo "DATA_API_KEY=$DATA_API_KEY" >> .env
-                echo "DATA_ENDPOINT=$DATA_ENDPOINT" >> .env
                 echo "SENTRY_ENDPOINT=$SENTRY_ENDPOINT" >> .env
                 echo "SENTRY_ENVIRONMENT=$SENTRY_ENVIRONMENT" >> .env
-                echo "WYRE_ENDPOINT=$WYRE_ENDPOINT" >> .env
-                echo "WYRE_ACCOUNT_ID=$WYRE_ACCOUNT_ID" >> .env
-                echo "RAINBOW_WYRE_MERCHANT_ID=$RAINBOW_WYRE_MERCHANT_ID" >> .env
-                echo "WYRE_ENDPOINT_TEST=$WYRE_ENDPOINT_TEST" >> .env
-                echo "WYRE_ACCOUNT_ID_TEST=$WYRE_ACCOUNT_ID_TEST" >> .env
-                echo "RAINBOW_WYRE_MERCHANT_ID_TEST=$RAINBOW_WYRE_MERCHANT_ID_TEST" >> .env
                 echo "ETHERSCAN_API_KEY=$ETHERSCAN_API_KEY" >> .env
                 echo "BRANCH_APP_DOMAIN=$BRANCH_APP_DOMAIN" >> .env
                 echo "BRANCH_KEY=$BRANCH_KEY" >> .env
@@ -225,11 +213,8 @@ workflows:
                 echo "DEV_PKEY=\$DEV_PKEY" >> .env
                 echo "TEST_SEEDS=\"$TEST_SEEDS\"" >> .env
                 echo "IS_TESTING=$IS_TESTING" >> .env
-                echo "WYRE_TOKEN=$WYRE_TOKEN" >> .env
-                echo "WYRE_TOKEN_TEST=$WYRE_TOKEN_TEST" >> .env
                 echo "ENABLE_DEV_MODE=$ENABLE_DEV_MODE" >> .env
                 echo "GANACHE_URL=$GANACHE_URL" >> .env
-                echo "ETH_GAS_STATION_API_KEY=$ETH_GAS_STATION_API_KEY" >> .env
 
 
 
@@ -260,32 +245,17 @@ workflows:
 
                 # write your script here
                 touch .env
-                echo "DATA_ORIGIN=$DATA_ORIGIN" >> .env
-                echo "INFURA_PROJECT_ID=$INFURA_PROJECT_ID" >> .env
-                echo "INFURA_PROJECT_ID_DEV=$INFURA_PROJECT_ID_DEV" >> .env
-                echo "REACT_APP_SEGMENT_API_WRITE_KEY=$REACT_APP_SEGMENT_API_WRITE_KEY" >> .env
-                echo "DATA_API_KEY=$DATA_API_KEY" >> .env
-                echo "DATA_ENDPOINT=$DATA_ENDPOINT" >> .env
                 echo "SENTRY_ENDPOINT=$SENTRY_ENDPOINT" >> .env
                 echo "SENTRY_ENVIRONMENT=$SENTRY_ENVIRONMENT" >> .env
-                echo "WYRE_ENDPOINT=$WYRE_ENDPOINT" >> .env
-                echo "WYRE_ACCOUNT_ID=$WYRE_ACCOUNT_ID" >> .env
-                echo "RAINBOW_WYRE_MERCHANT_ID=$RAINBOW_WYRE_MERCHANT_ID" >> .env
-                echo "WYRE_ENDPOINT_TEST=$WYRE_ENDPOINT_TEST" >> .env
-                echo "WYRE_ACCOUNT_ID_TEST=$WYRE_ACCOUNT_ID_TEST" >> .env
-                echo "RAINBOW_WYRE_MERCHANT_ID_TEST=$RAINBOW_WYRE_MERCHANT_ID_TEST" >> .env
                 echo "ETHERSCAN_API_KEY=$ETHERSCAN_API_KEY" >> .env
                 echo "BRANCH_APP_DOMAIN=$BRANCH_APP_DOMAIN" >> .env
                 echo "BRANCH_KEY=$BRANCH_KEY" >> .env
                 echo "RAINBOW_MASTER_KEY=$RAINBOW_MASTER_KEY" >> .env
                 echo "DEV_SEEDS=\"$DEV_SEEDS_PROD\"" >> .env
                 echo "DEV_PKEY=$DEV_PKEY_PROD" >> .env
                 echo "IS_TESTING=$IS_TESTING" >> .env
-                echo "WYRE_TOKEN=$WYRE_TOKEN" >> .env
-                echo "WYRE_TOKEN_TEST=$WYRE_TOKEN_TEST" >> .env
                 echo "ENABLE_DEV_MODE=$ENABLE_DEV_MODE" >> .env
                 echo "GANACHE_URL=$GANACHE_URL" >> .env
-                echo "ETH_GAS_STATION_API_KEY=$ETH_GAS_STATION_API_KEY" >> .env
 
           title: Generate .env file for testflight
 app:

diff --git a/globals.d.ts b/globals.d.ts
@@ -30,40 +30,8 @@ declare module 'react-native-dotenv' {
   export const ENABLE_DEV_MODE: '0' | '1';
   export const SENTRY_ENDPOINT: string;
   export const SENTRY_ENVIRONMENT: string;
-  export const DATA_API_KEY: string;
-  export const DATA_ENDPOINT: string;
-  export const DATA_ORIGIN: string;
   export const ADDYS_API_KEY: string;
-  export const ETHEREUM_GOERLI_RPC: string;
-  export const ETHEREUM_GOERLI_RPC_DEV: string;
-  export const ETHEREUM_KOVAN_RPC: string;
-  export const ETHEREUM_KOVAN_RPC_DEV: string;
-  export const ETHEREUM_MAINNET_RPC: string;
   export const ETHEREUM_MAINNET_RPC_DEV: string;
-  export const ETHEREUM_RINKEBY_RPC: string;
-  export const ETHEREUM_RINKEBY_RPC_DEV: string;
-  export const ETHEREUM_ROPSTEN_RPC: string;
-  export const ETHEREUM_ROPSTEN_RPC_DEV: string;
-  export const OPTIMISM_MAINNET_RPC: string;
-  export const BASE_MAINNET_RPC: string;
-  export const BASE_MAINNET_RPC_DEV: string;
-  export const AVALANCHE_MAINNET_RPC: string;
-  export const AVALANCHE_MAINNET_RPC_DEV: string;
-  export const AVALANCHE_FUJI_RPC: string;
-  export const BLAST_MAINNET_RPC: string;
-  export const DEGEN_MAINNET_RPC: string;
-  export const POLYGON_MAINNET_RPC: string;
-  export const ARBITRUM_MAINNET_RPC: string;
-  export const BSC_MAINNET_RPC: string;
-  export const ZORA_MAINNET_RPC: string;
-  export const RAINBOW_WYRE_MERCHANT_ID: string;
-  export const RAINBOW_WYRE_MERCHANT_ID_TEST: string;
-  export const WYRE_ACCOUNT_ID: string;
-  export const WYRE_ACCOUNT_ID_TEST: string;
-  export const WYRE_ENDPOINT: string;
-  export const WYRE_ENDPOINT_TEST: string;
-  export const WYRE_TOKEN: string;
-  export const WYRE_TOKEN_TEST: string;
   export const IMGIX_DOMAIN: string;
   export const IMGIX_TOKEN: string;
   export const CLOUDINARY_API_KEY: string;
@@ -78,23 +46,17 @@ declare module 'react-native-dotenv' {
   export const APP_CENTER_READ_ONLY_TOKEN_IOS: string;
   export const CODE_PUSH_DEPLOYMENT_KEY_ANDROID: string;
   export const CODE_PUSH_DEPLOYMENT_KEY_IOS: string;
-  export const COVALENT_ANDROID_API_KEY: string;
-  export const COVALENT_IOS_API_KEY: string;
   export const NFT_API_KEY: string;
   export const NFT_API_URL: string;
   export const ETHERSCAN_API_KEY: string;
-  export const POAP_API_KEY: string;
   export const HARDHAT_URL_ANDROID: string;
   export const HARDHAT_URL_IOS: string;
-  export const SIMPLEHASH_API_KEY: string;
   export const RAINBOW_MASTER_KEY: string;
-  export const REACT_APP_SEGMENT_API_WRITE_KEY: string;
   export const SECURE_WALLET_HASH_KEY: string;
   export const TEST_SEEDS: string;
   export const DEV_PKEY: string;
   export const RAINBOW_TOKEN_LIST_URL: string;
   export const WC_PROJECT_ID: string;
-  export const RAMP_HOST_API_KEY: string;
   export const LOG_LEVEL: 'debug' | 'info' | 'warn' | 'error';
   export const LOG_DEBUG: string;
   export const QUIET_OLD_LOGGER: string;

diff --git a/ios/Gemfile b/ios/Gemfile
@@ -6,7 +6,7 @@ ruby '>= 2.7.0'
 gem "fastlane"
 # Exclude problematic versions of cocoapods and activesupport that causes build failures.
 gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
-gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
+gem 'activesupport', '>= 6.1.7.5', '<7.1.0'
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)
diff --git a/ios/Gemfile.lock b/ios/Gemfile.lock
@@ -5,7 +5,7 @@ GEM
       base64
       nkf
       rexml
-    activesupport (7.0.5.1)
+    activesupport (7.0.8.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -18,28 +18,28 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.969.0)
-    aws-sdk-core (3.202.0)
+    aws-partitions (1.998.0)
+    aws-sdk-core (3.211.0)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
+      aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.88.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-kms (1.95.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.159.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-s3 (1.169.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.9.1)
+    aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
     claide (1.1.0)
-    cocoapods (1.14.3)
+    cocoapods (1.16.1)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.14.3)
+      cocoapods-core (= 1.16.1)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -53,8 +53,8 @@ GEM
       molinillo (~> 0.8.0)
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
-      xcodeproj (>= 1.23.0, < 2.0)
-    cocoapods-core (1.14.3)
+      xcodeproj (>= 1.26.0, < 2.0)
+    cocoapods-core (1.16.1)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -77,7 +77,7 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.4)
     declarative (0.0.20)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
@@ -87,8 +87,8 @@ GEM
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    excon (0.111.0)
-    faraday (1.10.3)
+    excon (0.112.0)
+    faraday (1.10.4)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -114,10 +114,10 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
+    faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.222.0)
+    fastlane (2.225.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -133,6 +133,7 @@ GEM
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
@@ -158,7 +159,9 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    ffi (1.16.3)
+    fastlane-sirp (1.0.0)
+      sysrandom (~> 1.0)
+    ffi (1.17.0)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
@@ -202,19 +205,19 @@ GEM
     http-cookie (1.0.7)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.14.1)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
-    json (2.7.2)
-    jwt (2.8.2)
+    json (2.7.4)
+    jwt (2.9.3)
       base64
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    minitest (5.18.1)
+    minitest (5.25.1)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.4.1)
-    nanaimo (0.3.0)
+    nanaimo (0.4.0)
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
@@ -229,8 +232,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.9)
     rouge (2.0.7)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
@@ -244,7 +246,7 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
-    strscan (3.1.0)
+    sysrandom (1.0.5)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -258,15 +260,15 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     word_wrap (1.0.0)
-    xcodeproj (1.25.0)
+    xcodeproj (1.26.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (>= 3.3.2, < 4.0)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
@@ -276,7 +278,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 6.1.7.5, != 7.1.0)
+  activesupport (>= 6.1.7.5, < 7.1.0)
   cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
   fastlane