Fix merge conflict issues

This reverts commit 5fbd9c5c09.

bin/init.js

@@ -546,19 +546,19 @@ export async function init(projectName = null, autoAcceptDefaults = false, apiKe
         return content;
       };
 
-      // Regex patterns that match whole lines with export const
+      // Regex patterns that match whole lines with export const (with TypeScript types)
       const patterns = {
-        APP_NAME: /^export const APP_NAME\s*=\s*['"`][^'"`]*['"`];$/m,
+        APP_NAME: /^export const APP_NAME\s*:\s*string\s*=\s*['"`][^'"`]*['"`];$/m,
         APP_DESCRIPTION:
-          /^export const APP_DESCRIPTION\s*=\s*['"`][^'"`]*['"`];$/m,
+          /^export const APP_DESCRIPTION\s*:\s*string\s*=\s*['"`][^'"`]*['"`];$/m,
         APP_PRIMARY_CATEGORY:
-          /^export const APP_PRIMARY_CATEGORY\s*=\s*['"`][^'"`]*['"`];$/m,
-        APP_TAGS: /^export const APP_TAGS\s*=\s*\[[^\]]*\];$/m,
+          /^export const APP_PRIMARY_CATEGORY\s*:\s*string\s*=\s*['"`][^'"`]*['"`];$/m,
+        APP_TAGS: /^export const APP_TAGS\s*:\s*string\[\]\s*=\s*\[[^\]]*\];$/m,
         APP_BUTTON_TEXT:
-          /^export const APP_BUTTON_TEXT\s*=\s*['"`][^'"`]*['"`];$/m,
-        USE_WALLET: /^export const USE_WALLET\s*=\s*(true|false);$/m,
+          /^export const APP_BUTTON_TEXT\s*:\s*string\s*=\s*['"`][^'"`]*['"`];$/m,
+        USE_WALLET: /^export const USE_WALLET\s*:\s*boolean\s*=\s*(true|false);$/m,
         ANALYTICS_ENABLED:
-          /^export const ANALYTICS_ENABLED\s*=\s*(true|false);$/m,
+          /^export const ANALYTICS_ENABLED\s*:\s*boolean\s*=\s*(true|false);$/m,
       };
 
       // Update APP_NAME

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neynar/create-farcaster-mini-app",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "type": "module",
   "private": false,
   "access": "public",

src/components/ui/NeynarAuthButton/AuthDialog.tsx

@@ -118,7 +118,7 @@ export function AuthDialog({
   const content = getStepContent();
 
   return (
-    <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/50 backdrop-blur-sm p-4">
+    <div className="fixed inset-0 z-[100] flex items-center justify-center bg-black/50 backdrop-blur-sm p-4">
       <div className="bg-white dark:bg-gray-800 rounded-xl w-full max-w-md shadow-2xl border border-gray-200 dark:border-gray-700 max-h-[80vh] sm:max-h-[90vh] flex flex-col">
         <div className="flex justify-between items-center p-4 sm:p-6 pb-3 sm:pb-4 border-b border-gray-200 dark:border-gray-700 flex-shrink-0">
           <h2 className="text-lg font-semibold text-gray-900 dark:text-gray-100">
@@ -204,7 +204,7 @@ export function AuthDialog({
                             'https://farcaster.xyz/~/connect'
                           ),
                         '_blank'
-                      )
+                      );
                     }
                   }}
                   className="btn btn-outline flex items-center justify-center gap-2 w-full"

src/components/ui/NeynarAuthButton/index.tsx

@@ -459,7 +459,12 @@ export function NeynarAuthButton() {
 
   // Handle fetching signers after successful authentication
   useEffect(() => {
-    if (message && signature && !isSignerFlowRunning && !signerFlowStartedRef.current) {
+    if (
+      message &&
+      signature &&
+      !isSignerFlowRunning &&
+      !signerFlowStartedRef.current
+    ) {
       signerFlowStartedRef.current = true;
 
       const handleSignerFlow = async () => {

src/components/ui/tabs/ActionsTab.tsx

@@ -1,12 +1,12 @@
 'use client';
 
-import { useCallback, useState } from "react";
-import { useMiniApp } from "@neynar/react";
-import { ShareButton } from "../Share";
-import { Button } from "../Button";
-import { SignIn } from "../wallet/SignIn";
-import { type Haptics } from "@farcaster/miniapp-sdk";
-import { APP_URL } from "~/lib/constants";
+import { useCallback, useState } from 'react';
+import { useMiniApp } from '@neynar/react';
+import { ShareButton } from '../Share';
+import { Button } from '../Button';
+import { SignIn } from '../wallet/SignIn';
+import { type Haptics } from '@farcaster/miniapp-sdk';
+import { APP_URL } from '~/lib/constants';
 import { NeynarAuthButton } from '../NeynarAuthButton/index';
 
 /**
@@ -124,16 +124,16 @@ export function ActionsTab() {
 
   // --- Render ---
   return (
-    <div className='space-y-3 px-6 w-full max-w-md mx-auto'>
+    <div className="space-y-3 px-6 w-full max-w-md mx-auto">
       {/* Share functionality */}
       <ShareButton
-        buttonText='Share Mini App'
+        buttonText="Share Mini App"
         cast={{
           text: 'Check out this awesome frame @1 @2 @3! 🚀🪐',
           bestFriends: true,
-          embeds: [`${APP_URL}/share/${context?.user?.fid || ''}`]
+          embeds: [`${APP_URL}/share/${context?.user?.fid || ''}`],
         }}
-        className='w-full'
+        className="w-full"
       />
 
       {/* Authentication */}
@@ -147,25 +147,25 @@ export function ActionsTab() {
         onClick={() =>
           actions.openUrl('https://www.youtube.com/watch?v=dQw4w9WgXcQ')
         }
-        className='w-full'
+        className="w-full"
       >
         Open Link
       </Button>
 
-      <Button onClick={actions.addMiniApp} disabled={added} className='w-full'>
+      <Button onClick={actions.addMiniApp} disabled={added} className="w-full">
         Add Mini App to Client
       </Button>
 
       {/* Notification functionality */}
       {notificationState.sendStatus && (
-        <div className='text-sm w-full'>
+        <div className="text-sm w-full">
           Send notification result: {notificationState.sendStatus}
         </div>
       )}
       <Button
         onClick={sendFarcasterNotification}
         disabled={!notificationDetails}
-        className='w-full'
+        className="w-full"
       >
         Send notification
       </Button>
@@ -174,14 +174,14 @@ export function ActionsTab() {
       <Button
         onClick={copyUserShareUrl}
         disabled={!context?.user?.fid}
-        className='w-full'
+        className="w-full"
       >
         {notificationState.shareUrlCopied ? 'Copied!' : 'Copy share URL'}
       </Button>
 
       {/* Haptic feedback controls */}
-      <div className='space-y-2'>
-        <label className='block text-sm font-medium text-gray-700 dark:text-gray-300'>
+      <div className="space-y-2">
+        <label className="block text-sm font-medium text-gray-700 dark:text-gray-300">
           Haptic Intensity
         </label>
         <select
@@ -191,7 +191,7 @@ export function ActionsTab() {
               e.target.value as Haptics.ImpactOccurredType
             )
           }
-          className='w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-800 text-gray-900 dark:text-gray-100 focus:outline-none focus:ring-2 focus:ring-primary'
+          className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-800 text-gray-900 dark:text-gray-100 focus:outline-none focus:ring-2 focus:ring-primary"
         >
           <option value={'light'}>Light</option>
           <option value={'medium'}>Medium</option>
@@ -199,7 +199,7 @@ export function ActionsTab() {
           <option value={'soft'}>Soft</option>
           <option value={'rigid'}>Rigid</option>
         </select>
-        <Button onClick={triggerHapticFeedback} className='w-full'>
+        <Button onClick={triggerHapticFeedback} className="w-full">
           Trigger Haptic Feedback
         </Button>
       </div>