Fix: ENV was not loading from .env file

celo-org · Jul 5, 2023 · ab87ae8 · ab87ae8
1 parent 29ace10
commit ab87ae8
Show file tree

Hide file tree

Showing 6 changed files with 613 additions and 21 deletions.
diff --git a/packages/react-native-app-without-expo/App.tsx b/packages/react-native-app-without-expo/App.tsx
@@ -1,18 +1,16 @@
 // @ts-expect-error - `@env` is a virtualised module via Babel config.
 import {ENV_PROJECT_ID} from '@env';
 
-import React from 'react';
-import {StatusBar, StyleSheet} from 'react-native';
-import {SafeAreaProvider} from 'react-native-safe-area-context';
+import {Web3Modal} from '@web3modal/react-native';
 import {useEffect} from 'react';
-import {LogBox} from 'react-native';
+import {LogBox, StatusBar, StyleSheet} from 'react-native';
+import {SafeAreaProvider} from 'react-native-safe-area-context';
+import {providerMetadata, sessionParams} from './constants/Config';
+import {ThemeProvider} from './context/ThemeProvider';
 import useColorScheme from './hooks/useColorScheme';
 import Navigation from './navigation';
-import {ThemeProvider} from './context/ThemeProvider';
-import {Web3Modal} from '@web3modal/react-native';
-import {providerMetadata, sessionParams} from './constants/Config';
 
-console.log(ENV_PROJECT_ID);
+console.log('ENV_PROJECT_ID', ENV_PROJECT_ID);
 
 const App = () => {
   const colorScheme = useColorScheme();

diff --git a/packages/react-native-app-without-expo/babel.config.js b/packages/react-native-app-without-expo/babel.config.js
@@ -3,19 +3,7 @@ module.exports = function (api) {
   return {
     presets: ['module:metro-react-native-babel-preset'],
     plugins: [
-      [
-        'module:react-native-dotenv',
-        {
-          envName: 'APP_ENV',
-          moduleName: '@env',
-          path: '.env',
-          blocklist: null,
-          allowlist: null,
-          safe: false,
-          allowUndefined: true,
-          verbose: false,
-        },
-      ],
+      ['module:react-native-dotenv'],
       [
         '@babel/plugin-transform-react-jsx',
         {

diff --git a/packages/react-native-app-without-expo/ios/CeloComposer.xcodeproj/project.pbxproj b/packages/react-native-app-without-expo/ios/CeloComposer.xcodeproj/project.pbxproj
@@ -596,6 +596,7 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
 			name = Debug;
@@ -659,6 +660,7 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};

diff --git a/...expo/ios/CeloComposer.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/...expo/ios/CeloComposer.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/packages/react-native-app-without-expo/ios/CeloComposer.xcworkspace/contents.xcworkspacedata b/packages/react-native-app-without-expo/ios/CeloComposer.xcworkspace/contents.xcworkspacedata