Fixed Settings modal incorrect behaviour (#2361)

Azure · Dec 15, 2023 · 63fed3d · 63fed3d
1 parent 5cd2ddd
commit 63fed3d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/admin/media/mediaSelectionItemModal.tsx b/src/admin/media/mediaSelectionItemModal.tsx
@@ -110,7 +110,7 @@ export class MediaSelectionItemModal extends React.Component<MediaSelectionItemM
         const thumbnailUrl: string = this.getThumbnailUrl(mediaItem);
 
         return (
-            <div className="media-box media-selection-block" onClick={() => this.props.selectMedia(mediaItem)}>
+            <div className="media-box media-selection-block" onClick={() => this.props.selectMedia(mediaItem)} key={mediaItem.key}>
                 <Image
                     src={thumbnailUrl ?? '/assets/images/no-preview.png'}
                     imageFit={ImageFit.centerCover}

diff --git a/src/admin/settings/settingsModal.tsx b/src/admin/settings/settingsModal.tsx
@@ -73,10 +73,13 @@ export class SettingsModal extends React.Component<SettingsModalProps, SettingsM
     }
 
     loadSettings = async (): Promise<void> => {
-        const settings = await this.siteService.getSetting<SiteSettingsContract>('site');
-        const faviconFile = await this.mediaService.getMediaByKey(settings.faviconSourceKey);
+        const settings = await this.siteService.getSetting<SiteSettingsContract>('site');        
         this.setState({ initialSettings: settings, settings: settings });
-        this.getFaviconThumbnailUrl(faviconFile);
+
+        if (settings.faviconSourceKey) {
+            const faviconFile = await this.mediaService.getMediaByKey(settings.faviconSourceKey);
+            this.getFaviconThumbnailUrl(faviconFile); 
+        }
     }
 
     getFaviconThumbnailUrl = async (faviconFile: MediaContract): Promise<void> => {