From b5961ada6722a0975fb06f2c09be2f9d54364d60 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 29 Jan 2024 12:31:01 +0100
Subject: [PATCH] MOBILE-3947 login: Restore logo fallback

---
 src/core/features/login/pages/credentials/credentials.html | 6 ++++--
 src/core/features/login/pages/reconnect/reconnect.html     | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html
index 0503fb2fc27..5da2f6d87f7 100644
--- a/src/core/features/login/pages/credentials/credentials.html
+++ b/src/core/features/login/pages/credentials/credentials.html
@@ -23,8 +23,10 @@ <h1>{{ 'core.login.login' | translate }}</h1>
         <ng-container *ngIf="!siteCheckError && site && credForm">
             <div class="ion-text-wrap ion-text-center core-login-info-box">
                 <div class="core-login-site">
-                    <div class="core-login-site-logo" *ngIf="logoUrl">
-                        <img [src]="logoUrl" role="presentation" alt="" onError="this.src='assets/img/login_logo.png'">
+                    <div class="core-login-site-logo">
+                        <!-- Show site logo or a default image. -->
+                        <img *ngIf="logoUrl" [src]="logoUrl" role="presentation" alt="" onError="this.src='assets/img/login_logo.png'">
+                        <img *ngIf="!logoUrl" src="assets/img/login_logo.png" role="presentation" alt="">
                     </div>
 
                     <h2 *ngIf="siteName" class="ion-margin-top ion-no-padding core-sitename">
diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
index 149e0d45a2a..e17e0d753bb 100644
--- a/src/core/features/login/pages/reconnect/reconnect.html
+++ b/src/core/features/login/pages/reconnect/reconnect.html
@@ -31,8 +31,10 @@ <h1>{{ 'core.login.reconnect' | translate }}</h1>
 
             <div class="ion-text-wrap ion-text-center core-login-info-box">
                 <div class="core-login-site">
-                    <div class="core-login-site-logo" *ngIf="!showUserAvatar && logoUrl">
-                        <img [src]="logoUrl" role="presentation" onError="this.src='assets/img/login_logo.png'" alt="">
+                    <div class="core-login-site-logo" *ngIf="!showUserAvatar">
+                        <!-- Show site logo or a default image. -->
+                        <img *ngIf="logoUrl" [src]="logoUrl" role="presentation" onError="this.src='assets/img/login_logo.png'" alt="">
+                        <img *ngIf="!logoUrl" src="assets/img/login_logo.png" role="presentation" alt="">
                     </div>
 
                     <p *ngIf="siteInfo?.siteName" class="ion-no-margin ion-no-padding core-sitename">