Merge remote-tracking branch 'origin/main'

src/views/AuthApp.jsx

@@ -23,6 +23,7 @@ import AppLogo from '@/assets/highlights_travel_300_300.png'
 import '@/assets/App.css'
 import 'react-chat-elements/dist/main.css'
 import EmailFetch from './Conversations/Online/Components/EmailFetch'
+import { getEmailFetchAction } from '@/actions/EmailActions'
 
 function AuthApp() {
   const navigate = useNavigate()
@@ -52,12 +53,19 @@ function AuthApp() {
       loadPageSpy(loginUser.username)
       connectWebsocket(loginUser.userId)
       fetchInitialData(loginUser)
+      startEmailInterval(loginUser.userId)
     }
     return () => {
       disconnectWebsocket()
     }
   }, [])
 
+  const startEmailInterval = (userId) => {
+    setInterval(() => {
+      getEmailFetchAction({opi_sn: userId})
+    }, 1000*60)
+  }
+
   const uploadLog = () => {
     if (window.$pageSpy) {
       window.$pageSpy.triggerPlugins('onOfflineLog', 'upload')

src/views/accounts/GeneratePayment.jsx

@@ -46,13 +46,17 @@ function GeneratePayment() {
           })
         })
         // .finally(() => setLoading(false))
-        .catch((reason) => {
-          // notification.error({
-          // 	message: "查询出错",
-          // 	description: reason.message,
-          // 	placement: "top",
-          // 	duration: 60,
-          // });
+        // .catch(() => {
+        // })
+    } else {
+      generateForm.setFieldsValue({
+        notifyEmail: getPrimaryEmail(),
+        description: 'Tracking Code: \r\nTravel Advisor: \r\nContent: \r\n',
+        langauge: 'US',
+        orderType: '227001',
+        currency: 'USD',
+        amount: 1,
+        userId: loginUser.userId,
       })
     }
   }, [currentOrder])