Skip to content

Commit 5123704

Browse files
authored
Merge branch 'master' into fix/rename-red-palette-to-magenta-add-true-red
2 parents 6d7a97c + 2ca5ab5 commit 5123704

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/actors/utils.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import { AnyActorRef, AnyEventObject, assign, enqueueActions, sendTo } from 'xst
55
import { AnyActorSystem } from 'xstate/dist/declarations/src/system';
66
import { workerEvents } from './worker/events';
77

8+
// Type used for context validation in reply() function
9+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
810
type ContextWithReturnAddress = { returnAddress: AnyActorRef };
911

1012
export const sendToActor = (actor: string, event: AnyEventObject) =>

src/constants/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export const DEFAULT_WIDTH = '24';
22
export const DEFAULT_HEIGHT = '24';
33
export const DEFAULT_FILL = '#000';
4-
export const DEFAULT_FILL_NONE = 'none';
4+
export const DEFAULT_FILL_NONE = 'currentColor';
55
export const KEPPEL_GREEN_FILL = '#00B39F';
66
export const CARIBBEAN_GREEN_FILL = '#00D3A9';
77
export const DEFAULT_STROKE = '#000';

src/custom/DashboardWidgets/GettingStartedWidget/InviteUserModal.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,10 @@ export default function UserInviteModal({
105105
const [organization, setOrganization] = useState<Organization>(defaultOrgSelection);
106106

107107
// Query to check if user exists by email (only if hook is provided)
108-
const { data: existingUserData } = useGetUserByEmailQuery
109-
? useGetUserByEmailQuery(
110-
{ email: inviteeEmail },
111-
{ skip: !inviteeEmail || !EMAIL_REGEXP.test(inviteeEmail) }
112-
)
113-
: { data: null };
108+
const { data: existingUserData } = useGetUserByEmailQuery?.(
109+
{ email: inviteeEmail },
110+
{ skip: !useGetUserByEmailQuery || !inviteeEmail || !EMAIL_REGEXP.test(inviteeEmail) }
111+
) ?? { data: null };
114112

115113
const { data: providerRolesData } = useGetUserOrgRolesQuery({
116114
orgId: currentOrgId,

0 commit comments

Comments
 (0)