Merge branch 'develop' into feature/multiple-events-in-planning

MarkLark86 · Jul 30, 2024 · 6835b24 · 6835b24
2 parents 3578f24 + 0b2e3be
commit 6835b24
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/client/components/Main/ListPanel.tsx b/client/components/Main/ListPanel.tsx
@@ -422,18 +422,16 @@ export class ListPanel extends React.Component<IProps, IState> {
                                 />
                             );
                         })}
-                        {!isAllListItemsLoaded && (
+                        {(!isAllListItemsLoaded && loadingIndicator) && (
                             <div className="ListGroup">
                                 <Group>
-                                    <Item noBg={true}>
-                                        <Column grow={true}>
-                                            <div
-                                                className="sd-alert sd-alert--hollow sd-alert--primary sd-alert--align"
-                                            >
-                                                {gettext('loading more items...')}
-                                            </div>
-                                        </Column>
-                                    </Item>
+                                    <Column grow={true}>
+                                        <div
+                                            className="sd-alert sd-alert--hollow sd-alert--primary sd-alert--align"
+                                        >
+                                            {gettext('loading more items...')}
+                                        </div>
+                                    </Column>
                                 </Group>
                             </div>
                         )}