Skip to content

Commit

Permalink
Merge pull request #1741 from hackforla/1740-Make-loading-modal-only-…
Browse files Browse the repository at this point in the history
…appear-on-the-map-page

1740 make loading modal only appear on the map page
  • Loading branch information
bphan002 authored Jun 3, 2024
2 parents 564aac7 + d8c5b65 commit faf0cac
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions components/Map/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -444,14 +444,18 @@ class MapContainer extends React.Component {
initialState={this.initialState}
/>
<CookieNotice />
{(isDbLoading || isMapLoading || isTableLoading) ? (
<>
<LoadingModal />
<FunFactCard />
</>
) : (acknowledgeModalShown === false) ? (
<AcknowledgeModal onClose={this.onClose}/>
) : null}
{
window.location.hash == '#/map' && (
(isDbLoading || isMapLoading || isTableLoading) ? (
<>
<LoadingModal />
<FunFactCard />
</>
) : (acknowledgeModalShown === false) ? (
<AcknowledgeModal onClose={this.onClose}/>
) : null
)
}
</div>
);
}
Expand Down

0 comments on commit faf0cac

Please sign in to comment.