Skip to content

[TOOL-3689] Dashboard: Keep switch in disabled state if field value is empty in Sponsorship rules form #6535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 25, 2025
Merged

[TOOL-3689] Dashboard: Keep switch in disabled state if field value is empty in Sponsorship rules form #6535

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 29 additions & 22 deletions apps/dashboard/src/components/smart-wallets/SponsorshipPolicies/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,24 +112,31 @@ export function AccountAbstractionSettingsPage(

const policy = props.bundlerService;

const transformedQueryData = useMemo(
() => ({
const transformedQueryData = useMemo(() => {
const allowedContractAddresses = policy.allowedContractAddresses?.filter(
(x) => x !== "",
);

const allowedWallets = policy.allowedWallets?.filter((x) => x !== "");
const blockedWallets = policy.blockedWallets?.filter((x) => x !== "");

// there is a bug in API server that makes `allowedChainIds` an array with `0` if we set it to null
const allowedChainIds = policy.allowedChainIds?.filter((x) => x !== 0);

return {
allowedChainIds:
policy.allowedChainIds && policy.allowedChainIds?.length > 0
? policy.allowedChainIds
: null,
allowedChainIds && allowedChainIds?.length > 0 ? allowedChainIds : null,
allowedContractAddresses:
policy.allowedContractAddresses &&
policy.allowedContractAddresses?.length > 0
? joinWithComma(policy.allowedContractAddresses)
allowedContractAddresses && allowedContractAddresses.length > 0
? joinWithComma(allowedContractAddresses)
: null,
allowedWallets:
policy.allowedWallets && policy.allowedWallets?.length > 0
? joinWithComma(policy.allowedWallets)
allowedWallets && allowedWallets?.length > 0
? joinWithComma(allowedWallets)
: null,
blockedWallets:
policy.blockedWallets && policy.blockedWallets?.length > 0
? joinWithComma(policy.blockedWallets)
blockedWallets && blockedWallets?.length > 0
? joinWithComma(blockedWallets)
: null,
bypassWallets:
policy.bypassWallets && policy.bypassWallets?.length > 0
Expand All @@ -148,14 +155,13 @@ export function AccountAbstractionSettingsPage(
},
globalLimit: policy.limits?.global ?? null,
allowedOrBlockedWallets:
policy.allowedWallets && policy.allowedWallets?.length > 0
allowedWallets && allowedWallets?.length > 0
? "allowed"
: policy.blockedWallets && policy.blockedWallets?.length > 0
: blockedWallets && blockedWallets?.length > 0
? "blocked"
: null,
}),
[policy],
);
};
}, [policy]);

const form = useForm<z.infer<typeof aaSettingsFormSchema>>({
resolver: zodResolver(aaSettingsFormSchema),
Expand Down Expand Up @@ -212,11 +218,12 @@ export function AccountAbstractionSettingsPage(

const parsedValues: Omit<ProjectBundlerService, "name" | "actions"> =
{
allowedContractAddresses:
values.allowedContractAddresses !== null
? toArrFromList(values.allowedContractAddresses)
: null,
allowedChainIds: values.allowedChainIds,
allowedContractAddresses: values.allowedContractAddresses
? toArrFromList(values.allowedContractAddresses)
: null,

// don't set null - `updateProject` API adds chainId 0 to the list if its null and makes it `[0]`
allowedChainIds: values.allowedChainIds || [],
allowedWallets:
values.allowedOrBlockedWallets === "allowed" &&
values.allowedWallets !== null
Expand Down
Loading