Merge remote-tracking branch 'origin/lotus' into sw-fix

src/app/features/settings/about/About.tsx

@@ -4,12 +4,12 @@ import { Page, PageContent, PageHeader } from '../../../components/page';
 import { SequenceCard } from '../../../components/sequence-card';
 import { SequenceCardStyle } from '../styles.css';
 import { SettingTile } from '../../../components/setting-tile';
+import { getOriginBaseUrl, withOriginBaseUrl } from '../../../pages/pathUtils';
 import pkg from '../../../../../package.json';
 import { clearCacheAndReload } from '../../../../client/initMatrix';
 import { useMatrixClient } from '../../../hooks/useMatrixClient';
-import { getOriginBaseUrl, withOriginBaseUrl } from '../../../pages/pathUtils';
 
-const LotusLogo = withOriginBaseUrl(getOriginBaseUrl(), '/Lotus.png');
+const LotusLogo = withOriginBaseUrl(getOriginBaseUrl(), '/public/res/Lotus.png');
 
 type MSC1929Contact = {
   matrix_id?: string;

src/app/pages/auth/AuthLayout.tsx

@@ -20,6 +20,7 @@ import {
 } from '../../hooks/useClientConfig';
 import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback';
 import { LOGIN_PATH, REGISTER_PATH, RESET_PASSWORD_PATH } from '../paths';
+import { getOriginBaseUrl, withOriginBaseUrl } from '../pathUtils';
 import { ServerPicker } from './ServerPicker';
 import { AutoDiscoveryAction, autoDiscovery } from '../../cs-api';
 import { SpecVersionsLoader } from '../../components/SpecVersionsLoader';
@@ -29,9 +30,8 @@ import { AuthFlowsLoader } from '../../components/AuthFlowsLoader';
 import { AuthFlowsProvider } from '../../hooks/useAuthFlows';
 import { AuthServerProvider } from '../../hooks/useAuthServer';
 import { tryDecodeURIComponent } from '../../utils/dom';
-import { getOriginBaseUrl, withOriginBaseUrl } from '../pathUtils';
 
-const LotusLogo = withOriginBaseUrl(getOriginBaseUrl(), '/Lotus.png');
+const LotusLogo = withOriginBaseUrl(getOriginBaseUrl(), '/public/res/Lotus.png');
 
 const currentAuthPath = (pathname: string): string => {
   if (matchPath(LOGIN_PATH, pathname)) {

src/app/pages/auth/oidc/oidcConfig.ts

@@ -2,7 +2,7 @@ import type { OidcRegistrationClientMetadata } from 'matrix-js-sdk';
 import { OIDC_CALLBACK_PATH } from '../../paths';
 import { getOriginBaseUrl, withOriginBaseUrl } from '../../pathUtils';
 
-const LotusLogo = withOriginBaseUrl(getOriginBaseUrl(), '/Lotus.png');
+const LotusLogo = withOriginBaseUrl(getOriginBaseUrl(), '/public/res/Lotus.png');
 
 /**
  * Absolute URL the OIDC provider redirects back to after authorization.

src/app/pages/client/ClientNonUIFeatures.tsx

@@ -76,6 +76,10 @@ const LogoHighlightSVG = withOriginBaseUrl(getOriginBaseUrl(), '/lotus-highlight
 
 // Grace period after the initial sync settles before invite notifications arm, so
 // the async invite-atom population lands first and isn't mistaken for new invites.
+const LogoSVG = withOriginBaseUrl(getOriginBaseUrl(), '/public/res/lotus.png');
+const LogoUnreadSVG = withOriginBaseUrl(getOriginBaseUrl(), '/public/res/lotus-unread.png');
+const LogoHighlightSVG = withOriginBaseUrl(getOriginBaseUrl(), '/public/res/lotus-highlight.png');
+
 const INVITE_NOTIFY_ARM_DELAY_MS = 3000;
 
 function SystemEmojiFeature() {

src/app/pages/client/WelcomePage.tsx

@@ -1,10 +1,10 @@
 import React from 'react';
 import { Box, Button, Icon, Icons, Text, config, toRem } from 'folds';
 import { Page, PageHero, PageHeroSection } from '../../components/page';
-import pkg from '../../../../package.json';
 import { getOriginBaseUrl, withOriginBaseUrl } from '../pathUtils';
+import pkg from '../../../../package.json';
 
-const LotusLogo = withOriginBaseUrl(getOriginBaseUrl(), '/Lotus.png');
+const LotusLogo = withOriginBaseUrl(getOriginBaseUrl(), '/public/res/Lotus.png');
 
 export function WelcomePage() {
   return (