tweak

pixelaw · Jul 5, 2024 · 15f4076 · 15f4076
1 parent b33023a
commit 15f4076
Show file tree

Hide file tree

Showing 6 changed files with 151 additions and 162 deletions.
diff --git a/src/components/NewProposalPopupForMain/NewProposalPopupForMain.tsx b/src/components/NewProposalPopupForMain/NewProposalPopupForMain.tsx
@@ -29,10 +29,11 @@ const NewProposalPopupForMain: React.FC = () => {
     const handleDisasterColorChange = (
         selectedOption: SingleValue<{ value: string; label: JSX.Element }>,
     ) => {
-        if (selectedOption) {
-            console.log(selectedOption.value);
-            setColor(formatColorToRGBA(selectedOption.value)); // to submit the color.
+        if (!selectedOption) {
+            console.error('handleDisasterColorChange: selectedOption is null');
+            return;
         }
+        setColor(formatColorToRGBA(selectedOption.value)); // to submit the color.
     };
 
     const handleClickOutside = (event: MouseEvent) => {
@@ -173,17 +174,11 @@ const NewProposalPopupForMain: React.FC = () => {
                                 <label className='mb-2 block text-lg'>Select Proposal Type</label>
                                 <select
                                     value={proposalType}
-                                    onChange={(e) =>
-                                        setProposalType(
-                                            ProposalType[
-                                                e.target.value as keyof typeof ProposalType
-                                            ],
-                                        )
-                                    }
+                                    onChange={(e) => setProposalType(Number(e.target.value))}
                                     className='w-full rounded-md bg-gray-700 p-3 text-white'
                                 >
-                                    <option value='AddNewColor'>Add Color</option>
-                                    <option value='MakeADisasterByColor'>Reset To White</option>
+                                    <option value='1'>Add Color</option>
+                                    <option value='2'>Reset To White</option>
                                 </select>
                             </div>
 
@@ -227,7 +222,7 @@ const NewProposalPopupForMain: React.FC = () => {
                                 </div>
                             )}
 
-                            {proposalType === ProposalType.ResetToWhiteByColor && (
+                            {proposalType === ProposalType.MakeADisasterByColor && (
                                 <div className='mb-4'>
                                     <label className='mb-2 block text-lg'>
                                         Choose a color to turn white on the canvas.

diff --git a/src/components/NewProposalPopupForMain/ProposalListForMain.tsx b/src/components/NewProposalPopupForMain/ProposalListForMain.tsx
@@ -49,25 +49,25 @@ const ProposalListForMain: React.FC<ProposalListForMainProps> = ({
     const proposals = useProposals(GAME_ID);
     const proposalArray = proposals?.data ?? [];
 
-    const getStatusColor = (status: string) => {
-        if (status.startsWith('end in')) {
-            return 'bg-green-500';
-        } else if (status === 'closed') {
-            return 'bg-purple-500';
-        } else {
-            return 'bg-gray-500';
-        }
-    };
-
-    const getStatusColorForBg = (status: string) => {
-        if (status.startsWith('end in')) {
-            return 'bg-black-800';
-        } else if (status === 'closed') {
-            return 'bg-gray-500';
-        } else {
-            return 'bg-black-800';
-        }
-    };
+    // const getStatusColor = (status: string) => {
+    //     if (status.startsWith('end in')) {
+    //         return 'bg-green-500';
+    //     } else if (status === 'closed') {
+    //         return 'bg-purple-500';
+    //     } else {
+    //         return 'bg-gray-500';
+    //     }
+    // };
+
+    // const getStatusColorForBg = (status: string) => {
+    //     if (status.startsWith('end in')) {
+    //         return 'bg-black-800';
+    //     } else if (status === 'closed') {
+    //         return 'bg-gray-500';
+    //     } else {
+    //         return 'bg-black-800';
+    //     }
+    // };
 
     const handleVote = (proposal: StartVoteParam) => {
         setSelectedProposal(proposal);

diff --git a/src/hooks/usePixelRecoveryRate.ts b/src/hooks/usePixelRecoveryRate.ts
@@ -16,7 +16,7 @@ type Data = {
 
 const usePixelRecoveryRate = () => {
     const settings = useSettingsStore();
-    const baseUrl = settings?.config?.toriiUrl ?? '';
+    const baseUrl = settings?.config?.toriiUrl ?? 'http://localhost:8080';
     const gqlClient = new GraphQLClient(`${baseUrl}/graphql`);
 
     return useQuery({

diff --git a/src/pages/NewProposal.tsx b/src/pages/NewProposal.tsx
@@ -105,15 +105,11 @@ const NewProposal: React.FC = () => {
                         <label className='mb-2 block text-lg'>Select Proposal Type</label>
                         <select
                             value={proposalType}
-                            onChange={(e) =>
-                                setProposalType(
-                                    ProposalType[e.target.value as keyof typeof ProposalType],
-                                )
-                            }
+                            onChange={(e) => setProposalType(Number(e.target.value))}
                             className='w-full rounded-md bg-gray-700 p-3 text-white'
                         >
-                            <option value='AddNewColor'>Add Color</option>
-                            <option value='MakeADisasterByColor'>Reset To White</option>
+                            <option value='1'>Add Color</option>
+                            <option value='2'>Reset To White</option>
                         </select>
                     </div>