Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(sidebar): user status reactivity bug #4939

Merged
merged 2 commits into from
Sep 20, 2022
Merged

fix(sidebar): user status reactivity bug #4939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99d3324
fix(sidebar): user status reactivity bug
josephmcg Sep 20, 2022
8677dcc
fix(profile): maintain vue observer
josephmcg Sep 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/views/navigation/sidebar/status/Status.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="status" v-show="!!profile">
<div id="status">
<UiUserState :user="profile" />
<div class="user-info" v-tooltip.top="$t('controls.copy_id')" @click="copyId">
<TypographyTitle data-cy="user-name" :text="profile.name" :size="6" />
Expand Down
5 changes: 3 additions & 2 deletions components/views/navigation/sidebar/status/Status.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
<script lang="ts">
import Vue from 'vue'
import iridium from '~/libraries/Iridium/IridiumManager'
import { User } from '~/libraries/Iridium/users/types'

export default Vue.extend({
data() {
return { status: 'online', profile: iridium.profile.state }
return {
profile: iridium.profile.state,
}
},
methods: {
copyId() {
Expand Down
2 changes: 1 addition & 1 deletion components/views/settings/pages/profile/Profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
<edit-icon size="1x" />
</InteractablesInput>
</form>
<div v-if="profile && !!profile.status" class="status">
<div class="status">
<TypographyText as="h6">
{{ $t('pages.settings.profile.current_status') }}
</TypographyText>
Expand Down
9 changes: 3 additions & 6 deletions libraries/Iridium/profile/ProfileManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ export default class IridiumProfile extends Emitter {
return
}
logger.info('iridium/profile', 'profile state changed', state)
this.state = state.value?.profile
this.setUser()
this.emit('changed', state)
}
}
Expand All @@ -77,10 +75,9 @@ export default class IridiumProfile extends Emitter {

async updateUser(details: Partial<User>) {
logger.info('iridium/profile', 'updating user', { details })
this.state = {
...this.state,
...details,
} as User
for await (const [key, value] of Object.entries(details)) {
this.state[key] = value
}
await this.set('/', this.state)
if (!this.state || !iridium.id) return
// tell our peers via user announce
Expand Down