diff --git a/api/server/middleware/messageQuota.js b/api/server/middleware/messageQuota.js index 10d1a7c571f..2ef1a4f7e59 100644 --- a/api/server/middleware/messageQuota.js +++ b/api/server/middleware/messageQuota.js @@ -3,7 +3,7 @@ const { getMessagesCount } = require('../../models'); const getUserMessageQuotaUsagePastDays = async (user, days = 30) => { let currentTime = new Date(); let quota = 0; - if ('proMemberExpiredAt' in user && user.proMemberExpiredAt > currentTime) { + if (user && 'proMemberExpiredAt' in user && user.proMemberExpiredAt > currentTime) { // If not proMember, check quota quota = JSON.parse(process.env['CHAT_QUOTA_PER_MONTH_PRO_MEMBER']); } else { diff --git a/api/server/routes/convos.js b/api/server/routes/convos.js index 93505541f57..f0a4c26f394 100644 --- a/api/server/routes/convos.js +++ b/api/server/routes/convos.js @@ -189,7 +189,7 @@ router.post('/clear', async (req, res) => { router.post('/update', async (req, res) => { const update = req.body.arg; - console.log('in update', update); + // console.log('in update', update); try { const dbResponse = await saveConvo(req.user.id, update); res.status(201).json(dbResponse); @@ -238,7 +238,7 @@ router.post('/like', async (req, res) => { router.post('/:conversationId/viewcount/increment', async (req, res) => { const { conversationId } = req.params; - console.log(`routes: hit viewcount increment router for conversationId ${conversationId}`); + // console.log(`routes: hit viewcount increment router for conversationId ${conversationId}`); try { const dbResponse = await increaseConvoViewCount(conversationId); // console.log( diff --git a/client/src/components/Auth/Login.tsx b/client/src/components/Auth/Login.tsx index f4003231176..331971268ac 100644 --- a/client/src/components/Auth/Login.tsx +++ b/client/src/components/Auth/Login.tsx @@ -119,9 +119,9 @@ function Login() { return (
-
+ {/*
Logo -
+
*/}
diff --git a/client/src/components/Auth/Registration.tsx b/client/src/components/Auth/Registration.tsx index 7193a7d56ac..40ef7e246a5 100644 --- a/client/src/components/Auth/Registration.tsx +++ b/client/src/components/Auth/Registration.tsx @@ -178,9 +178,9 @@ const Registration: React.FC = () => { return (
-
+ {/*
Logo -
+
*/}
diff --git a/client/src/components/Auth/RequestPasswordReset.tsx b/client/src/components/Auth/RequestPasswordReset.tsx index 1a86e7b2c0a..455fca2d870 100644 --- a/client/src/components/Auth/RequestPasswordReset.tsx +++ b/client/src/components/Auth/RequestPasswordReset.tsx @@ -169,9 +169,9 @@ function RequestPasswordReset() { return (
-
+ {/*
Logo -
+
*/}
diff --git a/client/src/components/Auth/ResetPassword.tsx b/client/src/components/Auth/ResetPassword.tsx index bb5f3f3a777..bf5e914672c 100644 --- a/client/src/components/Auth/ResetPassword.tsx +++ b/client/src/components/Auth/ResetPassword.tsx @@ -83,9 +83,9 @@ function ResetPassword() { } else { return (
-
+ {/*
Logo -
+
*/}
diff --git a/client/src/components/Conversations/DropDownMenu.tsx b/client/src/components/Conversations/DropDownMenu.tsx index 1cc18ae8b4c..44b759c8320 100644 --- a/client/src/components/Conversations/DropDownMenu.tsx +++ b/client/src/components/Conversations/DropDownMenu.tsx @@ -45,7 +45,7 @@ const DropDownMenu: FC = ({ - {tooltip} + {localize('com_ui_more_options')}