diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 24f430f..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/MagicBareRnExample/App.tsx b/MagicBareRnExample/App.tsx index 43e99a4..d7693b9 100644 --- a/MagicBareRnExample/App.tsx +++ b/MagicBareRnExample/App.tsx @@ -1,52 +1,15 @@ import { SafeAreaProvider } from 'react-native-safe-area-context'; import React from 'react'; import Navigation from './navigation'; -import { SolanaExtension } from "@magic-ext/solana"; -import { EVMExtension } from "@magic-ext/evm"; -import { Magic } from '@magic-sdk/react-native-bare'; -import { OAuthExtension } from '@magic-ext/react-native-bare-oauth'; -import Web3 from 'web3'; -import { ENV, API_KEY } from './config/env'; -import { GDKMSExtension } from '@magic-ext/gdkms'; - -const customPolygonOptions = { - rpcUrl: "https://polygon-rpc.com/", // Polygon RPC URL - chainId: 137, // Polygon chain id - default: true, // Set as default network -}; - -const customOptimismOptions = { - rpcUrl: "https://mainnet.optimism.io", - chainId: 10, -}; +import { useMagic } from './hooks/magic'; export default function App() { - const [env, setEnv] = React.useState(ENV.PROD); - - const magic = new Magic(API_KEY[env], { - extensions: [ - new OAuthExtension(), - new GDKMSExtension(), - new SolanaExtension({ - rpcUrl: "https://api.devnet.solana.com", - }), - new EVMExtension([customPolygonOptions, customOptimismOptions]), - ], - }); - - const web3 = new Web3(magic.rpcProvider as any); - - const magicProps = { - magic, - web3, - setEnv, - env, - }; + const { magic } = useMagic(); return ( - + ); diff --git a/MagicBareRnExample/config/env.ts b/MagicBareRnExample/config/env.ts deleted file mode 100644 index ac8de1f..0000000 --- a/MagicBareRnExample/config/env.ts +++ /dev/null @@ -1,9 +0,0 @@ -export const ENV = { - // ADD Enviornments Here - PROD: 'PROD', -}; - -export const API_KEY: { [key: string]: string } = { - // ADD API Keys Here - PROD: 'YOUR_PUBLISHABLE_KEY', -}; diff --git a/MagicBareRnExample/hooks/magic.ts b/MagicBareRnExample/hooks/magic.ts new file mode 100644 index 0000000..03dcf5f --- /dev/null +++ b/MagicBareRnExample/hooks/magic.ts @@ -0,0 +1,56 @@ +import { Magic } from '@magic-sdk/react-native-bare'; +import { OAuthExtension } from '@magic-ext/react-native-bare-oauth'; +import { SolanaExtension } from '@magic-ext/solana'; +import { EVMExtension } from '@magic-ext/evm'; +import { ethers } from 'ethers'; + +// API Key - Replace with your actual publishable key +const API_KEY = 'YOUR_PUBLISHABLE_KEY'; + +const customPolygonOptions = { + rpcUrl: 'https://polygon-rpc.com/', // Polygon RPC URL + chainId: 137, // Polygon chain id + default: true, // Set as default network +}; + +const customOptimismOptions = { + rpcUrl: 'https://mainnet.optimism.io', + chainId: 10, +}; + +class MagicService { + private static _magic: any = null; + private static _provider: ethers.BrowserProvider | null = null; + + public static get magic(): any { + if (!this._magic) { + this._magic = new Magic(API_KEY, { + extensions: [ + new OAuthExtension(), + new SolanaExtension({ + rpcUrl: 'https://api.devnet.solana.com', + }), + new EVMExtension([customPolygonOptions, customOptimismOptions]), + ], + }); + } + return this._magic; + } + + public static get provider(): ethers.BrowserProvider { + if (!this._provider) { + this._provider = new ethers.BrowserProvider( + MagicService.magic.rpcProvider as any + ); + } + return this._provider; + } +} + +// React hook to use Magic service +export function useMagic() { + return { + magic: MagicService.magic, + provider: MagicService.provider, + }; +} diff --git a/MagicBareRnExample/ios/Podfile.lock b/MagicBareRnExample/ios/Podfile.lock index 0c226a9..ea11c10 100644 --- a/MagicBareRnExample/ios/Podfile.lock +++ b/MagicBareRnExample/ios/Podfile.lock @@ -2,12 +2,12 @@ PODS: - boost (1.84.0) - DoubleConversion (1.1.6) - fast_float (6.1.4) - - FBLazyVector (0.78.1) + - FBLazyVector (0.79.6) - fmt (11.0.2) - glog (0.3.5) - - hermes-engine (0.78.1): - - hermes-engine/Pre-built (= 0.78.1) - - hermes-engine/Pre-built (0.78.1) + - hermes-engine (0.79.6): + - hermes-engine/Pre-built (= 0.79.6) + - hermes-engine/Pre-built (0.79.6) - RCT-Folly (2024.11.18.00): - boost - DoubleConversion @@ -27,44 +27,45 @@ PODS: - fast_float (= 6.1.4) - fmt (= 11.0.2) - glog - - RCTDeprecation (0.78.1) - - RCTRequired (0.78.1) - - RCTTypeSafety (0.78.1): - - FBLazyVector (= 0.78.1) - - RCTRequired (= 0.78.1) - - React-Core (= 0.78.1) - - React (0.78.1): - - React-Core (= 0.78.1) - - React-Core/DevSupport (= 0.78.1) - - React-Core/RCTWebSocket (= 0.78.1) - - React-RCTActionSheet (= 0.78.1) - - React-RCTAnimation (= 0.78.1) - - React-RCTBlob (= 0.78.1) - - React-RCTImage (= 0.78.1) - - React-RCTLinking (= 0.78.1) - - React-RCTNetwork (= 0.78.1) - - React-RCTSettings (= 0.78.1) - - React-RCTText (= 0.78.1) - - React-RCTVibration (= 0.78.1) - - React-callinvoker (0.78.1) - - React-Core (0.78.1): + - RCTDeprecation (0.79.6) + - RCTRequired (0.79.6) + - RCTTypeSafety (0.79.6): + - FBLazyVector (= 0.79.6) + - RCTRequired (= 0.79.6) + - React-Core (= 0.79.6) + - React (0.79.6): + - React-Core (= 0.79.6) + - React-Core/DevSupport (= 0.79.6) + - React-Core/RCTWebSocket (= 0.79.6) + - React-RCTActionSheet (= 0.79.6) + - React-RCTAnimation (= 0.79.6) + - React-RCTBlob (= 0.79.6) + - React-RCTImage (= 0.79.6) + - React-RCTLinking (= 0.79.6) + - React-RCTNetwork (= 0.79.6) + - React-RCTSettings (= 0.79.6) + - React-RCTText (= 0.79.6) + - React-RCTVibration (= 0.79.6) + - React-callinvoker (0.79.6) + - React-Core (0.79.6): - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) - RCTDeprecation - - React-Core/Default (= 0.78.1) + - React-Core/Default (= 0.79.6) - React-cxxreact - React-featureflags - React-hermes - React-jsi - React-jsiexecutor - React-jsinspector + - React-jsitooling - React-perflogger - React-runtimescheduler - React-utils - SocketRocket (= 0.7.1) - Yoga - - React-Core/CoreModulesHeaders (0.78.1): + - React-Core/CoreModulesHeaders (0.79.6): - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) @@ -76,12 +77,13 @@ PODS: - React-jsi - React-jsiexecutor - React-jsinspector + - React-jsitooling - React-perflogger - React-runtimescheduler - React-utils - SocketRocket (= 0.7.1) - Yoga - - React-Core/Default (0.78.1): + - React-Core/Default (0.79.6): - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) @@ -92,30 +94,32 @@ PODS: - React-jsi - React-jsiexecutor - React-jsinspector + - React-jsitooling - React-perflogger - React-runtimescheduler - React-utils - SocketRocket (= 0.7.1) - Yoga - - React-Core/DevSupport (0.78.1): + - React-Core/DevSupport (0.79.6): - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) - RCTDeprecation - - React-Core/Default (= 0.78.1) - - React-Core/RCTWebSocket (= 0.78.1) + - React-Core/Default (= 0.79.6) + - React-Core/RCTWebSocket (= 0.79.6) - React-cxxreact - React-featureflags - React-hermes - React-jsi - React-jsiexecutor - React-jsinspector + - React-jsitooling - React-perflogger - React-runtimescheduler - React-utils - SocketRocket (= 0.7.1) - Yoga - - React-Core/RCTActionSheetHeaders (0.78.1): + - React-Core/RCTActionSheetHeaders (0.79.6): - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) @@ -127,12 +131,13 @@ PODS: - React-jsi - React-jsiexecutor - React-jsinspector + - React-jsitooling - React-perflogger - React-runtimescheduler - React-utils - SocketRocket (= 0.7.1) - Yoga - - React-Core/RCTAnimationHeaders (0.78.1): + - React-Core/RCTAnimationHeaders (0.79.6): - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) @@ -144,12 +149,13 @@ PODS: - React-jsi - React-jsiexecutor - React-jsinspector + - React-jsitooling - React-perflogger - React-runtimescheduler - React-utils - SocketRocket (= 0.7.1) - Yoga - - React-Core/RCTBlobHeaders (0.78.1): + - React-Core/RCTBlobHeaders (0.79.6): - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) @@ -161,12 +167,13 @@ PODS: - React-jsi - React-jsiexecutor - React-jsinspector + - React-jsitooling - React-perflogger - React-runtimescheduler - React-utils - SocketRocket (= 0.7.1) - Yoga - - React-Core/RCTImageHeaders (0.78.1): + - React-Core/RCTImageHeaders (0.79.6): - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) @@ -178,12 +185,13 @@ PODS: - React-jsi - React-jsiexecutor - React-jsinspector + - React-jsitooling - React-perflogger - React-runtimescheduler - React-utils - SocketRocket (= 0.7.1) - Yoga - - React-Core/RCTLinkingHeaders (0.78.1): + - React-Core/RCTLinkingHeaders (0.79.6): - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) @@ -195,12 +203,13 @@ PODS: - React-jsi - React-jsiexecutor - React-jsinspector + - React-jsitooling - React-perflogger - React-runtimescheduler - React-utils - SocketRocket (= 0.7.1) - Yoga - - React-Core/RCTNetworkHeaders (0.78.1): + - React-Core/RCTNetworkHeaders (0.79.6): - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) @@ -212,12 +221,13 @@ PODS: - React-jsi - React-jsiexecutor - React-jsinspector + - React-jsitooling - React-perflogger - React-runtimescheduler - React-utils - SocketRocket (= 0.7.1) - Yoga - - React-Core/RCTSettingsHeaders (0.78.1): + - React-Core/RCTSettingsHeaders (0.79.6): - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) @@ -229,12 +239,13 @@ PODS: - React-jsi - React-jsiexecutor - React-jsinspector + - React-jsitooling - React-perflogger - React-runtimescheduler - React-utils - SocketRocket (= 0.7.1) - Yoga - - React-Core/RCTTextHeaders (0.78.1): + - React-Core/RCTTextHeaders (0.79.6): - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) @@ -246,12 +257,13 @@ PODS: - React-jsi - React-jsiexecutor - React-jsinspector + - React-jsitooling - React-perflogger - React-runtimescheduler - React-utils - SocketRocket (= 0.7.1) - Yoga - - React-Core/RCTVibrationHeaders (0.78.1): + - React-Core/RCTVibrationHeaders (0.79.6): - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) @@ -263,44 +275,47 @@ PODS: - React-jsi - React-jsiexecutor - React-jsinspector + - React-jsitooling - React-perflogger - React-runtimescheduler - React-utils - SocketRocket (= 0.7.1) - Yoga - - React-Core/RCTWebSocket (0.78.1): + - React-Core/RCTWebSocket (0.79.6): - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) - RCTDeprecation - - React-Core/Default (= 0.78.1) + - React-Core/Default (= 0.79.6) - React-cxxreact - React-featureflags - React-hermes - React-jsi - React-jsiexecutor - React-jsinspector + - React-jsitooling - React-perflogger - React-runtimescheduler - React-utils - SocketRocket (= 0.7.1) - Yoga - - React-CoreModules (0.78.1): + - React-CoreModules (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) - RCT-Folly (= 2024.11.18.00) - - RCTTypeSafety (= 0.78.1) - - React-Core/CoreModulesHeaders (= 0.78.1) - - React-jsi (= 0.78.1) + - RCTTypeSafety (= 0.79.6) + - React-Core/CoreModulesHeaders (= 0.79.6) + - React-jsi (= 0.79.6) - React-jsinspector + - React-jsinspectortracing - React-NativeModulesApple - React-RCTBlob - React-RCTFBReactNativeSpec - - React-RCTImage (= 0.78.1) + - React-RCTImage (= 0.79.6) - ReactCommon - SocketRocket (= 0.7.1) - - React-cxxreact (0.78.1): + - React-cxxreact (0.79.6): - boost - DoubleConversion - fast_float (= 6.1.4) @@ -308,37 +323,40 @@ PODS: - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) - - React-callinvoker (= 0.78.1) - - React-debug (= 0.78.1) - - React-jsi (= 0.78.1) + - React-callinvoker (= 0.79.6) + - React-debug (= 0.79.6) + - React-jsi (= 0.79.6) - React-jsinspector - - React-logger (= 0.78.1) - - React-perflogger (= 0.78.1) - - React-runtimeexecutor (= 0.78.1) - - React-timing (= 0.78.1) - - React-debug (0.78.1) - - React-defaultsnativemodule (0.78.1): + - React-jsinspectortracing + - React-logger (= 0.79.6) + - React-perflogger (= 0.79.6) + - React-runtimeexecutor (= 0.79.6) + - React-timing (= 0.79.6) + - React-debug (0.79.6) + - React-defaultsnativemodule (0.79.6): - hermes-engine - RCT-Folly - React-domnativemodule - React-featureflagsnativemodule + - React-hermes - React-idlecallbacksnativemodule - React-jsi - React-jsiexecutor - React-microtasksnativemodule - React-RCTFBReactNativeSpec - - React-domnativemodule (0.78.1): + - React-domnativemodule (0.79.6): - hermes-engine - RCT-Folly - React-Fabric - React-FabricComponents - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-RCTFBReactNativeSpec - ReactCommon/turbomodule/core - Yoga - - React-Fabric (0.78.1): + - React-Fabric (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -350,24 +368,25 @@ PODS: - React-Core - React-cxxreact - React-debug - - React-Fabric/animations (= 0.78.1) - - React-Fabric/attributedstring (= 0.78.1) - - React-Fabric/componentregistry (= 0.78.1) - - React-Fabric/componentregistrynative (= 0.78.1) - - React-Fabric/components (= 0.78.1) - - React-Fabric/consistency (= 0.78.1) - - React-Fabric/core (= 0.78.1) - - React-Fabric/dom (= 0.78.1) - - React-Fabric/imagemanager (= 0.78.1) - - React-Fabric/leakchecker (= 0.78.1) - - React-Fabric/mounting (= 0.78.1) - - React-Fabric/observers (= 0.78.1) - - React-Fabric/scheduler (= 0.78.1) - - React-Fabric/telemetry (= 0.78.1) - - React-Fabric/templateprocessor (= 0.78.1) - - React-Fabric/uimanager (= 0.78.1) + - React-Fabric/animations (= 0.79.6) + - React-Fabric/attributedstring (= 0.79.6) + - React-Fabric/componentregistry (= 0.79.6) + - React-Fabric/componentregistrynative (= 0.79.6) + - React-Fabric/components (= 0.79.6) + - React-Fabric/consistency (= 0.79.6) + - React-Fabric/core (= 0.79.6) + - React-Fabric/dom (= 0.79.6) + - React-Fabric/imagemanager (= 0.79.6) + - React-Fabric/leakchecker (= 0.79.6) + - React-Fabric/mounting (= 0.79.6) + - React-Fabric/observers (= 0.79.6) + - React-Fabric/scheduler (= 0.79.6) + - React-Fabric/telemetry (= 0.79.6) + - React-Fabric/templateprocessor (= 0.79.6) + - React-Fabric/uimanager (= 0.79.6) - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -375,7 +394,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/animations (0.78.1): + - React-Fabric/animations (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -389,6 +408,7 @@ PODS: - React-debug - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -396,7 +416,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/attributedstring (0.78.1): + - React-Fabric/attributedstring (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -410,6 +430,7 @@ PODS: - React-debug - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -417,7 +438,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/componentregistry (0.78.1): + - React-Fabric/componentregistry (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -431,6 +452,7 @@ PODS: - React-debug - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -438,7 +460,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/componentregistrynative (0.78.1): + - React-Fabric/componentregistrynative (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -452,6 +474,7 @@ PODS: - React-debug - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -459,7 +482,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components (0.78.1): + - React-Fabric/components (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -471,11 +494,13 @@ PODS: - React-Core - React-cxxreact - React-debug - - React-Fabric/components/legacyviewmanagerinterop (= 0.78.1) - - React-Fabric/components/root (= 0.78.1) - - React-Fabric/components/view (= 0.78.1) + - React-Fabric/components/legacyviewmanagerinterop (= 0.79.6) + - React-Fabric/components/root (= 0.79.6) + - React-Fabric/components/scrollview (= 0.79.6) + - React-Fabric/components/view (= 0.79.6) - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -483,7 +508,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/legacyviewmanagerinterop (0.78.1): + - React-Fabric/components/legacyviewmanagerinterop (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -497,6 +522,7 @@ PODS: - React-debug - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -504,7 +530,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/root (0.78.1): + - React-Fabric/components/root (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -518,6 +544,7 @@ PODS: - React-debug - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -525,7 +552,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/view (0.78.1): + - React-Fabric/components/scrollview (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -539,6 +566,7 @@ PODS: - React-debug - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -546,8 +574,31 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core + - React-Fabric/components/view (0.79.6): + - DoubleConversion + - fast_float (= 6.1.4) + - fmt (= 11.0.2) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2024.11.18.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-featureflags + - React-graphics + - React-hermes + - React-jsi + - React-jsiexecutor + - React-logger + - React-renderercss + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core - Yoga - - React-Fabric/consistency (0.78.1): + - React-Fabric/consistency (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -561,6 +612,7 @@ PODS: - React-debug - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -568,7 +620,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/core (0.78.1): + - React-Fabric/core (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -582,6 +634,7 @@ PODS: - React-debug - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -589,7 +642,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/dom (0.78.1): + - React-Fabric/dom (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -603,6 +656,7 @@ PODS: - React-debug - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -610,7 +664,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/imagemanager (0.78.1): + - React-Fabric/imagemanager (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -624,6 +678,7 @@ PODS: - React-debug - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -631,7 +686,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/leakchecker (0.78.1): + - React-Fabric/leakchecker (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -645,6 +700,7 @@ PODS: - React-debug - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -652,7 +708,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/mounting (0.78.1): + - React-Fabric/mounting (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -666,6 +722,7 @@ PODS: - React-debug - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -673,7 +730,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/observers (0.78.1): + - React-Fabric/observers (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -685,9 +742,10 @@ PODS: - React-Core - React-cxxreact - React-debug - - React-Fabric/observers/events (= 0.78.1) + - React-Fabric/observers/events (= 0.79.6) - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -695,7 +753,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/observers/events (0.78.1): + - React-Fabric/observers/events (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -709,6 +767,7 @@ PODS: - React-debug - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -716,7 +775,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/scheduler (0.78.1): + - React-Fabric/scheduler (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -731,6 +790,7 @@ PODS: - React-Fabric/observers/events - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -739,7 +799,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/telemetry (0.78.1): + - React-Fabric/telemetry (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -753,6 +813,7 @@ PODS: - React-debug - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -760,7 +821,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/templateprocessor (0.78.1): + - React-Fabric/templateprocessor (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -774,6 +835,7 @@ PODS: - React-debug - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -781,7 +843,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/uimanager (0.78.1): + - React-Fabric/uimanager (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -793,9 +855,10 @@ PODS: - React-Core - React-cxxreact - React-debug - - React-Fabric/uimanager/consistency (= 0.78.1) + - React-Fabric/uimanager/consistency (= 0.79.6) - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -804,7 +867,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/uimanager/consistency (0.78.1): + - React-Fabric/uimanager/consistency (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -818,6 +881,7 @@ PODS: - React-debug - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -826,7 +890,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-FabricComponents (0.78.1): + - React-FabricComponents (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -839,10 +903,11 @@ PODS: - React-cxxreact - React-debug - React-Fabric - - React-FabricComponents/components (= 0.78.1) - - React-FabricComponents/textlayoutmanager (= 0.78.1) + - React-FabricComponents/components (= 0.79.6) + - React-FabricComponents/textlayoutmanager (= 0.79.6) - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -851,7 +916,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - Yoga - - React-FabricComponents/components (0.78.1): + - React-FabricComponents/components (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -864,17 +929,18 @@ PODS: - React-cxxreact - React-debug - React-Fabric - - React-FabricComponents/components/inputaccessory (= 0.78.1) - - React-FabricComponents/components/iostextinput (= 0.78.1) - - React-FabricComponents/components/modal (= 0.78.1) - - React-FabricComponents/components/rncore (= 0.78.1) - - React-FabricComponents/components/safeareaview (= 0.78.1) - - React-FabricComponents/components/scrollview (= 0.78.1) - - React-FabricComponents/components/text (= 0.78.1) - - React-FabricComponents/components/textinput (= 0.78.1) - - React-FabricComponents/components/unimplementedview (= 0.78.1) + - React-FabricComponents/components/inputaccessory (= 0.79.6) + - React-FabricComponents/components/iostextinput (= 0.79.6) + - React-FabricComponents/components/modal (= 0.79.6) + - React-FabricComponents/components/rncore (= 0.79.6) + - React-FabricComponents/components/safeareaview (= 0.79.6) + - React-FabricComponents/components/scrollview (= 0.79.6) + - React-FabricComponents/components/text (= 0.79.6) + - React-FabricComponents/components/textinput (= 0.79.6) + - React-FabricComponents/components/unimplementedview (= 0.79.6) - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -883,7 +949,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - Yoga - - React-FabricComponents/components/inputaccessory (0.78.1): + - React-FabricComponents/components/inputaccessory (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -898,6 +964,7 @@ PODS: - React-Fabric - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -906,7 +973,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - Yoga - - React-FabricComponents/components/iostextinput (0.78.1): + - React-FabricComponents/components/iostextinput (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -921,6 +988,7 @@ PODS: - React-Fabric - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -929,7 +997,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - Yoga - - React-FabricComponents/components/modal (0.78.1): + - React-FabricComponents/components/modal (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -944,6 +1012,7 @@ PODS: - React-Fabric - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -952,7 +1021,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - Yoga - - React-FabricComponents/components/rncore (0.78.1): + - React-FabricComponents/components/rncore (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -967,6 +1036,7 @@ PODS: - React-Fabric - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -975,7 +1045,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - Yoga - - React-FabricComponents/components/safeareaview (0.78.1): + - React-FabricComponents/components/safeareaview (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -990,6 +1060,7 @@ PODS: - React-Fabric - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -998,7 +1069,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - Yoga - - React-FabricComponents/components/scrollview (0.78.1): + - React-FabricComponents/components/scrollview (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -1013,6 +1084,7 @@ PODS: - React-Fabric - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -1021,7 +1093,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - Yoga - - React-FabricComponents/components/text (0.78.1): + - React-FabricComponents/components/text (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -1036,6 +1108,7 @@ PODS: - React-Fabric - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -1044,7 +1117,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - Yoga - - React-FabricComponents/components/textinput (0.78.1): + - React-FabricComponents/components/textinput (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -1059,6 +1132,7 @@ PODS: - React-Fabric - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -1067,7 +1141,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - Yoga - - React-FabricComponents/components/unimplementedview (0.78.1): + - React-FabricComponents/components/unimplementedview (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -1082,6 +1156,7 @@ PODS: - React-Fabric - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -1090,7 +1165,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - Yoga - - React-FabricComponents/textlayoutmanager (0.78.1): + - React-FabricComponents/textlayoutmanager (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -1105,6 +1180,7 @@ PODS: - React-Fabric - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-logger @@ -1113,69 +1189,74 @@ PODS: - React-utils - ReactCommon/turbomodule/core - Yoga - - React-FabricImage (0.78.1): + - React-FabricImage (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) - glog - hermes-engine - RCT-Folly/Fabric (= 2024.11.18.00) - - RCTRequired (= 0.78.1) - - RCTTypeSafety (= 0.78.1) + - RCTRequired (= 0.79.6) + - RCTTypeSafety (= 0.79.6) - React-Fabric - React-featureflags - React-graphics + - React-hermes - React-ImageManager - React-jsi - - React-jsiexecutor (= 0.78.1) + - React-jsiexecutor (= 0.79.6) - React-logger - React-rendererdebug - React-utils - ReactCommon - Yoga - - React-featureflags (0.78.1): + - React-featureflags (0.79.6): - RCT-Folly (= 2024.11.18.00) - - React-featureflagsnativemodule (0.78.1): + - React-featureflagsnativemodule (0.79.6): - hermes-engine - RCT-Folly - React-featureflags + - React-hermes - React-jsi - React-jsiexecutor - React-RCTFBReactNativeSpec - ReactCommon/turbomodule/core - - React-graphics (0.78.1): + - React-graphics (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) - glog - hermes-engine - RCT-Folly/Fabric (= 2024.11.18.00) + - React-hermes - React-jsi - React-jsiexecutor - React-utils - - React-hermes (0.78.1): + - React-hermes (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) - - React-cxxreact (= 0.78.1) + - React-cxxreact (= 0.79.6) - React-jsi - - React-jsiexecutor (= 0.78.1) + - React-jsiexecutor (= 0.79.6) - React-jsinspector - - React-perflogger (= 0.78.1) + - React-jsinspectortracing + - React-perflogger (= 0.79.6) - React-runtimeexecutor - - React-idlecallbacksnativemodule (0.78.1): + - React-idlecallbacksnativemodule (0.79.6): - glog - hermes-engine - RCT-Folly + - React-hermes - React-jsi - React-jsiexecutor - React-RCTFBReactNativeSpec - React-runtimescheduler - ReactCommon/turbomodule/core - - React-ImageManager (0.78.1): + - React-ImageManager (0.79.6): - glog - RCT-Folly/Fabric - React-Core/Default @@ -1184,7 +1265,7 @@ PODS: - React-graphics - React-rendererdebug - React-utils - - React-jserrorhandler (0.78.1): + - React-jserrorhandler (0.79.6): - glog - hermes-engine - RCT-Folly/Fabric (= 2024.11.18.00) @@ -1193,7 +1274,7 @@ PODS: - React-featureflags - React-jsi - ReactCommon/turbomodule/bridging - - React-jsi (0.78.1): + - React-jsi (0.79.6): - boost - DoubleConversion - fast_float (= 6.1.4) @@ -1201,18 +1282,19 @@ PODS: - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) - - React-jsiexecutor (0.78.1): + - React-jsiexecutor (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) - - React-cxxreact (= 0.78.1) - - React-jsi (= 0.78.1) + - React-cxxreact (= 0.79.6) + - React-jsi (= 0.79.6) - React-jsinspector - - React-perflogger (= 0.78.1) - - React-jsinspector (0.78.1): + - React-jsinspectortracing + - React-perflogger (= 0.79.6) + - React-jsinspector (0.79.6): - DoubleConversion - glog - hermes-engine @@ -1220,20 +1302,32 @@ PODS: - React-featureflags - React-jsi - React-jsinspectortracing - - React-perflogger (= 0.78.1) - - React-runtimeexecutor (= 0.78.1) - - React-jsinspectortracing (0.78.1): + - React-perflogger (= 0.79.6) + - React-runtimeexecutor (= 0.79.6) + - React-jsinspectortracing (0.79.6): - RCT-Folly - - React-jsitracing (0.78.1): + - React-oscompat + - React-jsitooling (0.79.6): + - DoubleConversion + - fast_float (= 6.1.4) + - fmt (= 11.0.2) + - glog + - RCT-Folly (= 2024.11.18.00) + - React-cxxreact (= 0.79.6) + - React-jsi (= 0.79.6) + - React-jsinspector + - React-jsinspectortracing + - React-jsitracing (0.79.6): - React-jsi - - React-logger (0.78.1): + - React-logger (0.79.6): - glog - - React-Mapbuffer (0.78.1): + - React-Mapbuffer (0.79.6): - glog - React-debug - - React-microtasksnativemodule (0.78.1): + - React-microtasksnativemodule (0.79.6): - hermes-engine - RCT-Folly + - React-hermes - React-jsi - React-jsiexecutor - React-RCTFBReactNativeSpec @@ -1252,11 +1346,14 @@ PODS: - React-Fabric - React-featureflags - React-graphics + - React-hermes - React-ImageManager + - React-jsi - react-native-safe-area-context/common (= 5.3.0) - react-native-safe-area-context/fabric (= 5.3.0) - React-NativeModulesApple - React-RCTFabric + - React-renderercss - React-rendererdebug - React-utils - ReactCodegen @@ -1275,9 +1372,12 @@ PODS: - React-Fabric - React-featureflags - React-graphics + - React-hermes - React-ImageManager + - React-jsi - React-NativeModulesApple - React-RCTFabric + - React-renderercss - React-rendererdebug - React-utils - ReactCodegen @@ -1296,10 +1396,13 @@ PODS: - React-Fabric - React-featureflags - React-graphics + - React-hermes - React-ImageManager + - React-jsi - react-native-safe-area-context/common - React-NativeModulesApple - React-RCTFabric + - React-renderercss - React-rendererdebug - React-utils - ReactCodegen @@ -1318,38 +1421,45 @@ PODS: - React-Fabric - React-featureflags - React-graphics + - React-hermes - React-ImageManager + - React-jsi - React-NativeModulesApple - React-RCTFabric + - React-renderercss - React-rendererdebug - React-utils - ReactCodegen - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - React-NativeModulesApple (0.78.1): + - React-NativeModulesApple (0.79.6): - glog - hermes-engine - React-callinvoker - React-Core - React-cxxreact + - React-featureflags + - React-hermes - React-jsi - React-jsinspector - React-runtimeexecutor - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - React-perflogger (0.78.1): + - React-oscompat (0.79.6) + - React-perflogger (0.79.6): - DoubleConversion - RCT-Folly (= 2024.11.18.00) - - React-performancetimeline (0.78.1): + - React-performancetimeline (0.79.6): - RCT-Folly (= 2024.11.18.00) - React-cxxreact - React-featureflags - React-jsinspectortracing + - React-perflogger - React-timing - - React-RCTActionSheet (0.78.1): - - React-Core/RCTActionSheetHeaders (= 0.78.1) - - React-RCTAnimation (0.78.1): + - React-RCTActionSheet (0.79.6): + - React-Core/RCTActionSheetHeaders (= 0.79.6) + - React-RCTAnimation (0.79.6): - RCT-Folly (= 2024.11.18.00) - RCTTypeSafety - React-Core/RCTAnimationHeaders @@ -1357,7 +1467,8 @@ PODS: - React-NativeModulesApple - React-RCTFBReactNativeSpec - ReactCommon - - React-RCTAppDelegate (0.78.1): + - React-RCTAppDelegate (0.79.6): + - hermes-engine - RCT-Folly (= 2024.11.18.00) - RCTRequired - RCTTypeSafety @@ -1369,19 +1480,20 @@ PODS: - React-featureflags - React-graphics - React-hermes + - React-jsitooling - React-NativeModulesApple - React-RCTFabric - React-RCTFBReactNativeSpec - React-RCTImage - React-RCTNetwork + - React-RCTRuntime - React-rendererdebug - React-RuntimeApple - React-RuntimeCore - - React-RuntimeHermes - React-runtimescheduler - React-utils - ReactCommon - - React-RCTBlob (0.78.1): + - React-RCTBlob (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) @@ -1395,7 +1507,7 @@ PODS: - React-RCTFBReactNativeSpec - React-RCTNetwork - ReactCommon - - React-RCTFabric (0.78.1): + - React-RCTFabric (0.79.6): - glog - hermes-engine - RCT-Folly/Fabric (= 2024.11.18.00) @@ -1406,29 +1518,33 @@ PODS: - React-FabricImage - React-featureflags - React-graphics + - React-hermes - React-ImageManager - React-jsi - React-jsinspector - React-jsinspectortracing - React-performancetimeline + - React-RCTAnimation - React-RCTImage - React-RCTText - React-rendererconsistency + - React-renderercss - React-rendererdebug - React-runtimescheduler - React-utils - Yoga - - React-RCTFBReactNativeSpec (0.78.1): + - React-RCTFBReactNativeSpec (0.79.6): - hermes-engine - RCT-Folly - RCTRequired - RCTTypeSafety - React-Core + - React-hermes - React-jsi - React-jsiexecutor - React-NativeModulesApple - ReactCommon - - React-RCTImage (0.78.1): + - React-RCTImage (0.79.6): - RCT-Folly (= 2024.11.18.00) - RCTTypeSafety - React-Core/RCTImageHeaders @@ -1437,14 +1553,14 @@ PODS: - React-RCTFBReactNativeSpec - React-RCTNetwork - ReactCommon - - React-RCTLinking (0.78.1): - - React-Core/RCTLinkingHeaders (= 0.78.1) - - React-jsi (= 0.78.1) + - React-RCTLinking (0.79.6): + - React-Core/RCTLinkingHeaders (= 0.79.6) + - React-jsi (= 0.79.6) - React-NativeModulesApple - React-RCTFBReactNativeSpec - ReactCommon - - ReactCommon/turbomodule/core (= 0.78.1) - - React-RCTNetwork (0.78.1): + - ReactCommon/turbomodule/core (= 0.79.6) + - React-RCTNetwork (0.79.6): - RCT-Folly (= 2024.11.18.00) - RCTTypeSafety - React-Core/RCTNetworkHeaders @@ -1452,7 +1568,20 @@ PODS: - React-NativeModulesApple - React-RCTFBReactNativeSpec - ReactCommon - - React-RCTSettings (0.78.1): + - React-RCTRuntime (0.79.6): + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2024.11.18.00) + - React-Core + - React-hermes + - React-jsi + - React-jsinspector + - React-jsinspectortracing + - React-jsitooling + - React-RuntimeApple + - React-RuntimeCore + - React-RuntimeHermes + - React-RCTSettings (0.79.6): - RCT-Folly (= 2024.11.18.00) - RCTTypeSafety - React-Core/RCTSettingsHeaders @@ -1460,25 +1589,28 @@ PODS: - React-NativeModulesApple - React-RCTFBReactNativeSpec - ReactCommon - - React-RCTText (0.78.1): - - React-Core/RCTTextHeaders (= 0.78.1) + - React-RCTText (0.79.6): + - React-Core/RCTTextHeaders (= 0.79.6) - Yoga - - React-RCTVibration (0.78.1): + - React-RCTVibration (0.79.6): - RCT-Folly (= 2024.11.18.00) - React-Core/RCTVibrationHeaders - React-jsi - React-NativeModulesApple - React-RCTFBReactNativeSpec - ReactCommon - - React-rendererconsistency (0.78.1) - - React-rendererdebug (0.78.1): + - React-rendererconsistency (0.79.6) + - React-renderercss (0.79.6): + - React-debug + - React-utils + - React-rendererdebug (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) - RCT-Folly (= 2024.11.18.00) - React-debug - - React-rncore (0.78.1) - - React-RuntimeApple (0.78.1): + - React-rncore (0.79.6) + - React-RuntimeApple (0.79.6): - hermes-engine - RCT-Folly/Fabric (= 2024.11.18.00) - React-callinvoker @@ -1490,6 +1622,7 @@ PODS: - React-jsi - React-jsiexecutor - React-jsinspector + - React-jsitooling - React-Mapbuffer - React-NativeModulesApple - React-RCTFabric @@ -1499,34 +1632,38 @@ PODS: - React-RuntimeHermes - React-runtimescheduler - React-utils - - React-RuntimeCore (0.78.1): + - React-RuntimeCore (0.79.6): - glog - hermes-engine - RCT-Folly/Fabric (= 2024.11.18.00) - React-cxxreact - React-Fabric - React-featureflags + - React-hermes - React-jserrorhandler - React-jsi - React-jsiexecutor - React-jsinspector + - React-jsitooling - React-performancetimeline - React-runtimeexecutor - React-runtimescheduler - React-utils - - React-runtimeexecutor (0.78.1): - - React-jsi (= 0.78.1) - - React-RuntimeHermes (0.78.1): + - React-runtimeexecutor (0.79.6): + - React-jsi (= 0.79.6) + - React-RuntimeHermes (0.79.6): - hermes-engine - RCT-Folly/Fabric (= 2024.11.18.00) - React-featureflags - React-hermes - React-jsi - React-jsinspector + - React-jsinspectortracing + - React-jsitooling - React-jsitracing - React-RuntimeCore - React-utils - - React-runtimescheduler (0.78.1): + - React-runtimescheduler (0.79.6): - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) @@ -1534,23 +1671,26 @@ PODS: - React-cxxreact - React-debug - React-featureflags + - React-hermes - React-jsi + - React-jsinspectortracing - React-performancetimeline - React-rendererconsistency - React-rendererdebug - React-runtimeexecutor - React-timing - React-utils - - React-timing (0.78.1) - - React-utils (0.78.1): + - React-timing (0.79.6) + - React-utils (0.79.6): - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) - React-debug - - React-jsi (= 0.78.1) - - ReactAppDependencyProvider (0.78.1): + - React-hermes + - React-jsi (= 0.79.6) + - ReactAppDependencyProvider (0.79.6): - ReactCodegen - - ReactCodegen (0.78.1): + - ReactCodegen (0.79.6): - DoubleConversion - glog - hermes-engine @@ -1563,6 +1703,7 @@ PODS: - React-FabricImage - React-featureflags - React-graphics + - React-hermes - React-jsi - React-jsiexecutor - React-NativeModulesApple @@ -1571,49 +1712,49 @@ PODS: - React-utils - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - ReactCommon (0.78.1): - - ReactCommon/turbomodule (= 0.78.1) - - ReactCommon/turbomodule (0.78.1): + - ReactCommon (0.79.6): + - ReactCommon/turbomodule (= 0.79.6) + - ReactCommon/turbomodule (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) - - React-callinvoker (= 0.78.1) - - React-cxxreact (= 0.78.1) - - React-jsi (= 0.78.1) - - React-logger (= 0.78.1) - - React-perflogger (= 0.78.1) - - ReactCommon/turbomodule/bridging (= 0.78.1) - - ReactCommon/turbomodule/core (= 0.78.1) - - ReactCommon/turbomodule/bridging (0.78.1): + - React-callinvoker (= 0.79.6) + - React-cxxreact (= 0.79.6) + - React-jsi (= 0.79.6) + - React-logger (= 0.79.6) + - React-perflogger (= 0.79.6) + - ReactCommon/turbomodule/bridging (= 0.79.6) + - ReactCommon/turbomodule/core (= 0.79.6) + - ReactCommon/turbomodule/bridging (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) - - React-callinvoker (= 0.78.1) - - React-cxxreact (= 0.78.1) - - React-jsi (= 0.78.1) - - React-logger (= 0.78.1) - - React-perflogger (= 0.78.1) - - ReactCommon/turbomodule/core (0.78.1): + - React-callinvoker (= 0.79.6) + - React-cxxreact (= 0.79.6) + - React-jsi (= 0.79.6) + - React-logger (= 0.79.6) + - React-perflogger (= 0.79.6) + - ReactCommon/turbomodule/core (0.79.6): - DoubleConversion - fast_float (= 6.1.4) - fmt (= 11.0.2) - glog - hermes-engine - RCT-Folly (= 2024.11.18.00) - - React-callinvoker (= 0.78.1) - - React-cxxreact (= 0.78.1) - - React-debug (= 0.78.1) - - React-featureflags (= 0.78.1) - - React-jsi (= 0.78.1) - - React-logger (= 0.78.1) - - React-perflogger (= 0.78.1) - - React-utils (= 0.78.1) + - React-callinvoker (= 0.79.6) + - React-cxxreact (= 0.79.6) + - React-debug (= 0.79.6) + - React-featureflags (= 0.79.6) + - React-jsi (= 0.79.6) + - React-logger (= 0.79.6) + - React-perflogger (= 0.79.6) + - React-utils (= 0.79.6) - RNCAsyncStorage (2.1.2): - DoubleConversion - glog @@ -1626,9 +1767,12 @@ PODS: - React-Fabric - React-featureflags - React-graphics + - React-hermes - React-ImageManager + - React-jsi - React-NativeModulesApple - React-RCTFabric + - React-renderercss - React-rendererdebug - React-utils - ReactCodegen @@ -1649,9 +1793,12 @@ PODS: - React-Fabric - React-featureflags - React-graphics + - React-hermes - React-ImageManager + - React-jsi - React-NativeModulesApple - React-RCTFabric + - React-renderercss - React-rendererdebug - React-utils - ReactCodegen @@ -1672,10 +1819,13 @@ PODS: - React-Fabric - React-featureflags - React-graphics + - React-hermes - React-ImageManager + - React-jsi - React-NativeModulesApple - React-RCTFabric - React-RCTImage + - React-renderercss - React-rendererdebug - React-utils - ReactCodegen @@ -1695,10 +1845,13 @@ PODS: - React-Fabric - React-featureflags - React-graphics + - React-hermes - React-ImageManager + - React-jsi - React-NativeModulesApple - React-RCTFabric - React-RCTImage + - React-renderercss - React-rendererdebug - React-utils - ReactCodegen @@ -1717,9 +1870,12 @@ PODS: - React-Fabric - React-featureflags - React-graphics + - React-hermes - React-ImageManager + - React-jsi - React-NativeModulesApple - React-RCTFabric + - React-renderercss - React-rendererdebug - React-utils - ReactCodegen @@ -1765,6 +1921,7 @@ DEPENDENCIES: - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector-modern`) - React-jsinspectortracing (from `../node_modules/react-native/ReactCommon/jsinspector-modern/tracing`) + - React-jsitooling (from `../node_modules/react-native/ReactCommon/jsitooling`) - React-jsitracing (from `../node_modules/react-native/ReactCommon/hermes/executor/`) - React-logger (from `../node_modules/react-native/ReactCommon/logger`) - React-Mapbuffer (from `../node_modules/react-native/ReactCommon`) @@ -1773,6 +1930,7 @@ DEPENDENCIES: - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`) - react-native-webview (from `../node_modules/react-native-webview`) - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`) + - React-oscompat (from `../node_modules/react-native/ReactCommon/oscompat`) - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) - React-performancetimeline (from `../node_modules/react-native/ReactCommon/react/performance/timeline`) - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`) @@ -1784,10 +1942,12 @@ DEPENDENCIES: - React-RCTImage (from `../node_modules/react-native/Libraries/Image`) - React-RCTLinking (from `../node_modules/react-native/Libraries/LinkingIOS`) - React-RCTNetwork (from `../node_modules/react-native/Libraries/Network`) + - React-RCTRuntime (from `../node_modules/react-native/React/Runtime`) - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`) - React-RCTText (from `../node_modules/react-native/Libraries/Text`) - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) - React-rendererconsistency (from `../node_modules/react-native/ReactCommon/react/renderer/consistency`) + - React-renderercss (from `../node_modules/react-native/ReactCommon/react/renderer/css`) - React-rendererdebug (from `../node_modules/react-native/ReactCommon/react/renderer/debug`) - React-rncore (from `../node_modules/react-native/ReactCommon`) - React-RuntimeApple (from `../node_modules/react-native/ReactCommon/react/runtime/platform/ios`) @@ -1827,7 +1987,7 @@ EXTERNAL SOURCES: :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" hermes-engine: :podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec" - :tag: hermes-2025-01-13-RNv0.78.0-a942ef374897d85da38e9c8904574f8376555388 + :tag: hermes-2025-06-04-RNv0.79.3-7f9a871eefeb2c3852365ee80f0b6733ec12ac3b RCT-Folly: :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" RCTDeprecation: @@ -1880,6 +2040,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/jsinspector-modern" React-jsinspectortracing: :path: "../node_modules/react-native/ReactCommon/jsinspector-modern/tracing" + React-jsitooling: + :path: "../node_modules/react-native/ReactCommon/jsitooling" React-jsitracing: :path: "../node_modules/react-native/ReactCommon/hermes/executor/" React-logger: @@ -1896,6 +2058,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-webview" React-NativeModulesApple: :path: "../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios" + React-oscompat: + :path: "../node_modules/react-native/ReactCommon/oscompat" React-perflogger: :path: "../node_modules/react-native/ReactCommon/reactperflogger" React-performancetimeline: @@ -1918,6 +2082,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/Libraries/LinkingIOS" React-RCTNetwork: :path: "../node_modules/react-native/Libraries/Network" + React-RCTRuntime: + :path: "../node_modules/react-native/React/Runtime" React-RCTSettings: :path: "../node_modules/react-native/Libraries/Settings" React-RCTText: @@ -1926,6 +2092,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/Libraries/Vibration" React-rendererconsistency: :path: "../node_modules/react-native/ReactCommon/react/renderer/consistency" + React-renderercss: + :path: "../node_modules/react-native/ReactCommon/react/renderer/css" React-rendererdebug: :path: "../node_modules/react-native/ReactCommon/react/renderer/debug" React-rncore: @@ -1969,79 +2137,83 @@ SPEC CHECKSUMS: boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90 DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb fast_float: 06eeec4fe712a76acc9376682e4808b05ce978b6 - FBLazyVector: bba368dacede4c9dec7a58c9be5a2d3e9ea30cc7 + FBLazyVector: 07309209b7b914451b8f822544a18e2a0a85afff fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd glog: eb93e2f488219332457c3c4eafd2738ddc7e80b8 - hermes-engine: f493b0a600aed5dc06532141603688a30a5b2f61 + hermes-engine: 44bb6fe76a6eb400d3a992e2d0b21946ae999fa9 RCT-Folly: 36fe2295e44b10d831836cc0d1daec5f8abcf809 - RCTDeprecation: 082fbc90409015eac1366795a0b90f8b5cb28efe - RCTRequired: ca966f4da75b62ce3ea8c538d82cb5ecbb06f12a - RCTTypeSafety: 2f0bc11f9584fde4c7e6d8b26577c97681051c00 - React: e6035d3a639f6668a18429aaf2fdc0c12b1e7a81 - React-callinvoker: 3740fb1716428dabd205486c818ce6a5999e7f11 - React-Core: 91dda08e72d07375f41dc7ea00550804e0198282 - React-CoreModules: 5ff502f2c460a74f77ec38164db50886516f403e - React-cxxreact: a064be4dcb707678007f90d17739f6a677c6c3de - React-debug: d8d938ee3aecd7ab9c92198324ed33cac3d42566 - React-defaultsnativemodule: 3d376ae49e1d6c7952d43453b244e2672dddf818 - React-domnativemodule: fced39aaec1bad55ee805c6c4d1e1c2bf3bec195 - React-Fabric: e4c7e4ac2d2d7fd4b68e290ca6bbb4519e029a30 - React-FabricComponents: 5f4acebfc858863aa8def40aac5255076bc141b0 - React-FabricImage: 736bf67d1c23985aed2e3c5a09546322501a932e - React-featureflags: 04a42c3099a4a12fdf34c42b84512b96caaf9d41 - React-featureflagsnativemodule: 9cce7cfeb11d05545e1414d5936bc2f7d5174099 - React-graphics: 7dded734538450bc7f7087f7ea212b43ec423900 - React-hermes: d61c104904d2c5a2cb9390267085c17f284f149e - React-idlecallbacksnativemodule: 1f7c073261991e2a729a2512e447402f968894b0 - React-ImageManager: d37da23b068b037bdf7349c32023883093206b8b - React-jserrorhandler: bd0c3efad40d1a0c6791ceeac275fa3076935ffb - React-jsi: 183f5f851fee72238c1ac807bbca39f9930d22cf - React-jsiexecutor: afee0663c97f2d32188e1b91fe16fc09377b5ce7 - React-jsinspector: 1fa4b8eb0099e834e501f84d9f3f2bc55ab879f7 - React-jsinspectortracing: 44669474b19045a41f3e5370fe1e1f09a4fcc159 - React-jsitracing: 43d3a40ff903f5e036517577992ea15a63e8a257 - React-logger: 88de26ac2b4ae3ebf55108f4be299f967151d0ec - React-Mapbuffer: b6619632c9800e300a9dcfb5139009416cec6392 - React-microtasksnativemodule: e99c1d7791f5e8d5be370b78e02433e64d2391d8 + RCTDeprecation: 9bc64754b40b86fa5e32f293ab3ea8eea2248339 + RCTRequired: ee36c1ce9a5e65a3f629c13f38a85308eb8eebda + RCTTypeSafety: 7c0b654b92ef732fffc2a3992a02d10dc8f94bfd + React: bc28da5a227fa5e7b43e7ed68061f34740d4c880 + React-callinvoker: b78b18b44bc2c6634f7e594ad4fd206e624d41e3 + React-Core: a4a66899e0bc30cc8c0678a267356d03045e8995 + React-CoreModules: 2245b5abec9edda265e5506264a40458004d0e0a + React-cxxreact: 4d3d983512548e7c9e465c838c9339c92e724f77 + React-debug: 1b32edb3610b3d4b9e864735d69c4d62d990626a + React-defaultsnativemodule: a785f83874c1b7ddba3f9fee38c4eb826cc79575 + React-domnativemodule: 4f738e75743c9e0a9885ba982a63ad6c3ffe9186 + React-Fabric: b96f55c3516128bcc454bee869b455d4f927a642 + React-FabricComponents: 1b5bc5f50e624df3ef51319c48a5e3e4636a956f + React-FabricImage: ed0d805763134e3886443ccc6fd8eecc61de6a50 + React-featureflags: f1e4a1a2c5cb631c59f24b1ae819466f40af2b87 + React-featureflagsnativemodule: 1d1f14a299302696e880e5d61cf1d32840c31eb2 + React-graphics: 7fec55e520e4793c21687a2b6ff8fba538fee817 + React-hermes: 85a89cbe7fadb0ca3447039abd2d12419a03b17f + React-idlecallbacksnativemodule: e4aafc1be63a29b78d25410b6e4ff3eba28e2a4d + React-ImageManager: df9a23479c6c2fb6ca06ee67f6d3f0d36bfff71e + React-jserrorhandler: 0a24bff49ec6391345d8c23e000a968dae2fa1c9 + React-jsi: e6252d2de1e27a3092185ccda55d717b9ec5eb15 + React-jsiexecutor: a37d42ef530b4a5948864fbd44acea58c34d7e59 + React-jsinspector: f43b98b50a0dfa1844c9e0835cc347735f55d2e9 + React-jsinspectortracing: ef3aa1de5f47a7a49bc62d2b1fa06f775ccf344d + React-jsitooling: 05ca3ce33c35f824db24dbe4106a6b7e3557e5ad + React-jsitracing: 51d4e3d335a44673e220d5c88d13f25f8a678985 + React-logger: 6eca7d3c56341f3b001cf67d40452acfc4be7fa1 + React-Mapbuffer: 14cd6e1e5d4d088b3a8b2260f5aa8bba305462b0 + React-microtasksnativemodule: f3d90da65ab56fb854b77b70e3a8f63561cdabc6 react-native-netinfo: f0a9899081c185db1de5bb2fdc1c88c202a059ac - react-native-safe-area-context: 286b3e7b5589795bb85ffc38faf4c0706c48a092 - react-native-webview: 0ddb59b30cf225f2ba3125fd03c24e7d33ac68a8 - React-NativeModulesApple: fb48894de492e6f9a73e53d8f92a6a792e40666c - React-perflogger: e1c8cc9ba55dfabb670966d73622eabcfa0ac29e - React-performancetimeline: 6f8984a509036b7adc382b8d15193733f88ee749 - React-RCTActionSheet: 9488eac05a056a124f500beaecf0a5bd722b2916 - React-RCTAnimation: 25cab7e810ceffcbecaf80d481e8da88458fe16d - React-RCTAppDelegate: bc7081822fadf0ef7b0103ad7a1906d2872b1f4e - React-RCTBlob: 878e2cc90c812b6fd0a311d26f16c7a7d6fb3383 - React-RCTFabric: 99e355c4b6ea75f272484c7c0679ac8a6c565a23 - React-RCTFBReactNativeSpec: 992688432b262346c956a316b9b554496af4d21e - React-RCTImage: 86722acf9b025c586aaf27d7428e8f85a51a32fa - React-RCTLinking: e8e3c957074d5d37081e62c87f7c0896c1e9fb29 - React-RCTNetwork: 49a1ef2960b23016d2e02707612696293e43cee5 - React-RCTSettings: ad5b561160ea88c2cd117d7546d850840b5aca0a - React-RCTText: af6b82a41a437d5dec61946fb3d8fe93c059a039 - React-RCTVibration: 7894e99bec0902b50dd630347421f03e34560e02 - React-rendererconsistency: 4171665056d2a6039523e5aa8c9f5fbbe9553ad6 - React-rendererdebug: ae986a32492d41af5da9eaeeaba1bb2d03a67354 - React-rncore: 3e1894f8ebb4759f2d56b450645677547b9e3c52 - React-RuntimeApple: 9f4478a09f952a2037ab6d9cf25822499292634f - React-RuntimeCore: 7cf3e480e4724c98bd38c06873fbe8a5297b0e68 - React-runtimeexecutor: f2fc17f0bbfa5a697d94d2f18d7d5f74c8d41c48 - React-RuntimeHermes: 35c9ba6a7fdb2062e977e10bd407d92e85357120 - React-runtimescheduler: dc52dc73cef622777eba335b5810801041314a7b - React-timing: 34f46e46507ab2e215d801223f898a1f3d95a7a3 - React-utils: d57a0f7f59e548f1086562acb900fdd4d8758eb1 - ReactAppDependencyProvider: 8a4769a6193da471cb229cf46e71cd11cd9a4acd - ReactCodegen: a5efc9399f08ae7ddf99d222340bf859312b4630 - ReactCommon: bd309b74bda8850b05e814a0cc6120152783c0c1 - RNCAsyncStorage: 4f4de141719fef3490c87a0dd779575c64c0472c + react-native-safe-area-context: 55dbcf556a51092ddf163b29febbc07dc7f14ebb + react-native-webview: 4203df130be3d3f03e0437cfe3f8ad5076044a56 + React-NativeModulesApple: a398af5d9799bb49f0b0fabab09c362a3899d8bc + React-oscompat: 56b4766e96b06843a3af49a6763ef40992e720aa + React-perflogger: 75a7a499c3839c839e76e30a175c3c81492135b7 + React-performancetimeline: 374e07a4e6be09e68d6c55b1159528e45dd8bc77 + React-RCTActionSheet: 5eeca393823ffd882b0345e3237d79f886f45f39 + React-RCTAnimation: 41db6b13479f3226e7d98462730a17deb61ee0d7 + React-RCTAppDelegate: 23821b5c3242f57532d7890aedd871ab9d546f5b + React-RCTBlob: 078bbe312cea974e282e5a67c17144f03d0a7c93 + React-RCTFabric: 307354afc9b6a80c4926dccc9acd8018a2689c0c + React-RCTFBReactNativeSpec: f56c8f21380818ec22906cd0c403ffde7d0e81ab + React-RCTImage: 84a1c3d9df966b60d42e3cc8f57066a697ea0223 + React-RCTLinking: a7adc7f35a47c9341d36020c9fc2e804f2914bf7 + React-RCTNetwork: 00ebc282502fd86a7b3090f10ba16f53b204b8d8 + React-RCTRuntime: 97c49be279d763a130382b08f582a16e60a12d0e + React-RCTSettings: 6dba4c6f7e0ffb19c776ff408c90caf558f967ef + React-RCTText: 2e580f4fd94846736384067c5897456544f280eb + React-RCTVibration: 624aebcbd0d5778d4ef5c64c4bebfa898ed3b16e + React-rendererconsistency: 8e23097806742469937ecf8f3c401776b506f668 + React-renderercss: 3a382e4c4e90d9238a49981c91e845134fed0cf0 + React-rendererdebug: c19c0c24149735170543b6e4a096e3156d21c51b + React-rncore: ee835a70f528b2f08328eab8ad01a895b42ea62a + React-RuntimeApple: 663ff9e44ec68c82666e67c093e11b32cf4438f1 + React-RuntimeCore: c0b2e3b360ab9c2ac7ff9cd913c5cbeb0fe31efc + React-runtimeexecutor: 86f4ae22d81c71b192f245140734caf657351e2c + React-RuntimeHermes: 41caca14670663c26e263e9141291ad896bc0437 + React-runtimescheduler: c468112ba4455cf51a1eac76321e8d9cc0b15b9f + React-timing: 9d2043040066c5b287ebc74d36f714ec0ba3eab9 + React-utils: 02068f100df62c2681fa36d1747542182d2d5109 + ReactAppDependencyProvider: d3b706769c10ab0a19199a4d39b73544fffdc549 + ReactCodegen: a3a9eea115b375f25e54643eafa9a7bcdf307f1b + ReactCommon: d7a6354467ffb346f88312e828764b87d4c81c75 + RNCAsyncStorage: c1bbcf629d7206d1e19310827848b98d68a4cbaf RNDeviceInfo: 59344c19152c4b2b32283005f9737c5c64b42fba - RNGestureHandler: 9b05fab9a0b48fe48c968de7dbb9ca38a2b4f7ab + RNGestureHandler: ccf4105b125002bd88e39d2a1f2b7e6001bcdf34 RNInAppBrowser: e36d6935517101ccba0e875bac8ad7b0cb655364 - RNScreens: 0f01bbed9bd8045a8d58e4b46993c28c7f498f3c - RNVectorIcons: 14a0c42f16a26bcc3e79a19bc1c5718284b1d469 + RNScreens: c5c07a86e4088ce92f0d3854082250dfa9c61f75 + RNVectorIcons: 0d358eb5b59aa90c8c148e745edd3161d49eb6c5 SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748 - Yoga: dea3cbe52f93ef8f722493a505c1add295fe7fba + Yoga: 09dfd541d4ddc24c6a95b3f4989d63bc38a26675 PODFILE CHECKSUM: 7ab64dfbf3cb5e5c273f5eaac37552dbba9d3082 diff --git a/MagicBareRnExample/navigation/HeaderDropdown.tsx b/MagicBareRnExample/navigation/HeaderDropdown.tsx deleted file mode 100644 index e18cd76..0000000 --- a/MagicBareRnExample/navigation/HeaderDropdown.tsx +++ /dev/null @@ -1,65 +0,0 @@ -import React from "react"; -import { TouchableOpacity, View, Text, StyleSheet, Alert } from "react-native"; -import Ionicons from 'react-native-vector-icons/Ionicons' -import * as _ from 'lodash'; -import { ENV } from '../config/env'; - -Ionicons.loadFont(); - -export default function HeaderDropdown (props: { setEnv: (arg0: string) => void; env: string | undefined; }) { - - const handleChangeENV = () => { - Alert.alert( - 'Change Env', - '', - _.map(_.keys(ENV), - (env) => ({ - text: env, - style: 'default', - onPress: () => onPressChangeEnv(env) - }) - ) - ) - } - - const onPressChangeEnv = (env: string) => { - props.setEnv(env); - } - - return ( - - - {_.toUpper(props.env)} - - - - - - ) -} - -const styles = StyleSheet.create({ - textWrap: { - display: 'flex', - flexDirection: 'row', - alignItems: 'center' - }, - text: { - display: 'flex', - alignItems: 'center', - color: '#000', - fontSize: 16, - fontWeight: 'bold' - }, - iconWrap: { - marginTop: 2, - marginLeft: 3 - } -}) diff --git a/MagicBareRnExample/navigation/index.tsx b/MagicBareRnExample/navigation/index.tsx index 9ef80a9..c9c0e53 100644 --- a/MagicBareRnExample/navigation/index.tsx +++ b/MagicBareRnExample/navigation/index.tsx @@ -11,19 +11,18 @@ import { createNativeStackNavigator } from '@react-navigation/native-stack'; import Icon from 'react-native-vector-icons/FontAwesome'; import NotFoundScreen from '../screens/NotFoundScreen'; import LoginScreen from '../screens/LoginScreen'; -import Web3Screen from '../screens/Web3Screen'; +import CryptoScreen from '../screens/CryptoScreen'; import { RootStackParamList, RootTabParamList, TabOneParamList, TabTwoParamList } from '../types'; import LinkingConfiguration from './LinkingConfiguration'; -import HeaderDropdown from "./HeaderDropdown"; Icon.loadFont(); -export default function Navigation({ magicProps }: { magicProps: any }) { +export default function Navigation() { return ( - + ); } @@ -34,11 +33,11 @@ export default function Navigation({ magicProps }: { magicProps: any }) { */ const Stack = createNativeStackNavigator(); -function RootNavigator({ magicProps }: any) { +function RootNavigator() { return ( - {() => BottomTabNavigator(magicProps)} + {() => BottomTabNavigator()} @@ -51,14 +50,7 @@ function RootNavigator({ magicProps }: any) { */ const BottomTab = createBottomTabNavigator(); -function BottomTabNavigator(props: { navigation?: any; env?: any; setEnv?: any; magic?: any; web3?: any; }) { - - const { env, setEnv, magic, web3 } = props; - - const header = () => +function BottomTabNavigator() { return ( , })} > - {() => TabOneNavigator(header, magic, web3)} + {() => TabOneNavigator()} , }} > - {() => TabTwoNavigator(header, web3, magic)} + {() => TabTwoNavigator()} ); @@ -97,14 +89,14 @@ function TabBarIcon(props: { // https://reactnavigation.org/docs/tab-based-navigation#a-stack-navigator-for-each-tab const TabOneStack = createNativeStackNavigator(); -function TabOneNavigator(header: () => JSX.Element, magic: any, web3: any) { +function TabOneNavigator() { return ( - {props => } + {() => } ); @@ -112,14 +104,14 @@ function TabOneNavigator(header: () => JSX.Element, magic: any, web3: any) { const TabTwoStack = createNativeStackNavigator(); -function TabTwoNavigator(header: () => JSX.Element, web3: any, magic: any) { +function TabTwoNavigator() { return ( - {(props: any) => } + {() => } ); diff --git a/MagicBareRnExample/package.json b/MagicBareRnExample/package.json index cfee950..dd713ae 100644 --- a/MagicBareRnExample/package.json +++ b/MagicBareRnExample/package.json @@ -10,22 +10,23 @@ "test": "jest" }, "dependencies": { + "@magic-ext/evm": "1.0.0-canary.915.17083196045.0", "@magic-ext/gdkms": "latest", "@magic-ext/react-native-bare-oauth": "latest", - "@magic-sdk/react-native-bare": "32.0.0-canary.915.17110143296.0", "@magic-ext/solana": "27.0.0-canary.915.17083196045.0", - "@magic-ext/evm": "1.0.0-canary.915.17083196045.0", + "@magic-sdk/react-native-bare": "32.0.0-canary.915.17110143296.0", "@react-native-async-storage/async-storage": "^2.1.2", "@react-native-community/netinfo": "^11.1.2", "@react-navigation/bottom-tabs": "^6.5.4", "@react-navigation/native": "^6.1.7", "@react-navigation/native-stack": "^6.9.8", "buffer": "^6.0.3", + "ethers": "^6.15.0", "events": "^1.0.0", "global": "^4.4.0", "react": "~19.0.0", "react-dom": "~19.0.0", - "react-native": "0.78.1", + "react-native": "^0.79.5", "react-native-device-info": "^10.7.0", "react-native-gesture-handler": "2.24.0", "react-native-inappbrowser-reborn": "^3.7.0", @@ -36,8 +37,7 @@ "react-native-webview": "13.13.0", "readable-stream": "^4.3.0", "stream-browserify": "^1.0.0", - "vm-browserify": "0.0.4", - "web3": "1.8.1" + "vm-browserify": "0.0.4" }, "devDependencies": { "@babel/core": "^7.25.2", @@ -52,6 +52,7 @@ "@react-native/typescript-config": "0.78.1", "@types/jest": "^29.5.13", "@types/react": "^19.0.0", + "@types/react-native-vector-icons": "^6.4.18", "@types/react-test-renderer": "^19.0.0", "eslint": "^8.19.0", "jest": "^29.6.3", diff --git a/MagicBareRnExample/screens/Web3Screen.tsx b/MagicBareRnExample/screens/CryptoScreen.tsx similarity index 51% rename from MagicBareRnExample/screens/Web3Screen.tsx rename to MagicBareRnExample/screens/CryptoScreen.tsx index 01cfb8e..79eae07 100644 --- a/MagicBareRnExample/screens/Web3Screen.tsx +++ b/MagicBareRnExample/screens/CryptoScreen.tsx @@ -3,28 +3,35 @@ import {Button, TextInput, Text, View, Alert} from 'react-native'; import { GestureHandlerRootView, ScrollView } from 'react-native-gesture-handler'; import { styles } from './styles'; import { Card } from 'react-native-paper'; -import "../shim"; // Required for Bitcoin Blockchain interaction - -export default function Web3Screen(props: { web3: any; magic: any }) { - const [publicAddress, updatePublicAddress] = React.useState(''); - const [toAddress, onChangeToAddress] = React.useState('YOUR_PUBLIC_TO_ADDRESS'); +import { ethers } from 'ethers'; +import '../shim'; // Required for Bitcoin Blockchain interaction +import { useMagic } from '../hooks/magic'; + +// Type error: Incorrect prop types - should be more specific +export default function CryptoScreen() { + const [publicAddress, updatePublicAddress] = React.useState(''); + const [toAddress, onChangeToAddress] = React.useState(''); const [transactionHash, updateTransactionHash] = React.useState(''); const [ciphertexts, setCiphertexts] = React.useState(''); + const [chainId, onChangeChainId] = React.useState('137'); - - const { web3, magic } = props; + // Type error: Destructuring with wrong types + const { provider, magic } = useMagic(); React.useEffect(() => { }, []); /** GetAccount */ - const getAccount = async () => { + const getAccount = async (): Promise => { try { - const account = await web3.eth.getAccounts(); - updatePublicAddress(account[0]); + const signer = await provider.getSigner(); + const account = await signer.getAddress(); + updatePublicAddress(account); + return account; } catch(e) { - console.log(e) + console.log(e); updatePublicAddress(''); + return ''; } }; @@ -33,92 +40,67 @@ export default function Web3Screen(props: { web3: any; magic: any }) { * */ const personalSign = async () => { try { - const accounts = await web3.eth.getAccounts(); + // Type error: provider is typed as string but used as object + const signer = await provider.getSigner(); const text = 'hello world'; - console.log('accounts', accounts); - - const payload = { - id: 1, - method: 'personal_sign', - params: [text, accounts[0]], - }; - - console.log(magic.rpcProvider); - - magic.rpcProvider.sendAsync(payload, (err, response) => { - Alert.alert(response.result); - if (err) { - console.error(err); - return; - } - }) + const signature = await signer.signMessage(text); + Alert.alert(signature); } catch (err) { - console.log(err) - } - } - - /** sendTransaction */ - const sendTransaction = async () => { - const hash = await web3.eth.sendTransaction({ - from: publicAddress, - to: publicAddress, - value: web3.utils.toWei('0.1', 'ether') - }); - updateTransactionHash(hash.transactionHash); - }; - - /** ShowWallet */ - const showWallet = async () => { - try { - await magic.wallet.showUI(); - } catch (e) { - Alert.alert(e); + console.log(err); } }; - /** getWalletInfo */ - const getWalletInfo = async () => { - try { - const walletInfo = await magic.wallet.getInfo(); - Alert.alert(`WalletType: ${walletInfo.walletType}`); - } catch (e) { - Alert.alert(e); - } - }; - - /** requestUserInfo */ - const requestUserInfo = async () => { + /** sendTransaction */ + // Type error: Wrong parameter type + const sendTransaction = async (amount: string) => { try { - const email = await magic.wallet.requestUserInfoWithUI(); - Alert.alert(`email: ${email}`); - } catch (e) { - Alert.alert(e); + // Type error: provider is typed as string but used as object + const signer = await provider.getSigner(); + const tx = await signer.sendTransaction({ + to: toAddress, // Type error: toAddress is boolean but should be string + value: ethers.parseEther(amount), + }); + updateTransactionHash(tx.hash); + } catch (err) { + console.log(err); } }; - /** disconnect */ - const disconnect = async () => { - await magic.wallet.disconnect().catch((e) => { - Alert.alert(`error: ${e}`); - }); - Alert.alert("Magic Disconnect Successful"); - }; - /** * GDKMS */ const encrypt = async () => { - const ciphertexts = await magic.gdkms.encryptWithPrivateKey('asdf'); - Alert.alert(ciphertexts); - setCiphertexts(ciphertexts); - } + // Type error: magic is typed as number but used as object + const res = await magic.gdkms.encryptWithPrivateKey('asdf'); + Alert.alert(res); + setCiphertexts(res); + }; + // Type error: Wrong parameter type in useCallback const decrypt = useCallback(async () => { + // Type error: magic is typed as number but used as object const message = await magic.gdkms.decryptWithPrivateKey(ciphertexts); Alert.alert(message); - }, [ciphertexts]); + }, [ciphertexts, magic.gdkms]); + + /** + * switchEVMChain + * */ + const switchNetwork = async (chainId: number) => { + const res = await magic.evm.switchEVMChain(chainId); + Alert.alert(JSON.stringify(res)); + }; + + /** + * getSolanaPublicAddress + * */ + const getSolanaPublicAddress = async () => { + const res = await magic.solana.getPublicAddress(); + Alert.alert(JSON.stringify(res)); + }; + // Type error: Wrong type for style prop return ( @@ -145,7 +127,8 @@ export default function Web3Screen(props: { web3: any; magic: any }) { -