Clean up

Author: alexrisch

components/Onboarding/ConnectViaWallet/ConnectViaWallet.tsx

@@ -198,7 +198,7 @@ const LoadingState = memo(function LoadingState() {
   const { theme } = useAppTheme();
 
   return (
-    <Center style={{ paddingTop: theme.spacing["6xl"] }}>
+    <Center style={{ paddingTop: theme.spacing["7xl"] }}>
       <ActivityIndicator />
     </Center>
   );

components/PictoTitleSubtitle.tsx

@@ -51,7 +51,7 @@ const ContainerComponent = memo(function ContainerComponent({
 
 const PictoComponent = memo(function PictoComponent(props: IPictoProps) {
   const { theme } = useAppTheme();
-  const { size = theme.spacing["4xl"], ...rest } = props;
+  const { size = theme.spacing["5xl"], ...rest } = props;
   return <Picto size={size} style={{ height: size }} {...rest} />;
 });
 

design-system/IconButton/IconButton.styles.ts

@@ -49,8 +49,8 @@ export const getIconButtonViewStyle =
         height: spacing.xxl,
       },
       xl: {
-        width: 56,
-        height: 56,
+        width: spacing["4xl"],
+        height: spacing["4xl"],
       },
     };
 
@@ -181,8 +181,8 @@ export const getIconProps =
   }: IconButtonStyleProps) =>
   (
     theme: Theme // TODO: fix once we fixed IconProps
-  ) => // : Partial<IIconProps>
-  {
+    // : Partial<IIconProps>
+  ) => {
     const { colors, spacing } = theme;
 
     const props: any =

features/conversation-list/conversation-list-item/conversation-list-item-swipeable/conversation-list-item-swipeable.styles.tsx

@@ -3,6 +3,6 @@ import { useAppTheme } from "@/theme/useAppTheme";
 export function useConversationListItemSwipeableStyles() {
   const { theme } = useAppTheme();
   return {
-    swipeThreshold: theme.spacing["5xl"],
+    swipeThreshold: theme.spacing["6xl"],
   };
 }

features/onboarding/Privy/usePrivyConnection.ts

@@ -17,7 +17,9 @@ export function usePrivyConnection(args: {
   const privyAccountId = usePrivyAuthStoreContext(
     (state) => state.privyAccountId
   );
-  const privySigner = usePrivySigner(true);
+  const privySigner = usePrivySigner({
+    isOnboarding: true,
+  });
   const privyAccessToken = usePrivyAccessToken();
   const creatingEmbeddedWallet = useRef(false);
 

features/onboarding/Privy/usePrivySmartWalletConnection.ts

@@ -23,7 +23,9 @@ export function usePrivySmartWalletConnection(args: {
   const privyAccountId = usePrivyAuthStoreContext(
     (state) => state.privyAccountId
   );
-  usePrivySigner(true);
+  usePrivySigner({
+    isOnboarding: true,
+  });
   const privyAccessToken = usePrivyAccessToken();
   const creatingEmbeddedWallet = useRef(false);
   const initializingXmtp = useRef(false);
@@ -51,7 +53,14 @@ export function usePrivySmartWalletConnection(args: {
       embeddedWallet
         .create()
         // TODO: Handle better error
-        .catch(ensureErrorHandler(onConnectionError));
+        .catch((error) => {
+          logger.error(
+            "[Privy connection] Error creating embedded wallet",
+            error
+          );
+          creatingEmbeddedWallet.current = false;
+          ensureErrorHandler(onConnectionError)(error);
+        });
     }
   }, [
     embeddedWallet,
@@ -93,6 +102,7 @@ export function usePrivySmartWalletConnection(args: {
         onStatusChange("Xmtp initialized");
         onConnectionDone();
       } catch (error) {
+        logger.error("[Privy connection] Error initializing Xmtp", error);
         onConnectionError(ensureError(error));
       }
     };

features/onboarding/screens/onboarding-weclome-screen.tsx renamed to features/onboarding/screens/onboarding-welcome-screen.tsx

@@ -9,7 +9,7 @@ import { OnboardingEphemeraScreen } from "../features/onboarding/screens/Onboard
 import { OnboardingNotificationsScreen } from "../features/onboarding/screens/onboarding-notifications-screen";
 import { OnboardingPrivateKeyScreen } from "../features/onboarding/screens/OnboardingPrivateKeyScreen";
 import { OnboardingPrivyScreen } from "../features/onboarding/screens/OnboardingPrivyScreen";
-import { OnboardingWelcomeScreen } from "@/features/onboarding/screens/onboarding-weclome-screen";
+import { OnboardingWelcomeScreen } from "@/features/onboarding/screens/onboarding-welcome-screen";
 import { OnboardingContactCardScreen } from "@/features/onboarding/screens/onboarding-contact-card-screen";
 
 type OnboardingParamList = {

navigation/OnboardingNavigator.tsx

@@ -44,7 +44,7 @@ import WebviewPreviewNav, {
 } from "./WebviewPreviewNav";
 import { screenListeners, stackGroupScreenOptions } from "./navHelpers";
 import { ProfileNav, ProfileNavParams } from "@/features/profiles/profile.nav";
-import { OnboardingWelcomeScreen } from "@features/onboarding/screens/onboarding-weclome-screen";
+import { OnboardingWelcomeScreen } from "@/features/onboarding/screens/onboarding-welcome-screen";
 import { OnboardingContactCardScreen } from "@features/onboarding/screens/onboarding-contact-card-screen";
 import { NewAccountContactCardScreen } from "../NewAccount/new-account-contact-card-screen";
 

screens/Navigation/Navigation.tsx

@@ -16,10 +16,11 @@ export const spacing = {
   xl: 32,
   xxl: 40,
   "3xl": 48,
-  "4xl": 64,
-  "5xl": 80,
-  "6xl": 96,
-  "7xl": 128,
+  "4xl": 56,
+  "5xl": 64,
+  "6xl": 80,
+  "7xl": 96,
+  "8xl": 128, // Not Used
 
   message: {
     replyMessage: {

theme/spacing.ts

@@ -4,6 +4,7 @@
   "compilerOptions": {
     "module": "ESNext",
     "strict": true,
+    // https://docs.privy.io/guide/expo/setup/passkey#_1-set-up-your-build-configuration
     "moduleResolution": "Bundler",
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,

tsconfig.json

@@ -15,7 +15,14 @@ import {
 
 import logger from "@utils/logger";
 
-export const usePrivySigner = (isOnboarding: boolean = false) => {
+type IPrivySignerParams = {
+  isOnboarding: boolean;
+};
+
+export const usePrivySigner = (
+  params: IPrivySignerParams = { isOnboarding: false }
+) => {
+  const { isOnboarding = false } = params;
   const currentAccount = useCurrentAccount();
   const privyAccountId = useAccountsStore((s) => s.privyAccountId);
   const { isReady: privyReady, user: privyUser } = usePrivy();

utils/evm/privy.ts

@@ -6,7 +6,7 @@ import {
 } from "@utils/fileSystem";
 import { getDbEncryptionKey } from "@utils/keychain/helpers";
 import logger from "@utils/logger";
-import { Client } from "@xmtp/react-native-sdk";
+import { Client, Signer as XmtpSigner } from "@xmtp/react-native-sdk";
 import { Signer } from "ethers";
 import { isClientInstallationValid } from "./client";
 import {
@@ -21,8 +21,8 @@ const env = config.xmtpEnv as "dev" | "production" | "local";
 export const getInboxId = (address: string) =>
   Client.getOrCreateInboxId(address, env);
 
-export const createXmtpClientFromSigner = async (
-  signer: Signer,
+const createXmtpClientFromXmtpSigner = async (
+  signer: XmtpSigner,
   onInstallationRevoked: () => Promise<void>,
   preAuthenticateToInboxCallback?: () => Promise<void>
 ) => {
@@ -41,7 +41,7 @@ export const createXmtpClientFromSigner = async (
 
   logger.debug("Instantiating client from signer");
 
-  const client = await Client.create(ethersSignerToXmtpSigner(signer), {
+  const client = await Client.create(signer, {
     ...options,
     preAuthenticateToInboxCallback,
   });
@@ -71,51 +71,24 @@ export const createXmtpClientFromSigner = async (
   logger.debug("Dropped client databases");
 };
 
+export const createXmtpClientFromSigner = async (
+  signer: Signer,
+  onInstallationRevoked: () => Promise<void>,
+  preAuthenticateToInboxCallback?: () => Promise<void>
+) =>
+  createXmtpClientFromXmtpSigner(
+    ethersSignerToXmtpSigner(signer),
+    onInstallationRevoked,
+    preAuthenticateToInboxCallback
+  );
+
 export const createXmtpClientFromViemAccount = async (
   account: ViemAccount,
   onInstallationRevoked: () => Promise<void>,
   preAuthenticateToInboxCallback?: () => Promise<void>
-) => {
-  const tempDirectory = await createTemporaryDirectory();
-  const dbEncryptionKey = await getDbEncryptionKey();
-
-  const options = {
-    env,
-    enableV3: true,
-    dbDirectory: tempDirectory,
-    dbEncryptionKey,
-  };
-  const inboxId = await getInboxId(await account.address);
-  await copyDatabasesToTemporaryDirectory(tempDirectory, inboxId);
-
-  logger.debug("Instantiating client from signer");
-
-  const client = await Client.create(viemAccountToXmtpSigner(account), {
-    ...options,
-    preAuthenticateToInboxCallback,
-  });
-
-  if (client.inboxId !== inboxId) {
-    throw new Error("Inbox ids don't match");
-  }
-
-  // In case we're logging with an existing libxmtp database, make sure
-  // the installation has not already been revoked
-  const installationValid = await isClientInstallationValid(client);
-  if (!installationValid) {
-    await client.dropLocalDatabaseConnection();
-    await deleteLibXmtpDatabaseForInboxId(inboxId);
-    onInstallationRevoked();
-    return;
-  }
-
-  logger.debug("Instantiated client from signer");
-  // This Client is only be used to extract the key, we can disconnect
-  // it to prevent locks happening during Onboarding
-  await client.dropLocalDatabaseConnection();
-  await moveTemporaryDatabasesToDatabaseDirectory(
-    tempDirectory,
-    client.inboxId
+) =>
+  createXmtpClientFromXmtpSigner(
+    viemAccountToXmtpSigner(account),
+    onInstallationRevoked,
+    preAuthenticateToInboxCallback
   );
-  logger.debug("Dropped client databases");
-};