From 3c7640cc829aa10cc9ff70924509eeac584ac99a Mon Sep 17 00:00:00 2001
From: hamster1963 <1410514192@qq.com>
Date: Fri, 20 Dec 2024 01:12:24 +0800
Subject: [PATCH] fix: getDaysBetweenDatesWithAutoRenewal

---
 bun.lockb                      | Bin 185933 -> 185933 bytes
 src/App.tsx                    |   8 +++++++-
 src/components/billingInfo.tsx |   7 ++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bun.lockb b/bun.lockb
index 65ed4c653d31f37a63f167ef5f2892238f222735..cafa0e53d77ab672b49c01268d11f0afc6d5b0e7 100755
GIT binary patch
delta 75
zcmV-R0JQ(jtP9Po3xKo%9NPghmmS*yv;j1i(%S(v0XMe?+yS2f8#n;u0RR9V004ly
h-__JFwXp310bVsOHZm?ax53>39RUF{x8L3YZuc}99C`o%

delta 75
zcmV-R0JQ(jtP9Po3xKo%9NPggmmS*yv;i}h(%S(v0XDY>+yS2f8#e&t0RR9V004ly
h-__JFwXp310bVsOHZm?Zx53>39RUF_x8L3YZuc`Q9CH8w

diff --git a/src/App.tsx b/src/App.tsx
index ceee40e..e23b4a2 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,5 +1,5 @@
 import { useQuery } from "@tanstack/react-query"
-import React, { useEffect } from "react"
+import React, { useEffect, useState } from "react"
 import { useTranslation } from "react-i18next"
 import { Route, BrowserRouter as Router, Routes } from "react-router-dom"
 
@@ -21,10 +21,12 @@ const App: React.FC = () => {
     refetchOnWindowFocus: true,
   })
   const { i18n } = useTranslation()
+  const [isCustomCodeInjected, setIsCustomCodeInjected] = useState(false)
 
   useEffect(() => {
     if (settingData?.data?.custom_code) {
       InjectContext(settingData?.data?.custom_code)
+      setIsCustomCodeInjected(true)
     }
   }, [settingData?.data?.custom_code])
 
@@ -36,6 +38,10 @@ const App: React.FC = () => {
     return null
   }
 
+  if (!isCustomCodeInjected) {
+    return null
+  }
+
   if (settingData?.data?.language && !localStorage.getItem("language")) {
     i18n.changeLanguage(settingData?.data?.language)
   }
diff --git a/src/components/billingInfo.tsx b/src/components/billingInfo.tsx
index 7836cba..dcd9873 100644
--- a/src/components/billingInfo.tsx
+++ b/src/components/billingInfo.tsx
@@ -18,7 +18,12 @@ export default function BillingInfo({ parsedData }: { parsedData: PublicNoteData
     if (parsedData.billingDataMod.endDate.startsWith("0000-00-00")) {
       isNeverExpire = true
     } else {
-      daysLeftObject = getDaysBetweenDatesWithAutoRenewal(parsedData.billingDataMod)
+      try {
+        daysLeftObject = getDaysBetweenDatesWithAutoRenewal(parsedData.billingDataMod)
+      } catch (error) {
+        console.error(error)
+        return <div className={cn("text-[10px] text-muted-foreground text-red-600")}>剩余时间: 计算出错</div>
+      }
     }
   }