diff --git a/src/app.scss b/src/app.scss
index 093e32ee..8b681e40 100644
--- a/src/app.scss
+++ b/src/app.scss
@@ -1055,3 +1055,11 @@ i.x-status-icon.red {
:root {
--el-overlay-color-lighter: rgba(0, 0, 0, 0.15);
}
+
+// fix fullscreen image viewer colors in dark mode
+.toolbar-icon,
+.el-image-viewer__actions,
+.el-image-viewer__close {
+ color: var(--el-color-info-dark-2);
+ background-color: var(--el-bg-color);
+}
diff --git a/src/components/dialogs/GroupDialog/GroupDialog.vue b/src/components/dialogs/GroupDialog/GroupDialog.vue
index 5d923993..e5de30ec 100644
--- a/src/components/dialogs/GroupDialog/GroupDialog.vue
+++ b/src/components/dialogs/GroupDialog/GroupDialog.vue
@@ -168,7 +168,13 @@
diff --git a/src/stores/instance.js b/src/stores/instance.js
index a96c5d42..09e8bebc 100644
--- a/src/stores/instance.js
+++ b/src/stores/instance.js
@@ -674,7 +674,10 @@ export const useInstanceStore = defineStore('Instance', () => {
userId: L.userId
})
.then((args) => {
- Object.assign(L.user, args.ref);
+ if (args.ref.id === L.userId) {
+ Object.assign(L.user, args.ref);
+ instance.$location = L;
+ }
});
} else {
L.user = ref;
diff --git a/src/stores/user.js b/src/stores/user.js
index 8fddf3b8..6077ac61 100644
--- a/src/stores/user.js
+++ b/src/stores/user.js
@@ -1037,7 +1037,10 @@ export const useUserStore = defineStore('User', () => {
userId: L.userId
})
.then((args) => {
- Object.assign(L.user, args.ref);
+ if (args.ref.id === L.userId) {
+ Object.assign(L.user, args.ref);
+ D.$location = L;
+ }
});
} else {
L.user = ref;