Misc PR adjustments based on sandbox testing; WIP.

Author: swoocn

messages/en-GB.json

@@ -14,7 +14,7 @@
   },
   "SIDE_NAVIGATION": {
     "USER_PREFERENCES_HEADER": "User Preferences",
-    "PERSONALIZATION_SUBHEADER": "Personalisationn",
+    "PERSONALIZATION_SUBHEADER": "Personalisation",
     "EMAIL_ADDRESS_FIELD": "Your email address",
     "PHONE_NUMBER_FIELD": "Your phone number",
     "LANGUAGES": "Languages",
@@ -189,7 +189,7 @@
       "EMAIL_LABEL": "Email" 
     },
     "PHOTO": {
-      "UPLOAD_PHOTO_LABEL": "Upload Photo",
+      "UPLOAD_PHOTO_LABEL": "Upload photo",
       "UPLOAD_PHOTO_PLACEHOLDER": "Upload image to help attract buyers (PNG, JPG, JPEG, WEBP)",
       "IMAGE_DROP_UPLOAD_MESSAGE": "Drop your image here or browse",
       "SUPPORTS_FILE_MESSAGE": "Supports: PNG, JPG, JPEG, WEBP",
@@ -223,6 +223,7 @@
     },
     "LOADING_SCREEN_MESSAGE": "Loading data...",
     "VALIDATION": {
+      "SUBMISSION_FAILED_USER_NOT_AUTHENTICATED": "Submission failed because user is not authenticated",
       "UNEXPECTED_ERROR_MESSAGE": "Unexpected error occurred"  
     }
   }

messages/en.json

@@ -189,7 +189,7 @@
       "EMAIL_LABEL": "Email" 
     },
     "PHOTO": {
-      "UPLOAD_PHOTO_LABEL": "Upload Photo",
+      "UPLOAD_PHOTO_LABEL": "Upload photo",
       "UPLOAD_PHOTO_PLACEHOLDER": "Upload image to help attract buyers (PNG, JPG, JPEG, WEBP)",
       "IMAGE_DROP_UPLOAD_MESSAGE": "Drop your image here or browse",
       "SUPPORTS_FILE_MESSAGE": "Supports: PNG, JPG, JPEG, WEBP",
@@ -223,6 +223,7 @@
     },
     "LOADING_SCREEN_MESSAGE": "Loading data...",
     "VALIDATION": {
+      "SUBMISSION_FAILED_USER_NOT_AUTHENTICATED": "Submission failed because user is not authenticated",
       "UNEXPECTED_ERROR_MESSAGE": "Unexpected error occurred"  
     }
   }

messages/es.json

@@ -189,7 +189,7 @@
       "EMAIL_LABEL": "Correo electrónico"
     },
     "PHOTO": {
-      "UPLOAD_PHOTO_LABEL": "Subir Foto",
+      "UPLOAD_PHOTO_LABEL": "Subir foto",
       "UPLOAD_PHOTO_PLACEHOLDER": "Sube una imagen para ayudar a atraer compradores (PNG, JPG, JPEG, WEBP)",
       "IMAGE_DROP_UPLOAD_MESSAGE": "Suelta tu imagen aquí o busca",
       "SUPPORTS_FILE_MESSAGE": "Soporta: PNG, JPG, JPEG, WEBP",
@@ -223,6 +223,7 @@
     },
     "LOADING_SCREEN_MESSAGE": "Cargando datos...",
     "VALIDATION": {
+      "SUBMISSION_FAILED_USER_NOT_AUTHENTICATED": "El envío falló porque el usuario no está autenticado",
       "UNEXPECTED_ERROR_MESSAGE": "Ocurrió un error inesperado"
     }
   }

messages/ewe-BJ.json

@@ -189,7 +189,7 @@
       "EMAIL_LABEL": "Emɛl nɔfɛ" 
     },
     "PHOTO": {
-      "UPLOAD_PHOTO_LABEL": "Ɖe ŋutɔ Vinyo",
+      "UPLOAD_PHOTO_LABEL": "Ɖe ŋutɔ vinyo",
       "UPLOAD_PHOTO_PLACEHOLDER": "Zu fɛnyɔwo kple vɔs ɖe amegãwo me fia wò (PNG, JPG, JPEG, WEBP)",
       "IMAGE_DROP_UPLOAD_MESSAGE": "Kpɔ siwo be ɖe ƒe ɣe ŋutɔ foto alo tɔkɔ",
       "SUPPORTS_FILE_MESSAGE": "Ɖe vɔ: PNG, JPG, JPEG, WEBP",
@@ -223,6 +223,7 @@
     },
     "LOADING_SCREEN_MESSAGE": "Ɣe siwo...",
     "VALIDATION": {
+      "SUBMISSION_FAILED_USER_NOT_AUTHENTICATED": "Nɔvia míaɖu abe nu wò ye mele wònu o le fifiawo nyo",
       "UNEXPECTED_ERROR_MESSAGE": "Nuxlɔ̃sia na mi ɖe mɔ o"
     }
   }

messages/hau-NG.json

@@ -189,7 +189,7 @@
       "EMAIL_LABEL": "Imel"
     },
     "PHOTO": {
-      "UPLOAD_PHOTO_LABEL": "Loda Hoto",
+      "UPLOAD_PHOTO_LABEL": "Loda hoto",
       "UPLOAD_PHOTO_PLACEHOLDER": "Dora hoto don taimakawa jan hankalin masu saye (PNG, JPG, JPEG, WEBP)",
       "IMAGE_DROP_UPLOAD_MESSAGE": "Ajiye hotonku anan ko shiga yanar gizo",
       "SUPPORTS_FILE_MESSAGE": "Goyon baya: PNG, JPG, JPEG, WEBP",
@@ -222,6 +222,7 @@
     },
     "LOADING_SCREEN_MESSAGE": "Ana ɗaukar bayanai...",
     "VALIDATION": {
+      "SUBMISSION_FAILED_USER_NOT_AUTHENTICATED": "Aika ya kasa saboda mai amfani ba a tabbatar da shi ba",
       "UNEXPECTED_ERROR_MESSAGE": "An samu kuskure da ba a zata ba"
     }
   }

messages/ko.json

@@ -223,6 +223,7 @@
     },
     "LOADING_SCREEN_MESSAGE": "데이터 로딩 중...",
     "VALIDATION": {
+      "SUBMISSION_FAILED_USER_NOT_AUTHENTICATED": "제출이 실패했습니다; 사용자가 인증되지 않았습니다",
       "UNEXPECTED_ERROR_MESSAGE": "예기치 않은 오류가 발생했습니다"
     }
   }

src/app/[locale]/seller/registration/page.tsx

@@ -170,12 +170,23 @@ const SellerRegistrationForm = () => {
     }
   };
 
+  
+  const handleNavigation = (nextLink: string)=> {
+    setLinkUrl(nextLink);
+    
+    if (isSaveEnabled) {
+      setShowConfirmDialog(true); // Show confirm dialog when save is enabled
+    } else {
+      router.push(nextLink); // Direct navigation if save is not enabled
+    }
+  }
+
   // Function to save data to the database
   const handleSave = async () => {  
     // Check if user is authenticated and form is valid
     if (!currentUser) {
       logger.warn('Form submission failed: User not authenticated.');
-      return toast.error(t('SCREEN.SELLER_REGISTRATION.VALIDATION.REGISTRATION_FAILED_USER_NOT_AUTHENTICATED'));            
+      return toast.error(t('SHARED.VALIDATION.SUBMISSION_FAILED_USER_NOT_AUTHENTICATED'));            
     }
 
     const sellCenter = JSON.parse(localStorage.getItem('mapCenter') as string);
@@ -214,31 +225,21 @@ const SellerRegistrationForm = () => {
       formDataToSend.append('image', '');
     }
 
-    logger.info('Registration form data:', { formDataToSend });
+    logger.info('Registration form data:', JSON.stringify({ formDataToSend }));
 
     try {
       const data = await registerSeller(formDataToSend);
       if (data.seller) {
-        setIsSaveEnabled(false);
         setDbSeller(data.seller);
+        setIsSaveEnabled(false);
         logger.info('Seller registration saved successfully:', { data });
         toast.success(t('SCREEN.SELLER_REGISTRATION.VALIDATION.SUCCESSFUL_REGISTRATION_SUBMISSION'));
       }
     } catch (error) {
       logger.error('Error saving seller registration:', { error });
     }
   };
-
-  const handleNavigation = (nextLink: string)=> {
-    setLinkUrl(nextLink);
 
-    if (isSaveEnabled) {
-      setShowConfirmDialog(true); // Show confirm dialog when save is enabled
-    } else {
-      router.push(nextLink); // Direct navigation if save is not enabled
-    }
-  }
-
   const translatedSellerTypeOptions = [
     {
       value: 'Pioneer',
@@ -342,31 +343,29 @@ const SellerRegistrationForm = () => {
           {/* user settings info toggle */}
           <ToggleCollapse
             header={t('SCREEN.BUY_FROM_SELLER.SELLER_CONTACT_DETAILS_LABEL')}>
-            <div className="text-sm mb-7 text-gray-500">
-              <div className="text-sm mb-3">
-                <span className="font-bold">
-                  {t('SHARED.USER_INFORMATION.PI_USERNAME_LABEL') + ': '}
-                </span>
-                <span>{currentUser ? currentUser.pi_username : ''}</span>
-              </div>
-              <div className="text-sm mb-3">
-                <span className="font-bold">
-                  {t('SHARED.USER_INFORMATION.NAME_LABEL') + ': '}
-                </span>
-                <span>{currentUser ? currentUser.user_name : ''}</span>
-              </div>
-              <div className="text-sm mb-3">
-                <span className="font-bold">
-                  {t('SHARED.USER_INFORMATION.PHONE_NUMBER_LABEL') + ': '}
-                </span>
-                <span>{userSettings ? userSettings.phone_number : ""}</span>
-              </div>
-              <div className="text-sm mb-5">
-                <span className="font-bold">
-                  {t('SHARED.USER_INFORMATION.EMAIL_LABEL') + ': '}
-                </span>
-                <span>{ userSettings ? userSettings.email : ""}</span>
-              </div>
+            <div className="text-sm mb-3">
+              <span className="font-bold">
+                {t('SHARED.USER_INFORMATION.PI_USERNAME_LABEL') + ': '}
+              </span>
+              <span>{currentUser ? currentUser.pi_username : ''}</span>
+            </div>
+            <div className="text-sm mb-3">
+              <span className="font-bold">
+                {t('SHARED.USER_INFORMATION.NAME_LABEL') + ': '}
+              </span>
+              <span>{currentUser ? currentUser.user_name : ''}</span>
+            </div>
+            <div className="text-sm mb-3">
+              <span className="font-bold">
+                {t('SHARED.USER_INFORMATION.PHONE_NUMBER_LABEL') + ': '}
+              </span>
+              <span>{userSettings ? userSettings.phone_number : ""}</span>
+            </div>
+            <div className="text-sm mb-5">
+              <span className="font-bold">
+                {t('SHARED.USER_INFORMATION.EMAIL_LABEL') + ': '}
+              </span>
+              <span>{ userSettings ? userSettings.email : ""}</span>
             </div>
           </ToggleCollapse>
 

src/app/[locale]/seller/sale-items/[id]/page.tsx

@@ -114,7 +114,7 @@ export default function BuyFromSellerForm({ params }: { params: { id: string } }
         <div className="flex gap-4 align-center mb-6 relative">
           <div className="rounded-[50%] w-[65px] h-[65px] relative">
             <Image alt="seller logo" 
-              src={sellerShopInfo.image !== null ? sellerShopInfo.image : process.env.NEXT_PUBLIC_IMAGE_PLACEHOLDER_URL || '/images/shared/upload.png'} 
+              src={sellerShopInfo.image && sellerShopInfo.image.trim() !== "" ? sellerShopInfo.image : process.env.NEXT_PUBLIC_IMAGE_PLACEHOLDER_URL || '/images/shared/upload.png'} 
               fill={true} 
               className="rounded-[50%]" 
             />
@@ -166,25 +166,25 @@ export default function BuyFromSellerForm({ params }: { params: { id: string } }
           header={t('SCREEN.BUY_FROM_SELLER.SELLER_CONTACT_DETAILS_LABEL')}>
           <div className="text-sm mb-3">
             <span className="font-bold">
-              {t('SCREEN.BUY_FROM_SELLER.SELLER_USERNAME_LABEL') + ': '}
+              {t('SHARED.USER_INFORMATION.PI_USERNAME_LABEL') + ': '}
             </span>
-            <span>{sellerInfo ? sellerInfo.user_name : ''}</span>
+            <span>{sellerInfo ? sellerInfo.pi_username: ''}</span>
           </div>
           <div className="text-sm mb-3">
             <span className="font-bold">
-              {t('SCREEN.BUY_FROM_SELLER.SELLER_PIONEER_ID_LABEL') + ': '}
+              {t('SHARED.USER_INFORMATION.NAME_LABEL') + ': '}
             </span>
-            <span>{sellerInfo ? sellerInfo.pi_username: ''}</span>
+            <span>{sellerInfo ? sellerInfo.user_name : ''}</span>
           </div>
           <div className="text-sm mb-3">
             <span className="font-bold">
-              {t('SCREEN.BUY_FROM_SELLER.SELLER_PHONE_NUMBER_LABEL') + ': '}
+              {t('SHARED.USER_INFORMATION.PHONE_NUMBER_LABEL') + ': '}
             </span>
             <span>{sellerSettings ? sellerSettings.phone_number : ""}</span>
           </div>
           <div className="text-sm mb-3">
             <span className="font-bold">
-              {t('SCREEN.BUY_FROM_SELLER.SELLER_EMAIL_ADDRESS_LABEL') + ': '}
+              {t('SHARED.USER_INFORMATION.EMAIL_LABEL') + ': '}
             </span>
             <span>{ sellerSettings ? sellerSettings.email : ""}</span>
           </div>

src/components/shared/Forms/Inputs/Inputs.tsx

@@ -46,10 +46,10 @@ export const TextArea = (props: any) => {
   return (
     <div className="">
       {label && (
-        <label className=" block text-[17px] text-[#333333]">{label}</label>
+        <label className="block text-[17px] text-[#333333]">{label}</label>
       )}
       {describe && (
-        <label className=" block text-sm text-gray-400">{describe}</label>
+        <label className="block text-sm text-gray-400">{describe}</label>
       )}
       <textarea
         placeholder={props.placeholder}
@@ -69,16 +69,12 @@ export const FileInput = (props: any) => {
   return (
     <div className="">
       {props.label && (
-        <label className="block font-medium text-gray-700">{imageLabel}</label>
+        <label className="block text-[17px] text-[#333333]">{imageLabel}</label>
       )}
       {props.describe && (
         <label className="block pb-3 text-sm text-gray-400">{props.describe}</label>
       )}
-      <div 
-        className={`flex flex-col items-center justify-center overflow-hidden p-3 pt-5 pb-5 rounded-md relative 
-          ${isImageUploaded ? '' : "border-dashed border-[2px] border-green-700"
-        }`}
-      >
+      <div className="flex flex-col items-center justify-center overflow-hidden p-3 pt-5 pb-5 rounded-md relative">
         <div className="w-full h-[200px] relative mb-4">
           <Image
             src={isImageUploaded ? props.imageUrl : '/images/shared/upload.png'}

src/components/shared/Review/emojipicker.tsx

@@ -121,7 +121,7 @@ export default function EmojiPicker(props: any) {
         }
       } else {
         logger.warn('Unable to submit review; user not authenticated.');
-        toast.error(t('SHARED.REACTION_RATING.VALIDATION.UNSUCCESSFUL_REVIEW_SUBMISSION'));
+        toast.error(t('SHARED.VALIDATION.SUBMISSION_FAILED_USER_NOT_AUTHENTICATED'));
       }
     } catch (error) {
       logger.error('Error saving review:', { error });