Skip to content

Commit 6668a55

Browse files
committed
chore: added isLoading check to not show p2p page if advertiser_info has not loaded
1 parent c5c9023 commit 6668a55

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/routes/AppContent/index.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,10 @@ const AppContent = () => {
103103
}, []);
104104

105105
const getComponent = () => {
106-
if ((isP2PSettingsLoading || isLoadingActiveAccount || !isFetched || !activeAccountData) && !isEndpointRoute) {
106+
if (
107+
(isP2PSettingsLoading || isLoadingActiveAccount || !isFetched || !activeAccountData || isLoading) &&
108+
!isEndpointRoute
109+
) {
107110
return <Loader />;
108111
} else if ((isP2PBlocked && !isEndpointRoute) || isPermissionDenied || p2pSettingsError?.code) {
109112
return (
@@ -128,7 +131,7 @@ const AppContent = () => {
128131
))}
129132
</Tabs>
130133
{isDesktop && !isEndpointRoute && <GuideTooltip />}
131-
<SafetyAlertModal />
134+
{!isEndpointRoute && <SafetyAlertModal />}
132135
<Router />
133136
</div>
134137
);

0 commit comments

Comments
 (0)