From eec2d2015aeaa3ac12c64196cf773e2370a869fb Mon Sep 17 00:00:00 2001 From: Rinku Chaudhari <76877078+therealrinku@users.noreply.github.com> Date: Thu, 8 Feb 2024 17:25:13 +0545 Subject: [PATCH] fix: request settings for scratchpad leading to welcome screen (#7068) * fix: request settings for scratchpad leading to welcome screen * fix: added missing dependencies and semicolon * use existing fn to check for scratchpad --------- Co-authored-by: gatzjames --- .../src/ui/components/modals/request-settings-modal.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/insomnia/src/ui/components/modals/request-settings-modal.tsx b/packages/insomnia/src/ui/components/modals/request-settings-modal.tsx index c7b6337f32..af03cf8646 100644 --- a/packages/insomnia/src/ui/components/modals/request-settings-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/request-settings-modal.tsx @@ -4,6 +4,7 @@ import { useFetcher, useNavigate, useParams } from 'react-router-dom'; import * as models from '../../../models'; import { GrpcRequest, isGrpcRequest } from '../../../models/grpc-request'; +import { isScratchpadOrganizationId } from '../../../models/organization'; import { isRequest, Request } from '../../../models/request'; import { isWebSocketRequest, WebSocketRequest } from '../../../models/websocket-request'; import { invariant } from '../../../utils/invariant'; @@ -32,7 +33,7 @@ export const RequestSettingsModal = ({ request, onHide }: ModalProps & RequestSe const workspacesFetcher = useFetcher(); useEffect(() => { const isIdleAndUninitialized = workspacesFetcher.state === 'idle' && !workspacesFetcher.data; - if (isIdleAndUninitialized) { + if (isIdleAndUninitialized && !isScratchpadOrganizationId(organizationId)) { workspacesFetcher.load(`/organization/${organizationId}/project/${projectId}`); } }, [organizationId, projectId, workspacesFetcher]);