fix: timer & translation Capital letter problem & tele popup

hiddify · Feb 7, 2024 · d45e0bb · d45e0bb
1 parent 9d52b41
commit d45e0bb
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 19 deletions.
diff --git a/public/i18n/en.json b/public/i18n/en.json
@@ -10,10 +10,10 @@
     "Welcome": "Welcome",
     "Remaining Traffic": "Remaining Traffic",
     "Remaining time": "Remaining time",
-    "year": "Year",
-    "years": "Years",
-    "month": "Month",
-    "months": "Months",
+    "Year": "Year",
+    "Years": "Years",
+    "Month": "Month",
+    "Months": "Months",
     "Support": "Support",
     "Join our Telegram channel in case you have any questions on how to use the links.": "Join our Telegram channel in case you have any questions on how to use the links.",
     "Name": "Name",
@@ -67,8 +67,8 @@
     "Portuguese": "Portuguese",
     "Configs": "Configs",
     "Choose your preferred language:": "Choose your preferred Language:",
-    "day": "Day",
-    "days": "Days",
+    "Day": "Day",
+    "Days": "Days",
     "Used Traffic": "Used Traffic",
     "Please connect your Telegram account to the panel to know the latest status of your subscription": "Please connect your Telegram account to the panel to know the latest status of your subscription",
     "Connect To Telegram": "Connect To Telegram"

diff --git a/public/i18n/fa.json b/public/i18n/fa.json
@@ -10,10 +10,10 @@
     "Welcome": "خوش آمدی",
     "Remaining Traffic": "ترافیک باقی مانده",
     "Remaining time": "زمان باقی مانده",
-    "year": "سال",
-    "years": "سال",
-    "month": "ماه",
-    "months": "ماه",
+    "Year": "سال",
+    "Years": "سال",
+    "Month": "ماه",
+    "Months": "ماه",
     "Support": "پشتیبانی",
     "Join our Telegram channel in case you have any questions on how to use the links.": "در صورتی که در مورد نحوه استفاده از لینک ها سوالی دارید به کانال تلگرام ما بپیوندید.",
     "Name": "نام",
@@ -59,8 +59,8 @@
     "Farsi": "فارسی",
     "Configs": "تنظیمات",
     "Choose your preferred language:": "زبان مورد نظر خود را انتخاب کنید",
-    "day": "روز",
-    "days": "روز",
+    "Day": "روز",
+    "Days": "روز",
     "Used Traffic": "ترافیک مصرف شده",
     "Please connect your Telegram account to the panel to know the latest status of your subscription": "لطفا اکانت تلگرام خود را به پنل متصل کنید تا از آخرین وضعیت اشتراک خودتان مطلع شوید",
     "Connect To Telegram": "اتصال به تلگرام"

diff --git a/src/pages/home/components/MainBody.tsx b/src/pages/home/components/MainBody.tsx
@@ -33,8 +33,22 @@ const MainBody = () => {
 
 
   useEffect(() => {
-    if(getInfo.data && !getInfo.data?.telegram_id && getInfo.data?.telegram_bot_url){
-      setIsModalOpen(true)
+    if(getInfo.data){
+      const hasTeleId = (
+        getInfo.data?.telegram_id !== 0 || 
+        getInfo.data?.telegram_id !== undefined || 
+        getInfo.data?.telegram_id !== null || 
+        getInfo.data?.telegram_id !== '')
+
+      const hasTeleBotUrl = (
+        getInfo.data?.telegram_bot_url !== '' &&
+        getInfo.data?.telegram_bot_url !== null &&
+        getInfo.data?.telegram_bot_url !== undefined
+      )
+
+      if(hasTeleBotUrl && !hasTeleId){
+        setIsModalOpen(true)
+      }
     }
   }, [getInfo.data])
 

diff --git a/src/pages/home/components/ShareLinks.tsx b/src/pages/home/components/ShareLinks.tsx
@@ -129,11 +129,11 @@ const ShareLinks: React.FC<propsTypes> = ({ isModalOpen }) => {
                     style: { resize: "both" },
                     endAdornment: (
                         <InputAdornment position="end">
-                            <div className='flex items-center gap-1'>
                                 {getShortLink.isLoading ? 
                                 <CircularProgress size={20} thickness={4}/>
                                 :
-                                <>
+                                <div className='flex flex-col justify-center items-center'>
+                                  <AvTimerIcon fontSize='small' />
                                   <Text fontSize='xs' fontWeight='regular' className='text-[#6C757D]'>
                                       <Countdown 
                                         onComplete={() => getShortLink.refetch()}
@@ -142,10 +142,8 @@ const ShareLinks: React.FC<propsTypes> = ({ isModalOpen }) => {
                                         date={new Date().setSeconds(new Date().getSeconds() + getShortLink.data?.expire_in )} 
                                       />
                                   </Text>
-                                  <AvTimerIcon />
-                                </>
+                                  </div>
                                 }
-                            </div>
                         </InputAdornment>
                     )
                 }}