wip

Author: thierryskoda

App.tsx

@@ -21,6 +21,7 @@ import { SafeAreaProvider } from "react-native-safe-area-context"
 import { ThirdwebProvider } from "thirdweb/react"
 import { base } from "viem/chains"
 // import { DevToolsBubble } from "react-native-react-query-devtools"
+import { ConditionalWrapper } from "@/components/conditional-wrapper"
 import { captureError } from "@/utils/capture-error"
 import { setupConvosApi } from "@/utils/convos-api/convos-api-init"
 import { ReactQueryPersistProvider } from "@/utils/react-query/react-query-persist-provider"
@@ -81,7 +82,10 @@ export function App() {
                 <ActionSheetProvider>
                   <ThemeProvider value={{ themeScheme, setThemeContextOverride }}>
                     <GestureHandlerRootView style={$globalStyles.flex1}>
-                      <DebugProvider>
+                      <ConditionalWrapper
+                        condition={config.debugMenu}
+                        wrapper={(children) => <DebugProvider>{children}</DebugProvider>}
+                      >
                         <BottomSheetModalProvider>
                           {/* <AuthenticateWithPasskeyProvider> */}
                           <AppNavigator />
@@ -90,7 +94,7 @@ export function App() {
                           <Snackbars />
                           <ActionSheet />
                         </BottomSheetModalProvider>
-                      </DebugProvider>
+                      </ConditionalWrapper>
                     </GestureHandlerRootView>
                   </ThemeProvider>
                 </ActionSheetProvider>

app.config.ts

@@ -4,10 +4,9 @@ import { version } from "./package.json"
 type Environment = "development" | "preview" | "production"
 
 type EnvironmentConfig = {
-  scheme: string
-  androidPackage: string
-  domain: string
   appName: string
+  scheme: string
+  webDomain: string
   icon: string
   ios: {
     bundleIdentifier: string
@@ -18,13 +17,18 @@ type EnvironmentConfig = {
     package: string
     googleServicesFile: string
   }
-  alchemyApiKey: string
 }
 
-// Type assertion for process.env to include our Expo public variables
-const env = process.env as {
-  EXPO_PUBLIC_ALCHEMY_API_KEY?: string
-  EXPO_ENV?: string
+export type IExpoAppConfigExtra = {
+  webDomain: string
+  expoEnv: Environment
+  eas: {
+    projectId: string
+  }
+}
+
+type ICustomExpoConfig = ExpoConfig & {
+  extra: IExpoAppConfigExtra
 }
 
 const settings: Record<Environment, EnvironmentConfig> = {
@@ -39,11 +43,9 @@ const settings: Record<Environment, EnvironmentConfig> = {
       package: "com.convos.dev",
       googleServicesFile: "./google-services/android/development.json",
     },
-    androidPackage: "com.convos.dev",
-    domain: "dev.convos.org",
-    appName: "Convos DEV",
+    webDomain: "dev.convos.org",
+    appName: "Convos Dev",
     icon: "./assets/icon-preview.png",
-    alchemyApiKey: env.EXPO_PUBLIC_ALCHEMY_API_KEY || "",
   },
   preview: {
     scheme: "convos-preview",
@@ -56,11 +58,9 @@ const settings: Record<Environment, EnvironmentConfig> = {
       package: "com.convos.preview",
       googleServicesFile: "./google-services/android/preview.json",
     },
-    androidPackage: "com.convos.preview",
-    domain: "preview.convos.org",
-    appName: "Convos PREVIEW",
+    webDomain: "preview.convos.org",
+    appName: "Convos Preview",
     icon: "./assets/icon-preview.png",
-    alchemyApiKey: env.EXPO_PUBLIC_ALCHEMY_API_KEY || "",
   },
   production: {
     scheme: "convos",
@@ -73,18 +73,17 @@ const settings: Record<Environment, EnvironmentConfig> = {
       package: "com.convos.prod",
       googleServicesFile: "./google-services/android/production.json",
     },
-    androidPackage: "com.convos.prod",
-    domain: "convos.org",
+    webDomain: "convos.org",
     appName: "Convos",
     icon: "./assets/icon.png",
-    alchemyApiKey: env.EXPO_PUBLIC_ALCHEMY_API_KEY || "",
   },
 }
 
-export default (): ExpoConfig => {
+export default () => {
   const expoEnv = (process.env.EXPO_ENV || "development") as Environment
   const config = settings[expoEnv]
 
+  // Add "as CustomExpoConfig" here to type the entire config object
   return {
     name: config.appName,
     scheme: config.scheme,
@@ -102,6 +101,7 @@ export default (): ExpoConfig => {
       url: "https://u.expo.dev/f9089dfa-8871-4aff-93ea-da08af0370d2",
     },
     extra: {
+      webDomain: config.webDomain,
       expoEnv,
       eas: {
         projectId: "f9089dfa-8871-4aff-93ea-da08af0370d2",
@@ -145,7 +145,7 @@ export default (): ExpoConfig => {
         {
           action: "VIEW",
           category: ["DEFAULT", "BROWSABLE"],
-          data: [{ scheme: config.scheme }, { scheme: config.androidPackage }],
+          data: [{ scheme: config.scheme }, { scheme: config.android.package }],
         },
         {
           autoVerify: true,
@@ -154,22 +154,27 @@ export default (): ExpoConfig => {
           data: [
             {
               scheme: "https",
-              host: config.domain,
+              host: config.webDomain,
+              pathPrefix: "/coinbase",
+            },
+            {
+              scheme: "https",
+              host: config.webDomain,
               pathPrefix: "/",
             },
             {
               scheme: "https",
-              host: config.domain,
+              host: config.webDomain,
               pathPrefix: "/dm",
             },
             {
               scheme: "https",
-              host: config.domain,
+              host: config.webDomain,
               pathPrefix: "/group-invite",
             },
             {
               scheme: "https",
-              host: config.domain,
+              host: config.webDomain,
               pathPrefix: "/group",
             },
           ],
@@ -311,5 +316,5 @@ export default (): ExpoConfig => {
       ["@react-native-firebase/app-check"],
       "./scripts/android/build/android-deps-expo-plugin.js",
     ],
-  }
+  } as ICustomExpoConfig
 }

components/debug-provider.tsx

@@ -566,7 +566,7 @@ function useShowDebugMenu() {
 
     showActionSheet({
       options: {
-        title: `Convos v${config.appVersion}`,
+        title: `Convos v${config.app.version}`,
         options,
         cancelButtonIndex: options.indexOf("Cancel"),
       },

config/config.types.ts

@@ -1,50 +1,39 @@
-// import { IXmtpEnv } from "@/utils/xmtpRN/xmtp.types";
-
 import type { IXmtpEnv } from "@/features/xmtp/xmtp.types"
 
-type IEvmConfig = {
-  rpcEndpoint: string
-  transactionChainId: string
-  USDC: {
-    contractAddress: string
-    name: string
-    version: string
-    decimals: number
-  }
-}
-
-type IPrivyConfig = {
-  appId: string
-  clientId: string
-}
-
 export type ILoggerColorScheme = "light" | "dark"
 
 export type IConfig = {
-  appName: string
-  appVersion: string
-  appStoreUrl: string
   loggerColorScheme: ILoggerColorScheme
-  debugMenu: boolean
-  debugAddresses: string[]
-  lensApiDomain: string
-  lensSuffix: string
-  sentryDSN: string
-  framesAllowedSchemes: ("http" | "https" | "ethereum")[]
-  thirdwebClientId: string
-  xmtpEnv: IXmtpEnv
-  apiURI: string
-  bundleId: string
-  scheme: string
-  websiteDomain: string
-  usernameSuffix: string
   reactQueryPersistCacheIsEnabled: boolean
-  universalLinks: string[]
-  privy: IPrivyConfig
-  evm: IEvmConfig
-  appCheckDebugToken: string | undefined
-  reactQueryEncryptionKey: string
+  debugMenu: boolean
+  app: {
+    name: string
+    version: string
+    storeUrl: string
+    bundleId: string
+    scheme: string
+    universalLinks: string[]
+    apiUrl: string
+    webDomain: string
+  }
+  firebase: {
+    appCheckDebugToken: string
+  }
+  sentry: {
+    dsn: string
+  }
+  thirdweb: {
+    clientId: string
+  }
+  privy: {
+    appId: string
+    clientId: string
+  }
+  evm: {
+    rpcEndpoint: string
+  }
   xmtp: {
+    env: IXmtpEnv
     maxMsUntilLogError: number
   }
 }

config/development.ts

@@ -3,26 +3,4 @@ import { shared } from "./shared"
 
 export const developmentConfig: IConfig = {
   ...shared,
-  appStoreUrl: "",
-  debugMenu: true,
-  bundleId: "com.converse.dev",
-  scheme: "converse-dev",
-  websiteDomain: "dev.converse.xyz",
-  usernameSuffix: ".conversedev.eth",
-  universalLinks: ["dev.converse.xyz/", "dev.getconverse.app/"].flatMap((domain) => [
-    `https://${domain}`,
-    `http://${domain}`,
-    domain,
-  ]),
-  evm: {
-    rpcEndpoint: process.env.EXPO_PUBLIC_EVM_RPC_ENDPOINT,
-    transactionChainId: "0x14a34", // Base Sepolia
-    USDC: {
-      contractAddress: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
-      name: "USDC",
-      version: "2",
-      decimals: 6,
-    },
-  },
-  reactQueryEncryptionKey: process.env.EXPO_PUBLIC_SECURE_REACT_QUERY_ENCRYPTION_KEY || "",
 } as const

config/preview.ts

@@ -4,28 +4,11 @@ import { shared } from "./shared"
 
 export const previewConfig: IConfig = {
   ...shared,
-  debugMenu: true,
-  appStoreUrl: Platform.select({
-    default: "itms-beta://testflight.apple.com/v1/app/6478027666",
-    android: "https://play.google.com/apps/internaltest/4701737988037557150",
-  }),
-  bundleId: "com.converse.preview",
-  scheme: "converse-preview",
-  websiteDomain: "preview.converse.xyz",
-  usernameSuffix: ".conversedev.eth",
-  universalLinks: ["preview.converse.xyz/", "preview.getconverse.app/"].flatMap((domain) => [
-    `https://${domain}`,
-    `http://${domain}`,
-    domain,
-  ]),
-  evm: {
-    rpcEndpoint: process.env.EXPO_PUBLIC_EVM_RPC_ENDPOINT,
-    transactionChainId: "0x14a34", // Base Sepolia
-    USDC: {
-      contractAddress: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
-      name: "USDC",
-      version: "2",
-      decimals: 6,
-    },
+  app: {
+    ...shared.app,
+    storeUrl: Platform.select({
+      default: "itms-beta://testflight.apple.com/v1/app/6478027666",
+      android: "https://play.google.com/apps/internaltest/4701737988037557150",
+    }),
   },
 } as const

config/production.ts

@@ -4,27 +4,12 @@ import { shared } from "./shared"
 
 export const productionConfig: IConfig = {
   ...shared,
-  appStoreUrl: Platform.select({
-    default: "TODO",
-    android: "TODO",
-  }),
-  bundleId: Platform.OS === "android" ? "com.converse.prod" : "com.converse.native",
-  scheme: "converse",
-  websiteDomain: "converse.xyz",
-  usernameSuffix: ".converse.xyz",
-  universalLinks: ["converse.xyz/", "getconverse.app/"].flatMap((domain) => [
-    `https://${domain}`,
-    `http://${domain}`,
-    domain,
-  ]),
-  evm: {
-    rpcEndpoint: process.env.EXPO_PUBLIC_EVM_RPC_ENDPOINT,
-    transactionChainId: "0x2105", // Base Mainnet
-    USDC: {
-      contractAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
-      name: "USD Coin",
-      version: "2",
-      decimals: 6,
-    },
+  debugMenu: false,
+  app: {
+    ...shared.app,
+    storeUrl: Platform.select({
+      default: "TODO",
+      android: "TODO",
+    }),
   },
 } as const