fix: Privy ("Already used" error) (#1599)

Author: thierryskoda

.gitignore

@@ -25,7 +25,7 @@ build-*.apk
 expo-env.d.ts
 
 # iOS
-ios/Converse.xcworkspace/xcshareddata/swiftpm/Package.resolved
+/ios/
 *.jks
 *.p8
 *.p12
@@ -36,9 +36,6 @@ ios/Converse.xcworkspace/xcshareddata/swiftpm/Package.resolved
 # Android
 /android/
 
-# iOS
-/ios/
-
 # System files
 .DS_Store
 *.log

App.tsx

@@ -1,12 +1,9 @@
-// Keep this at the top
-import "./polyfills";
-
-import * as Privy from "@privy-io/expo";
+import { PrivyProvider } from "@privy-io/expo";
 
 // This is a requirement for Privy to work, does not make any sense
 // To test run yarn start --no-dev --minify
-const PrivyProvider = Privy.PrivyProvider;
 
+import { setupStreamingSubscriptions } from "@/features/streams/streams";
 import { configure as configureCoinbase } from "@coinbase/wallet-mobile-sdk";
 import DebugButton from "@components/DebugButton";
 import { Snackbars } from "@components/Snackbar/Snackbars";
@@ -40,7 +37,6 @@ import {
   configureReanimatedLogger,
 } from "react-native-reanimated";
 import { ThirdwebProvider } from "thirdweb/react";
-import { base } from "viem/chains";
 import { config } from "./config";
 import {
   TEMPORARY_ACCOUNT_NAME,
@@ -49,11 +45,9 @@ import {
 import { setAuthStatus } from "./data/store/authStore";
 import Main from "./screens/Main";
 import { registerBackgroundFetchTask } from "./utils/background";
-import { privySecureStorage } from "./utils/keychain/helpers";
 import { initSentry } from "./utils/sentry";
 import { saveApiURI } from "./utils/sharedData";
 import { preventSplashScreenAutoHide } from "./utils/splash/splash";
-import { setupStreamingSubscriptions } from "@/features/streams/streams";
 
 preventSplashScreenAutoHide();
 
@@ -176,10 +170,11 @@ export default function AppWithProviders() {
   return (
     <QueryClientProvider client={queryClient}>
       <PrivyProvider
-        appId={config.privy.appId}
-        clientId={config.privy.clientId}
-        storage={privySecureStorage}
-        supportedChains={[base]}
+        appId="cloh5bn1p00q4l50gcg0g1mix"
+        clientId="client-WY2eFe3hjqkyEyrGWiZoJUqsihgrJieWcXjcKN4f3mwXM"
+
+        // storage={privySecureStorage}
+        // supportedChains={[base]}
       >
         <SmartWalletsProvider>
           <ThirdwebProvider>

app.config.ts

@@ -116,15 +116,18 @@ export default (): ExpoConfig => {
     ios: {
       bundleIdentifier: config.ios.bundleIdentifier,
       supportsTablet: true,
+      associatedDomains: config.ios.associatedDomains,
+      googleServicesFile: config.ios.googleServicesFile,
       config: {
         usesNonExemptEncryption: false,
       },
-      associatedDomains: config.ios.associatedDomains,
-      googleServicesFile: config.ios.googleServicesFile,
+      entitlements: {
+        // App check stuff
+        "com.apple.developer.devicecheck.appattest-environment": "production",
+      },
       infoPlist: {
         LSApplicationQueriesSchemes: [
           "cbwallet",
-          "ledgerlive",
           "rainbow",
           "metamask",
           "trust",
@@ -133,6 +136,10 @@ export default (): ExpoConfig => {
           "exodus",
           "oneinch",
         ],
+        NSAppTransportSecurity: {
+          NSAllowsArbitraryLoads: false, // Not sure why
+          NSAllowsLocalNetworking: true, // Not sure why
+        },
       },
     },
     android: {
@@ -205,7 +212,14 @@ export default (): ExpoConfig => {
     },
     plugins: [
       ["expo-notifications"],
-      ["expo-local-authentication"],
+      ["expo-secure-store"],
+      [
+        "expo-local-authentication",
+        {
+          faceIDPermission:
+            "We need this to use biometrics to secure your data.",
+        },
+      ],
       [
         "expo-build-properties",
         {
@@ -216,6 +230,7 @@ export default (): ExpoConfig => {
             // you may set `use_modular_headers!` globally in your Podfile,
             // or specify `:modular_headers => true` for particular dependencies"
             useFrameworks: "static",
+            deploymentTarget: "17.5",
           },
           android: {
             compileSdkVersion: 35,
@@ -305,7 +320,6 @@ export default (): ExpoConfig => {
             "We need this so that you can take photos to share.",
         },
       ],
-      "expo-secure-store",
       [
         "expo-splash-screen",
         {
@@ -327,6 +341,7 @@ export default (): ExpoConfig => {
       ],
       ["@react-native-firebase/app"],
       ["@react-native-firebase/app-check"],
+      "./scripts/android/build/android-deps-expo-plugin.js",
     ],
   };
 };

features/onboarding/Privy/usePrivySmartWalletConnection.ts

@@ -85,11 +85,11 @@ export function usePrivySmartWalletConnection(args: {
             return smartAccount.signMessage({ message });
           },
         };
-        console.log("1");
+
         await initXmtpClientFromViemAccount({
           account: viemAccount,
         });
-        console.log("2");
+
         onStatusChange("Xmtp initialized");
         onConnectionDone();
       } catch (error) {

index.js

@@ -1,6 +1,6 @@
 import "./wdyr";
-import "react-native-gesture-handler";
-import "react-native-url-polyfill/auto";
+import "./polyfills";
+
 import { registerRootComponent } from "expo";
 
 import App from "./App";

ios/Podfile.properties.json

@@ -2,6 +2,7 @@
   "expo.jsEngine": "hermes",
   "EX_DEV_CLIENT_NETWORK_INSPECTOR": "true",
   "newArchEnabled": "false",
+  "ios.deploymentTarget": "17.5",
   "ios.useFrameworks": "static",
   "apple.extraPods": "[]",
   "apple.ccacheEnabled": "false",

package.json

@@ -5,16 +5,15 @@
   "scripts": {
     "start": "expo start",
     "android": "expo run:android",
+    "android:clean": "expo prebuild --clean -p android && yarn android",
     "android:build:dev": "npx eas-cli build -p android --profile development --local",
     "android:reverse": "adb reverse tcp:8081 tcp:8081 && adb reverse tcp:9875 tcp:9875",
     "android:sendApk": "./scripts/android/send-apk.sh",
     "ios": "expo run:ios",
-    "ios:clean": "yarn ios --no-build-cache",
-    "prebuild:ios:clean": "expo prebuild --platform ios --clean",
+    "ios:clean": "expo prebuild --clean -p ios && yarn ios",
     "env:pull:dev": "npx eas-cli env:pull --environment=development",
     "env:pull:preview": "npx eas-cli env:pull --environment=preview",
     "env:pull:prod": "npx eas-cli env:pull --environment=production",
-    "clean": "./scripts/react-native-clean-build.sh",
     "lint": "eslint --max-warnings 2500",
     "lint:errors": "eslint --quiet",
     "typecheck": "echo \"➜ Typechecking project...\" && tsc --noEmit",
@@ -40,9 +39,8 @@
     "@noble/secp256k1": "^1.5.2",
     "@open-frames/proxy-types": "^0.2.3",
     "@peculiar/webcrypto": "^1.4.1",
-    "@privy-io/expo": "^0.39.0",
+    "@privy-io/expo": "^0.45.0",
     "@privy-io/expo-native-extensions": "^0.0.3",
-    "@privy-io/react-auth": "^1.65.1",
     "@react-native-async-storage/async-storage": "1.23.1",
     "@react-native-clipboard/clipboard": "^1.14.1",
     "@react-native-community/netinfo": "11.4.1",
@@ -98,7 +96,6 @@
     "expo-build-properties": "~0.13.1",
     "expo-clipboard": "~7.0.0",
     "expo-constants": "~17.0.4",
-    "expo-contacts": "~14.0.2",
     "expo-crypto": "~14.0.2",
     "expo-crypto-polyfills": "^1.1.0",
     "expo-dev-client": "~5.0.4",

polyfills.ts

@@ -1,21 +1,24 @@
 // IMPORTANT: DO NOT CHANGE THE ORDER OF THESE IMPORTS
-// These imports must be in this specific order for polyfills to work correctly
 import "@walletconnect/react-native-compat";
-import "react-native-get-random-values"; // Privy requires this
-import "@ethersproject/shims"; // Privy requires this
 
-import "@azure/core-asynciterator-polyfill";
-
-// For now using all the polyfills. Need to dig which one we'll really need.
-import "react-native-polyfill-globals";
+// Privy require those in this order https://github.com/privy-io/expo-starter/blob/main/entrypoint.js
+import "fast-text-encoding";
+import "react-native-get-random-values";
+import "@ethersproject/shims";
 
+import "@azure/core-asynciterator-polyfill";
+import "react-native-polyfill-globals/auto";
 import { Crypto as WebCrypto } from "@peculiar/webcrypto";
 import "@stardazed/streams-polyfill";
 
+import "react-native-gesture-handler";
+import "react-native-url-polyfill/auto";
+
 // Necessary for @peculiar/webcrypto.
 if (!global.Buffer) {
   global.Buffer = require("safe-buffer").Buffer;
 }
+
 if (!global.crypto.subtle) {
   // Only polyfill SubtleCrypto as we prefer `react-native-get-random-values` for getRandomValues.
   const webCrypto = new WebCrypto();

scripts/android/build/android-deps-expo-plugin.js

@@ -0,0 +1,60 @@
+/**
+ * This work was done by Noe.
+ * It handles some conflicting dependencies manually.
+ * It seems to be needed for now for Android build to work with eas.
+ * We might be able to remove it once we will clean up our dependencies?
+ * Maybe not since it's used by many crypto libs
+ * https://github.com/expo/expo/issues/29026#issuecomment-2173524698
+ */
+const {
+  createRunOncePlugin,
+  withAppBuildGradle,
+} = require("@expo/config-plugins");
+const {
+  mergeContents,
+} = require("@expo/config-plugins/build/utils/generateCode");
+
+const withFixedConverseAndroidDependencies = (config) => {
+  return withAppBuildGradle(config, (config) => {
+    if (config.modResults.contents) {
+      config.modResults.contents = setBouncyCastleVersion(
+        config.modResults.contents
+      );
+    }
+    return config;
+  });
+};
+
+const TAG = "converse-android-dependencies-fix";
+
+const setBouncyCastleVersion = (src) => {
+  const configurationFix = `
+      configurations.all {
+    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+        if (details.requested.name == 'bcprov-jdk15on') {
+            details.useTarget group: details.requested.group, name: 'bcprov-jdk15to18', version: '1.78.1'
+        }
+        if (details.requested.name == 'lifecycle-viewmodel-ktx') {
+            details.useTarget group: details.requested.group, name: 'lifecycle-viewmodel-ktx', version: '2.5.0'
+        }
+    }
+  }
+  `;
+
+  const mergeResults = mergeContents({
+    tag: TAG,
+    src: src,
+    newSrc: configurationFix,
+    anchor: /android {/gm,
+    offset: 1,
+    comment: `// `,
+  });
+
+  return mergeResults.contents;
+};
+
+module.exports = createRunOncePlugin(
+  withFixedConverseAndroidDependencies,
+  "withFixedConverseAndroidDependencies",
+  "1.0.0"
+);