Merge branch 'develop' into @matthew/APP-1969

rainbow-me · Nov 25, 2024 · f0df7f0 · f0df7f0
2 parents 3b526a0 + f8808d8
commit f0df7f0
Show file tree

Hide file tree

Showing 66 changed files with 967 additions and 1,158 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,53 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 
 ### Fixed
 
+## [1.9.46] (https://github.com/rainbow-me/rainbow/releases/tag/v1.9.46)
+
+### Changed
+
+- Remove unused environment configurations (#6254)
+- Added a null check guard to the claimable flow (#6257)
+
+### Fixed
+
+- Fixed an issue in our approve and swap flow that should help overall swap success (#6259)
+- Changed the way we handle flashbots gas so less transactions should fail due to insufficent gas (#6265)
+
+## [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 240
+        versionName "1.9.47"
         missingDimensionStrategy 'react-native-camera', 'general'
         renderscriptTargetApi 23
         renderscriptSupportModeEnabled true

diff --git a/android/app/src/main/java/me/rainbow/MainApplication.kt b/android/app/src/main/java/me/rainbow/MainApplication.kt
@@ -19,7 +19,6 @@ import me.rainbow.NativeModules.Haptics.RNHapticsPackage
 import me.rainbow.NativeModules.Internals.InternalPackage
 import me.rainbow.NativeModules.RNBackHandler.RNBackHandlerPackage
 import me.rainbow.NativeModules.RNBip39.RNBip39Package
-import me.rainbow.NativeModules.RNReview.RNReviewPackage
 import me.rainbow.NativeModules.RNStartTime.RNStartTimePackage
 import me.rainbow.NativeModules.RNTextAnimatorPackage.RNTextAnimatorPackage
 import me.rainbow.NativeModules.RNZoomableButton.RNZoomableButtonPackage
@@ -36,7 +35,6 @@ class MainApplication : Application(), ReactApplication {
             val packages: MutableList<ReactPackage> = PackageList(this).packages
             // Packages that cannot be autolinked yet can be added manually here, for example:
             packages.add(RNBip39Package())
-            packages.add(RNReviewPackage())
             packages.add(SystemNavigationBarPackage())
             packages.add(RNBackHandlerPackage())
             packages.add(RNTextAnimatorPackage())

diff --git a/android/app/src/main/java/me/rainbow/NativeModules/RNReview/RNReviewModule.java b/android/app/src/main/java/me/rainbow/NativeModules/RNReview/RNReviewModule.java
diff --git a/android/app/src/main/java/me/rainbow/NativeModules/RNReview/RNReviewPackage.java b/android/app/src/main/java/me/rainbow/NativeModules/RNReview/RNReviewPackage.java
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/Extensions.swift b/ios/Extensions.swift
@@ -53,10 +53,6 @@ extension UIScreen {
 
 extension UIView {
 
-  open override var canBecomeFirstResponder: Bool {
-      return true
-  }
-
   static func fromNib<T: UIView>() -> T {
     return Bundle(for: T.self).loadNibNamed(String(describing: T.self), owner: nil, options: nil)![0] as! T
   }

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -43,6 +43,8 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
+  - ExpoStoreReview (7.0.2):
+    - ExpoModulesCore
   - FasterImage (1.6.2):
     - FasterImage/Nuke (= 1.6.2)
     - FasterImage/NukeUI (= 1.6.2)
@@ -1876,6 +1878,27 @@ PODS:
   - TOCropViewController (2.7.4)
   - ToolTipMenu (5.2.1):
     - React
+  - TurboHaptics (1.0.4):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Codegen
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
   - VisionCamera (4.4.2):
     - VisionCamera/Core (= 4.4.2)
     - VisionCamera/React (= 4.4.2)
@@ -1895,6 +1918,7 @@ DEPENDENCIES:
   - ExpoFont (from `../node_modules/expo-font/ios`)
   - ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`)
   - ExpoModulesCore (from `../node_modules/expo-modules-core`)
+  - ExpoStoreReview (from `../node_modules/expo-store-review/ios`)
   - "FasterImage (from `../node_modules/@candlefinance/faster-image`)"
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - Firebase
@@ -2035,6 +2059,7 @@ DEPENDENCIES:
   - TcpSockets (from `../node_modules/react-native-tcp`)
   - TOCropViewController (~> 2.7.4)
   - ToolTipMenu (from `../node_modules/react-native-tooltip`)
+  - TurboHaptics (from `../node_modules/react-native-turbo-haptics`)
   - VisionCamera (from `../node_modules/react-native-vision-camera`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
@@ -2097,6 +2122,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/expo-keep-awake/ios"
   ExpoModulesCore:
     :path: "../node_modules/expo-modules-core"
+  ExpoStoreReview:
+    :path: "../node_modules/expo-store-review/ios"
   FasterImage:
     :path: "../node_modules/@candlefinance/faster-image"
   FBLazyVector:
@@ -2345,6 +2372,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-tcp"
   ToolTipMenu:
     :path: "../node_modules/react-native-tooltip"
+  TurboHaptics:
+    :path: "../node_modules/react-native-turbo-haptics"
   VisionCamera:
     :path: "../node_modules/react-native-vision-camera"
   Yoga:
@@ -2369,6 +2398,7 @@ SPEC CHECKSUMS:
   ExpoFont: 00756e6c796d8f7ee8d211e29c8b619e75cbf238
   ExpoKeepAwake: 3b8815d9dd1d419ee474df004021c69fdd316d08
   ExpoModulesCore: f30a203ff1863bab3dd9f4421e7fc1564797f18a
+  ExpoStoreReview: 15f9a636b62ff00bb21cbe9a9fe22f0239da4481
   FasterImage: af05a76f042ca3654c962b658fdb01cb4d31caee
   FBLazyVector: 7e977dd099937dc5458851233141583abba49ff2
   Firebase: 26b040b20866a55f55eb3611b9fcf3ae64816b86
@@ -2524,6 +2554,7 @@ SPEC CHECKSUMS:
   TcpSockets: bd31674146c0931a064fc254a59812dfd1a73ae0
   TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654
   ToolTipMenu: 8ac61aded0fbc4acfe7e84a7d0c9479d15a9a382
+  TurboHaptics: 6381613d33ab97aeb30d9b15c3df94dc616a25e4
   VisionCamera: 2af28201c3de77245f8c58b7a5274d5979df70df
   Yoga: 04f1db30bb810187397fa4c37dd1868a27af229c