diff --git a/helpers/notifications.js b/helpers/notifications.js
index 4cb3bb7d..1c8448f2 100644
--- a/helpers/notifications.js
+++ b/helpers/notifications.js
@@ -136,8 +136,8 @@ export function groupNotifications(notifications, includeRead = false) {
if (notification.body) {
const index = grouped.findIndex(
(notif) =>
- (notif.body.thread_id === notification.body.thread_id ||
- notif.body.project_id === notification.body.project_id) &&
+ ((notif.body.thread_id === notification.body.thread_id && !!notif.body.thread_id) ||
+ (notif.body.project_id === notification.body.project_id && !!notif.body.project_id)) &&
notification.read === notif.read
)
const notif = grouped[index]
diff --git a/layouts/default.vue b/layouts/default.vue
index c7bef474..ba9a1192 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -476,6 +476,10 @@ export default defineNuxtComponent({
},
},
mounted() {
+ if (process.client && window) {
+ window.history.scrollRestoration = 'auto'
+ }
+
this.runAnalytics()
},
methods: {
diff --git a/package.json b/package.json
index 0ce94b50..ebc49ce1 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
"js-yaml": "^4.1.0",
"jszip": "^3.10.1",
"markdown-it": "^13.0.1",
- "omorphia": "^0.4.35",
+ "omorphia": "^0.4.37",
"qrcode.vue": "^3.4.0",
"semver": "^7.5.4",
"vue-multiselect": "^3.0.0-alpha.2",
diff --git a/pages/[type]/[id].vue b/pages/[type]/[id].vue
index 958c6dd4..1244c552 100644
--- a/pages/[type]/[id].vue
+++ b/pages/[type]/[id].vue
@@ -378,15 +378,11 @@
class="card information"
aria-label="Information"
>
- To install {{ project.title }}, visit
+ To install {{ project.title }}, download
+ You have no unread notifications. You have no unread notifications.Notifications
- Analytics
- Notifications
+ Analytics
+
- Economics: Rinth shall pay to you the percentage set forth here (90%) of net
- revenue collected by Rinth attributable to ad impressions displayed solely on your creator
- page excluding transaction fees (“Revenue Share”). Rinth shall make Revenue Share payments to
- you when you withdraw funds from Rinth's dashboard. Rinth shall include with each such payment
- either access to a dashboard or other reasonable reporting detailing the calculation thereof.
+ Economics: Rinth shall pay to you the percentage set forth
+
Relationship: Your relationship with Rinth relating to the Rewards Program is diff --git a/pages/settings/account.vue b/pages/settings/account.vue index 0a1d2eb8..4be07add 100644 --- a/pages/settings/account.vue +++ b/pages/settings/account.vue @@ -179,7 +179,7 @@ id="verify-code" v-model="twoFactorCode" maxlength="6" - type="number" + type="text" placeholder="Enter code..." />
The code entered is incorrect!
@@ -511,7 +511,7 @@ async function verifyTwoFactorCode() { const res = await useBaseFetch('auth/2fa', { method: 'POST', body: { - code: twoFactorCode.value ? twoFactorCode.value.toString() : '', + code: twoFactorCode.value ? twoFactorCode.value : '', flow: twoFactorFlow.value, }, }) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fe23cc21..a8a0b6a5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -32,8 +32,8 @@ dependencies: specifier: ^13.0.1 version: 13.0.1(patch_hash=3vlxaukqep4gvqytxeznhg6wbq) omorphia: - specifier: ^0.4.35 - version: 0.4.35 + specifier: ^0.4.37 + version: 0.4.37 qrcode.vue: specifier: ^3.4.0 version: 3.4.0(vue@3.3.4) @@ -5410,8 +5410,8 @@ packages: resolution: {integrity: sha512-9CIOSq5945rI045GFtcO3uudyOkYVY1nyfFxVQp+9BRgslr8jPNiSSrsFGg/BNTUFOLqx0P5tng6G32brIPw0w==} dev: true - /omorphia@0.4.35: - resolution: {integrity: sha512-ZxA6sJKWZbiG49l/gTG25cxAvTcIfVSLhuIV2e+LSY0nwkZO4EFvxhzGNz0exR3lVs+OdDCdJyb1U2QYMVbVrA==} + /omorphia@0.4.37: + resolution: {integrity: sha512-q5crkohQQCzmY9q6X7BA02+rWbhYL5SkF7xVgb0H38TwxRCWPnbaQu8wR7vRt8QxmVY7pyijlzYzBNnJFd7egw==} dependencies: dayjs: 1.11.7 floating-vue: 2.0.0-beta.20(vue@3.3.4)