Merge branch 'develop'

Author: wzrdx

src/components/auth/LoginCard.tsx

@@ -1,6 +1,6 @@
 import { PoAIManagerAbi } from '@blockchain/PoAIManager';
 import { Button } from '@heroui/button';
-import { config, getDevAddress, isUsingDevAddress } from '@lib/config';
+import { config, isUsingDevAddress } from '@lib/config';
 import { BlockchainContextType, useBlockchainContext } from '@lib/contexts/blockchain';
 import { DeploymentContextType, useDeploymentContext } from '@lib/contexts/deployment';
 import { getShortAddressOrHash, isZeroAddress } from '@lib/utils';
@@ -132,14 +132,16 @@ export default function LoginCard({ oraclesCount }: { oraclesCount: number }) {
                         <Button
                             color="primary"
                             onPress={() => {
-                                if (isUsingDevAddress) {
-                                    console.log(
-                                        `Using dev address ${getShortAddressOrHash(getDevAddress().address, 4, true)}, bypassing login`,
-                                    );
-                                    setFetchAppsRequired(false); // Bypass
-                                } else {
-                                    fetchApps();
-                                }
+                                // if (isUsingDevAddress) {
+                                //     console.log(
+                                //         `Using dev address ${getShortAddressOrHash(getDevAddress().address, 4, true)}, bypassing login`,
+                                //     );
+                                //     setFetchAppsRequired(false); // Bypass
+                                // } else {
+                                //     fetchApps();
+                                // }
+
+                                fetchApps();
                             }}
                             isLoading={isFetchingApps}
                             isDisabled={!hasContract && !isUsingDevAddress}

src/components/deeploys/DraftCard.tsx

@@ -12,7 +12,7 @@ import { RiDeleteBinLine } from 'react-icons/ri';
 import { Link } from 'react-router-dom';
 
 export default function DraftCard({ project }: { project: DraftProject }) {
-    const confirm = useInteractionContext() as InteractionContextType;
+    const { confirm } = useInteractionContext() as InteractionContextType;
 
     const jobs: DraftJob[] | undefined = useLiveQuery(
         () => db.jobs.where('projectHash').equals(project.projectHash).toArray(),

src/components/draft/DraftOverview.tsx

@@ -18,14 +18,14 @@ import ServiceDraftJobsList from './job-lists/ServiceDraftJobsList';
 
 export default function DraftOverview({
     project,
-    jobs,
+    draftJobs,
     projectIdentity,
 }: {
     project: DraftProject;
-    jobs: DraftJob[] | undefined;
+    draftJobs: DraftJob[] | undefined;
     projectIdentity: React.ReactNode;
 }) {
-    const confirm = useInteractionContext() as InteractionContextType;
+    const { confirm } = useInteractionContext() as InteractionContextType;
     const navigate = useNavigate();
 
     useEffect(() => {
@@ -66,27 +66,27 @@ export default function DraftOverview({
                             </div>
                         </ActionButton>
 
-                        <PaymentButton isDisabled={jobs?.length === 0} />
+                        <PaymentButton isDisabled={draftJobs?.length === 0} />
                     </div>
                 </div>
 
                 {/* Stats */}
-                <DraftStats jobs={jobs} />
+                <DraftStats jobs={draftJobs} />
 
                 {/* Add Job */}
                 <AddJobCard />
 
                 {/* Jobs */}
-                {!!jobs && !!jobs.length && (
+                {!!draftJobs && !!draftJobs.length && (
                     <>
-                        {jobs.filter((job) => job.jobType === JobType.Generic).length > 0 && (
-                            <GenericDraftJobsList jobs={jobs.filter((job) => job.jobType === JobType.Generic)} />
+                        {draftJobs.filter((job) => job.jobType === JobType.Generic).length > 0 && (
+                            <GenericDraftJobsList jobs={draftJobs.filter((job) => job.jobType === JobType.Generic)} />
                         )}
-                        {jobs.filter((job) => job.jobType === JobType.Native).length > 0 && (
-                            <NativeDraftJobsList jobs={jobs.filter((job) => job.jobType === JobType.Native)} />
+                        {draftJobs.filter((job) => job.jobType === JobType.Native).length > 0 && (
+                            <NativeDraftJobsList jobs={draftJobs.filter((job) => job.jobType === JobType.Native)} />
                         )}
-                        {jobs.filter((job) => job.jobType === JobType.Service).length > 0 && (
-                            <ServiceDraftJobsList jobs={jobs.filter((job) => job.jobType === JobType.Service)} />
+                        {draftJobs.filter((job) => job.jobType === JobType.Service).length > 0 && (
+                            <ServiceDraftJobsList jobs={draftJobs.filter((job) => job.jobType === JobType.Service)} />
                         )}
                     </>
                 )}

src/components/jobs/JobFormWrapper.tsx

@@ -24,7 +24,7 @@ import { z } from 'zod';
 
 const STEPS = ['Project', 'Specifications', 'Payment & Duration', 'Deployment'];
 
-function JobFormWrapper() {
+function JobFormWrapper({ projectName, draftJobsCount }) {
     const { projectHash } = useParams();
     const { step, jobType, setJobType } = useDeploymentContext() as DeploymentContextType;
 
@@ -128,6 +128,22 @@ function JobFormWrapper() {
         }
     }, [jobType, form]);
 
+    useEffect(() => {
+        if (jobType && form) {
+            setDefaultJobAlias(jobType);
+        }
+    }, [jobType, form]);
+
+    const setDefaultJobAlias = (jobType: JobType) => {
+        if (jobType === JobType.Service) {
+            // Service jobs already set their own alias using the selected db system
+            return;
+        }
+
+        const defaultJobAlias = `${projectName}-${jobType}-app-${draftJobsCount + 1}`.toLowerCase();
+        form.setValue('deployment.jobAlias', defaultJobAlias);
+    };
+
     const onSubmit = async (data: z.infer<typeof jobSchema>) => {
         console.log('[JobFormWrapper] onSubmit', data);
 

src/components/layout/Content.tsx

@@ -30,15 +30,15 @@ function Content() {
                 <div className="col gap-1.5">
                     {!!title && (
                         <div className="row">
-                            <div className="text-[26px] font-bold leading-none lg:text-[28px]">{title}</div>
+                            <div className="text-[26px] leading-none font-bold lg:text-[28px]">{title}</div>
                         </div>
                     )}
 
                     {!!description && <div className="text-base text-slate-500 lg:text-lg">{description}</div>}
                 </div>
 
                 <div className="flex">
-                    <ConnectKitButton showBalance />
+                    <ConnectKitButton />
                 </div>
             </div>
 

src/components/project/ProjectOverview.tsx

@@ -18,23 +18,17 @@ import ServiceRunningJobsList from './job-lists/ServiceRunningJobsList';
 import ProjectStats from './ProjectStats';
 
 export default function ProjectOverview({
-    projectName,
     runningJobs,
     draftJobs,
     projectIdentity,
 }: {
-    projectName: string | undefined;
     runningJobs: RunningJobWithAlias[] | undefined;
     draftJobs: DraftJob[] | undefined;
     projectIdentity: React.ReactNode;
 }) {
     const [selectedTab, setSelectedTab] = useState<'runningJobs' | 'draftJobs'>('runningJobs');
     const [runningJobsWithResources, setRunningJobsWithResources] = useState<RunningJobWithResources[]>([]);
 
-    useEffect(() => {
-        console.log({ projectName, runningJobs, draftJobs });
-    }, [runningJobs, draftJobs]);
-
     useEffect(() => {
         const runningJobsWithResources: RunningJobWithResources[] = _(runningJobs)
             .map((job) => {

src/components/tunnels/TunnelCard.tsx

@@ -14,7 +14,7 @@ import { Link, useNavigate } from 'react-router-dom';
 
 export default function TunnelCard({ tunnel, fetchTunnels }: { tunnel: Tunnel; fetchTunnels: () => Promise<void> }) {
     const { tunnelingSecrets, openTunnelRenameModal, openTunnelTokenModal } = useTunnelsContext() as TunnelsContextType;
-    const confirm = useInteractionContext() as InteractionContextType;
+    const { confirm } = useInteractionContext() as InteractionContextType;
 
     const navigate = useNavigate();
 

src/components/tunnels/TunnelingSecretsForm.tsx

@@ -1,6 +1,7 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import { addSecrets } from '@lib/api/tunnels';
 import { getDevAddress, isUsingDevAddress } from '@lib/config';
+import { InteractionContextType, useInteractionContext } from '@lib/contexts/interaction';
 import { buildDeeployMessage } from '@lib/deeploy-utils';
 import { addSecretsSchema } from '@schemas/secrets';
 import { SlateCard } from '@shared/cards/SlateCard';
@@ -22,6 +23,8 @@ export default function TunnelingSecretsForm({
     onSuccess: (secrets: TunnelingSecrets) => void;
     wrapInCard?: boolean;
 }) {
+    const { openSignMessageModal, closeSignMessageModal } = useInteractionContext() as InteractionContextType;
+
     const { address } = isUsingDevAddress ? getDevAddress() : useAccount();
     const { signMessageAsync } = useSignMessage();
 
@@ -51,11 +54,15 @@ export default function TunnelingSecretsForm({
                 cloudflare_domain: data.domain,
             });
 
+            openSignMessageModal();
+
             const signature = await signMessageAsync({
                 account: address,
                 message,
             });
 
+            closeSignMessageModal();
+
             const payload = {
                 nonce,
                 EE_ETH_SIGN: signature,
@@ -80,9 +87,16 @@ export default function TunnelingSecretsForm({
             } else {
                 throw new Error(response.result?.error);
             }
-        } catch (error) {
+        } catch (error: any) {
             console.error('[TunnelingSecretsForm] Error adding secrets:', error);
-            toast.error('Failed to add secrets, please try again.');
+
+            if (error?.message.includes('User rejected the request')) {
+                toast.error('Please sign the message to continue.');
+            } else {
+                toast.error('Failed to add secrets, please try again.');
+            }
+
+            closeSignMessageModal();
         } finally {
             setLoading(false);
         }