Merge pull request #173 from map-of-pi/ft/user-settings

Approved (1).

Author: swoocn

messages/en-GB.json

@@ -14,6 +14,7 @@
   },
   "SIDE_NAVIGATION": {
     "USER_PREFERENCES_HEADER": "User Preferences",
+    "PERSONALIZATION_SUBHEADER": "Personalisationn",
     "EMAIL_ADDRESS_FIELD": "Your email address",
     "PHONE_NUMBER_FIELD": "Your phone number",
     "LANGUAGES": "Languages",
@@ -23,6 +24,11 @@
       "PRIVACY_POLICY": "Privacy Policy",
       "TERMS_OF_SERVICE": "Terms of Service"
     },
+    "FIND_ME_PREFERENCE_LABEL": "FindMe Preference",
+    "FIND_ME_OPTIONS": {
+      "PREFERRED_DEVICE_GPS": "Use my device GPS",
+      "PREFERRED_SEARCH_CENTER": "Use Search Centre"
+    },
     "CONTACT_MAP_OF_PI": "Contact Map of Pi",
     "VALIDATION": {
       "SUCCESSFUL_PREFERENCES_SUBMISSION": "User Preferences update successful",

messages/en.json

@@ -14,6 +14,7 @@
   },
   "SIDE_NAVIGATION": {
     "USER_PREFERENCES_HEADER": "User Preferences",
+    "PERSONALIZATION_SUBHEADER": "Personalization",
     "EMAIL_ADDRESS_FIELD": "Your email address",
     "PHONE_NUMBER_FIELD": "Your phone number",
     "LANGUAGES": "Languages",
@@ -23,6 +24,11 @@
       "PRIVACY_POLICY": "Privacy Policy",
       "TERMS_OF_SERVICE": "Terms of Service"
     },
+    "FIND_ME_PREFERENCE_LABEL": "FindMe Preference",
+    "FIND_ME_OPTIONS": {
+      "PREFERRED_DEVICE_GPS": "Use my device GPS",
+      "PREFERRED_SEARCH_CENTER": "Use Search Center"
+    },
     "CONTACT_MAP_OF_PI": "Contact Map of Pi",
     "VALIDATION": {
       "SUCCESSFUL_PREFERENCES_SUBMISSION": "User Preferences update successful",

messages/es.json

@@ -14,6 +14,7 @@
   },
   "SIDE_NAVIGATION": {
     "USER_PREFERENCES_HEADER": "Preferencias del Usuario",
+    "PERSONALIZATION_SUBHEADER": "Personalización",
     "EMAIL_ADDRESS_FIELD": "Tu dirección de correo electrónico",
     "PHONE_NUMBER_FIELD": "Tu número de teléfono",
     "LANGUAGES": "Idiomas",
@@ -23,6 +24,11 @@
       "PRIVACY_POLICY": "Política de Privacidad",
       "TERMS_OF_SERVICE": "Términos de Servicio"
     },
+    "FIND_ME_PREFERENCE_LABEL": "Preferencia de FindMe",
+    "FIND_ME_OPTIONS": {
+      "PREFERRED_DEVICE_GPS": "Usar el GPS de mi dispositivo",
+      "PREFERRED_SEARCH_CENTER": "Usar el Centro de Búsqueda"
+    },
     "CONTACT_MAP_OF_PI": "Contactar a Map of Pi",
     "VALIDATION": {
       "SUCCESSFUL_PREFERENCES_SUBMISSION": "Actualización de preferencias del usuario exitosa",

messages/ewe-BJ.json

@@ -14,6 +14,7 @@
   },
   "SIDE_NAVIGATION": {
     "USER_PREFERENCES_HEADER": "Nutifafa le Mawuwo",
+    "PERSONALIZATION_SUBHEADER": "Trɔtrɔnye",
     "EMAIL_ADDRESS_FIELD": "Wò email adrɛs",
     "PHONE_NUMBER_FIELD": "Wò telefɔn numɔ",
     "LANGUAGES": "Ɖe ŋutɔ",
@@ -23,6 +24,11 @@
       "PRIVACY_POLICY": "Ameŋunyatakakawo Ŋuti Ðoɖo",
       "TERMS_OF_SERVICE": "Ɖoɖo ƒe tɔtrɔ"
     },
+    "FIND_ME_PREFERENCE_LABEL": "FindMe la wɔ nu si",
+    "FIND_ME_OPTIONS": {
+      "PREFERRED_DEVICE_GPS": "Ne míetsɔ nyɔnu tɔn wɔ mí geɖeŋu me",
+      "PREFERRED_SEARCH_CENTER": "Ne míetsɔ Gbesɔsɔmesi"
+    },
     "CONTACT_MAP_OF_PI": "Wò Map of Pi me",
     "VALIDATION": {
       "SUCCESSFUL_PREFERENCES_SUBMISSION": "Nuŋlɔdodoawo ƒe se se yia ɖe asi me",

messages/hau-NG.json

@@ -14,6 +14,7 @@
   },
   "SIDE_NAVIGATION": {
     "USER_PREFERENCES_HEADER": "Zaɓin mai amfani",
+    "PERSONALIZATION_SUBHEADER": "Keɓancewa",
     "EMAIL_ADDRESS_FIELD": "Adireshin i-mel dinka",
     "PHONE_NUMBER_FIELD": "Lambar wayarka",
     "LANGUAGES": "Harsuna",
@@ -23,6 +24,11 @@
       "PRIVACY_POLICY": "Takardar Kebantawa",
       "TERMS_OF_SERVICE": "Sharuɗɗan Sabis"
     },
+    "FIND_ME_PREFERENCE_LABEL": "Zaɓin FindMe",
+    "FIND_ME_OPTIONS": {
+      "PREFERRED_DEVICE_GPS": "Yi amfani da GPS na na'urar",
+      "PREFERRED_SEARCH_CENTER": "Yi amfani da Cibiyar Bincike"
+    },
     "CONTACT_MAP_OF_PI": "Tuntubi Map of Pi",
     "VALIDATION": {
       "SUCCESSFUL_PREFERENCES_SUBMISSION": "Sabunta zaɓuɓɓukan mai amfani ya yi nasara",

messages/ko.json

@@ -14,6 +14,7 @@
   },
   "SIDE_NAVIGATION": {
     "USER_PREFERENCES_HEADER": "사용자 설정",
+    "PERSONALIZATION_SUBHEADER": "개인화",
     "EMAIL_ADDRESS_FIELD": "이메일 주소",
     "PHONE_NUMBER_FIELD": "전화번호",
     "LANGUAGES": "언어",
@@ -23,6 +24,11 @@
       "PRIVACY_POLICY": "개인정보 보호정책",
       "TERMS_OF_SERVICE": "서비스 약관"
     },
+    "FIND_ME_PREFERENCE_LABEL": "FindMe 선호",
+    "FIND_ME_OPTIONS": {
+      "PREFERRED_DEVICE_GPS": "내 기기의 GPS 사용",
+      "PREFERRED_SEARCH_CENTER": "검색 센터 사용"
+    },
     "CONTACT_MAP_OF_PI": "Map of Pi에 문의",
     "VALIDATION": {
       "SUCCESSFUL_PREFERENCES_SUBMISSION": "사용자 환경 설정 업데이트 성공",

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

@@ -337,7 +337,7 @@ const SellerRegistrationForm = () => {
                 <span className="font-bold">
                   {t('SHARED.USER_INFORMATION.NAME_LABEL') + ': '}
                 </span>
-                <span>{dbSeller ? dbSeller.name : ''}</span>
+                <span>{currentUser ? currentUser.user_name : ''}</span>
               </div>
               <div className="text-sm mb-3">
                 <span className="font-bold">

src/app/[locale]/seller/reviews/[id]/page.tsx

@@ -34,7 +34,7 @@ function SellerReviews({
   searchParams: any;
 }) {
   const t = useTranslations();
-  const  sellerName  = searchParams.seller_name;
+  const sellerName  = searchParams.seller_name;
   const isbuyer = searchParams.buyer;
   const sellerId = params.id;
 

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

@@ -156,6 +156,7 @@ export default function Page({ params }: { params: { id: string } }) {
             <EmojiPicker sellerId={sellerId} setIsSaveEnabled={setIsSaveEnabled} currentUser={currentUser} />
           </div>
         </ToggleCollapse>
+
 
         <ToggleCollapse
           header={t('SCREEN.BUY_FROM_SELLER.SELLER_CONTACT_DETAILS_LABEL')}>

src/components/shared/Forms/Buttons/Buttons.tsx

@@ -30,7 +30,7 @@ export const OutlineBtn = (props: any) => {
   const { styles, icon, label, disabled, onClick } = props;
   return (
     <button
-      className={`px-4 py-1 gap-1 cursor-pointer items-center justify-center outline outline-primary outline-[1.5px] hover:bg-primary hover:text-white text-primary rounded-md flex`}
+      className={`px-4 py-1 gap-1 cursor-pointer items-center justify-center outline outline-primary outline-[1.5px] hover:bg-primary hover:text-white text-primary rounded-md flex mx-auto`}
       style={styles}
       disabled={disabled}
       onClick={onClick}>

src/components/shared/Review/TrustMeter.tsx

@@ -2,9 +2,10 @@ import React from 'react';
 
 type TrustMeterProps = {
   ratings: number;
+  hideLabel?: boolean;
 };
 
-const TrustMeter: React.FC<TrustMeterProps> = ({ ratings }) => {
+const TrustMeter: React.FC<TrustMeterProps> = ({ ratings, hideLabel}) => {
   const percentageRating = ratings.toString();
   const average = 50; // this can be adjusted
   const condition = ratings < average
@@ -13,7 +14,7 @@ const TrustMeter: React.FC<TrustMeterProps> = ({ ratings }) => {
 
   return (
     <div className='w-full flex'>
-      <h3 className='font-bold text-sm text-nowrap pe-2'>Trust-o-meter</h3>
+      <h3 className={`font-bold text-sm text-nowrap pe-2 ${hideLabel? 'hidden': 'block'}`}>Trust-o-meter</h3>
       <div className='flex-1'>
 
         <div className="flex w-full">