Skip to content

Commit 7f1c6b1

Browse files
Merge pull request #4158 from dpalou/MOBILE-4649
MOBILE-4649 user-menu: Fix loading forever when no user handlers
2 parents 758697e + e834d99 commit 7f1c6b1

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

src/core/features/mainmenu/components/user-menu/user-menu.html

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ <h1>
4848
</ion-label>
4949
</ion-item>
5050

51-
@if (handlers.length + accountHandlers.length > 0) {
5251
<ion-item button *ngFor="let handler of handlers" class="ion-text-wrap" (click)="handlerClicked($event, handler)"
5352
[ngClass]="['core-user-menu-handler', handler.class || '']" [hidden]="handler.hidden"
5453
[attr.aria-label]="handler.title | translate" [detail]="true">
@@ -81,16 +80,6 @@ <h1>
8180
</span>
8281
<ion-spinner slot="end" *ngIf="handler.showBadge && handler.loading" [attr.aria-label]="'core.loading' | translate" />
8382
</ion-item>
84-
} @else {
85-
<ion-item class="ion-text-center">
86-
<ion-label>
87-
<ion-spinner [attr.aria-label]="'core.loading' | translate" />
88-
</ion-label>
89-
</ion-item>
90-
}
91-
92-
93-
9483

9584
<ion-item button (click)="openPreferences($event)" [attr.aria-label]="'core.settings.preferences' | translate" [detail]="true"
9685
class="core-user-menu-preferences core-user-menu-separator">

src/core/features/mainmenu/components/user-menu/user-menu.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
9999

100100
this.subscription = CoreUserDelegate.getProfileHandlersFor(this.user, CoreUserDelegateContext.USER_MENU)
101101
.subscribe((handlers) => {
102-
if (!handlers.length || !this.user) {
102+
if (!this.user) {
103103
return;
104104
}
105105

0 commit comments

Comments
 (0)