Save

Author: dgca

packages/mobile-app/components/PinLockScreen/PinLockScreen.tsx

@@ -10,6 +10,7 @@ import {
 import { PinInputComponent } from "../PinInputComponent";
 import { Button, Modal, Card, Text } from "@ui-kitten/components";
 import { useCallback, useEffect, useRef, useState } from "react";
+import { useSegments } from "expo-router";
 
 const LOCK_TIMEOUT = 60 * 1000 * 5; // 5 minutes of inactivity
 
@@ -19,6 +20,8 @@ export function PinLockScreen({ children }: { children?: React.ReactNode }) {
   const setAppSetting = facade.setAppSetting.useMutation();
   const removeAllAccounts = facade.removeAllAccounts.useMutation();
   const pin = appSettings.data?.pin;
+  const segments = useSegments();
+  const inOnboarding = segments[0] === "onboarding";
 
   const [isLocked, setIsLocked] = useState(true);
   const [enteredPin, setEnteredPin] = useState("");
@@ -27,6 +30,12 @@ export function PinLockScreen({ children }: { children?: React.ReactNode }) {
   const lastActiveTimestamp = useRef(Date.now());
   const lockTimeoutRef = useRef<NodeJS.Timeout>();
 
+  useEffect(() => {
+    if (pin === "" || inOnboarding) {
+      setIsLocked(false);
+    }
+  }, [pin, inOnboarding]);
+
   const resetLockTimeout = useCallback(() => {
     if (lockTimeoutRef.current) {
       clearTimeout(lockTimeoutRef.current);
@@ -47,7 +56,7 @@ export function PinLockScreen({ children }: { children?: React.ReactNode }) {
         if (nextAppState === "active") {
           // When app comes to foreground, check if we should lock
           const timeSinceLastActive = Date.now() - lastActiveTimestamp.current;
-          if (timeSinceLastActive >= LOCK_TIMEOUT) {
+          if (timeSinceLastActive >= LOCK_TIMEOUT && !inOnboarding) {
             setIsLocked(true);
           }
           resetLockTimeout();
@@ -64,7 +73,7 @@ export function PinLockScreen({ children }: { children?: React.ReactNode }) {
     return () => {
       subscription.remove();
     };
-  }, [isLocked, resetLockTimeout]);
+  }, [isLocked, resetLockTimeout, inOnboarding]);
 
   // Initial setup of the lock timer
   useEffect(() => {
@@ -104,7 +113,7 @@ export function PinLockScreen({ children }: { children?: React.ReactNode }) {
         {children}
 
         {/* Lock screen overlay */}
-        {!!pin && isLocked && (
+        {!!pin && isLocked && !inOnboarding && (
           <View style={styles.lockOverlay}>
             <SafeAreaView style={styles.lockContent}>
               <View style={styles.pinContainer}>

packages/mobile-app/data/facades/wallet/oreowalletHandlers.ts

@@ -31,6 +31,8 @@ export const walletHandlers = f.facade<WalletHandlers>({
       );
       const account = await oreoWallet.createAccount(network, name);
 
+      console.log("accountzzz", account);
+
       return {
         name: account.name,
         viewOnly: account.viewOnly,
@@ -89,6 +91,8 @@ export const walletHandlers = f.facade<WalletHandlers>({
           ? await oreoWallet.getActiveAccountWithHeadAndBalances(network)
           : await oreoWallet.getAccountWithHeadAndBalances(network, name);
 
+      console.log({ name });
+
       if (!account) {
         return null;
       }

packages/mobile-app/data/wallet/db.ts

@@ -482,6 +482,8 @@ export class WalletDb {
       AccountFormat.Base64Json,
     );
 
+    console.log("account", account);
+
     const result = await this.db.transaction().execute(async (db) => {
       const insertResult = await db
         .insertInto("accounts")
@@ -500,13 +502,16 @@ export class WalletDb {
       //   * If the new account has same public address but different name
       //   * If the new account has same public address but adds/removes spending key
       if (!insertResult.numInsertedOrUpdatedRows) {
+        console.log("returning existing account");
         return await db
           .selectFrom("accounts")
           .selectAll()
           .where("accounts.publicAddress", "=", account.publicAddress)
           .executeTakeFirstOrThrow();
       }
 
+      console.log("returning new account");
+
       // Only set as active account if this was a new insert
       await db
         .updateTable("activeAccount")
@@ -749,6 +754,8 @@ export class WalletDb {
         ])
         .executeTakeFirst();
 
+      console.log("active", account);
+
       if (!account) return;
 
       const head = await db

packages/mobile-app/providers/AccountProvider.tsx

@@ -25,6 +25,8 @@ export function AccountProvider({ children }: { children: ReactNode }) {
     },
   );
 
+  console.log(getAccountResult.data);
+
   useEffect(() => {
     if (getAccountResult.isLoading) return;