Merge branch 'dev' into dev_zyh

src/utils/tools.ts

@@ -21,12 +21,15 @@ export const formatTimezoneByUTCorGMT = (time: string, timezone: string) => {
   let formattedTime = ''
     formattedTime = moment(time).format('MMM-DD-YYYY hh:mm A')
     let gmtOffset = ''
-    const timeZoneOffset = moment().tz(timezone).format('Z')
-    // 替换 "+07:00" 为 "GMT+07"
-    if (timezone.includes('Seoul')) {
-      gmtOffset = `(UTC${timeZoneOffset.slice(0, 3)})`
-    } else {
-      gmtOffset = `(GMT${timeZoneOffset.slice(0, 3)})`
+    console.log(timezone,formattedTime)
+    if(timezone!= null) {
+      const timeZoneOffset = moment().tz(timezone).format('Z')
+      // 替换 "+07:00" 为 "GMT+07"
+      if (timezone.includes('Seoul')) {
+        gmtOffset = `(UTC${timeZoneOffset.slice(0, 3)})`
+      } else {
+        gmtOffset = `(GMT${timeZoneOffset.slice(0, 3)})`
+      }
+      return `${formattedTime} ${gmtOffset}`
     }
-    return `${formattedTime} ${gmtOffset}`
 }