Skip to content

feat: Changing pre-filled value for interact tab #950

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

Open
C0mberry wants to merge 3 commits into
base: master
Choose a base branch
from
Open

feat: Changing pre-filled value for interact tab #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
678f3ae
changin prefilled value for interact tab
C0mberry Apr 16, 2026
0d23b4f
chore: build info
C0mberry Apr 16, 2026
6221864
add tests
C0mberry Apr 16, 2026
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
104 changes: 70 additions & 34 deletions ...dl/interactive-idl/model/form-prefill/providers/__tests__/wallet-prefill-provider.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,7 @@ const INSTRUCTION_WITH_TWO_SIGNERS: InstructionData = {
name: 'testInstruction',
};

const EMPTY_INSTRUCTION: InstructionData = {
accounts: [],
args: [],
docs: [],
name: 'testInstruction',
};
const makeRef = (val?: string): { current: string | undefined } => ({ current: val });
Comment thread
C0mberry marked this conversation as resolved.

describe('createWalletPrefillDependency', () => {
it('should fill signer accounts with wallet address', () => {
Expand All @@ -83,9 +78,13 @@ describe('createWalletPrefillDependency', () => {
const { form, fieldNames } = result.current;

const walletPublicKey = PublicKey.default;
const dependency = createWalletPrefillDependency(INSTRUCTION_WITH_SIGNER_AND_NON_SIGNER, walletPublicKey, {
account: fieldNames.account,
});
const dependency = createWalletPrefillDependency(
INSTRUCTION_WITH_SIGNER_AND_NON_SIGNER,
{
account: fieldNames.account,
},
makeRef(),
);

const walletAddress = walletPublicKey.toBase58();
dependency.onValueChange(walletPublicKey, form);
Expand All @@ -103,9 +102,13 @@ describe('createWalletPrefillDependency', () => {
);
const { form, fieldNames } = result.current;

const dependency = createWalletPrefillDependency(INSTRUCTION_WITH_SIGNER, null, {
account: fieldNames.account,
});
const dependency = createWalletPrefillDependency(
INSTRUCTION_WITH_SIGNER,
{
account: fieldNames.account,
},
makeRef(),
);

const setValueSpy = vi.spyOn(form, 'setValue');
dependency.onValueChange(null, form);
Expand All @@ -123,26 +126,20 @@ describe('createWalletPrefillDependency', () => {
const { form, fieldNames } = result.current;

const walletPublicKey = PublicKey.default;
const dependency = createWalletPrefillDependency(INSTRUCTION_WITH_NESTED_SIGNER, walletPublicKey, {
account: fieldNames.account,
});
const dependency = createWalletPrefillDependency(
INSTRUCTION_WITH_NESTED_SIGNER,
{
account: fieldNames.account,
},
makeRef(),
);

const walletAddress = walletPublicKey.toBase58();
dependency.onValueChange(walletPublicKey, form);

expect(form.getValues('accounts.testInstruction.group.nestedSigner')).toBe(walletAddress);
});

it('should return correct dependency id and getValue', () => {
const walletPublicKey = PublicKey.default;
const dependency = createWalletPrefillDependency(EMPTY_INSTRUCTION, walletPublicKey, {
account: () => 'accounts.testInstruction.test' as any,
});

expect(dependency.id).toBe('wallet');
expect(dependency.getValue()).toBe(walletPublicKey);
});

it('should ignore non-PublicKey values in onValueChange', () => {
const { result } = renderHook(() =>
useInstructionForm({
Expand All @@ -152,9 +149,13 @@ describe('createWalletPrefillDependency', () => {
);
const { form, fieldNames } = result.current;

const dependency = createWalletPrefillDependency(INSTRUCTION_WITH_SIGNER, null, {
account: fieldNames.account,
});
const dependency = createWalletPrefillDependency(
INSTRUCTION_WITH_SIGNER,
{
account: fieldNames.account,
},
makeRef(),
);

const setValueSpy = vi.spyOn(form, 'setValue');
dependency.onValueChange('not-a-public-key', form);
Expand All @@ -176,15 +177,46 @@ describe('createWalletPrefillDependency', () => {
form.setValue('accounts.testInstruction.signer', PREFILLED_ADDRESS);

const walletPublicKey = PublicKey.default;
const dependency = createWalletPrefillDependency(INSTRUCTION_WITH_SIGNER, walletPublicKey, {
account: fieldNames.account,
});
const dependency = createWalletPrefillDependency(
INSTRUCTION_WITH_SIGNER,
{
account: fieldNames.account,
},
makeRef(),
);

dependency.onValueChange(walletPublicKey, form);

expect(form.getValues('accounts.testInstruction.signer')).toBe(PREFILLED_ADDRESS);
});

it('should overwrite a signer field that still contains the previous wallet address', () => {
const { result } = renderHook(() =>
useInstructionForm({
instruction: INSTRUCTION_WITH_SIGNER,
onSubmit: vi.fn(),
}),
);
const { form, fieldNames } = result.current;

const walletAAddress = Keypair.generate().publicKey.toBase58();
const walletB = Keypair.generate().publicKey;

form.setValue('accounts.testInstruction.signer', walletAAddress);
const ref = makeRef(walletAAddress);

const dependency = createWalletPrefillDependency(
INSTRUCTION_WITH_SIGNER,
{
account: fieldNames.account,
},
ref,
);
dependency.onValueChange(walletB, form);

expect(form.getValues('accounts.testInstruction.signer')).toBe(walletB.toBase58());
});

it('should fill only empty signer fields when some are already filled', () => {
const { result } = renderHook(() =>
useInstructionForm({
Expand All @@ -198,9 +230,13 @@ describe('createWalletPrefillDependency', () => {

const walletPublicKey = PublicKey.default;
const walletAddress = walletPublicKey.toBase58();
const dependency = createWalletPrefillDependency(INSTRUCTION_WITH_TWO_SIGNERS, walletPublicKey, {
account: fieldNames.account,
});
const dependency = createWalletPrefillDependency(
INSTRUCTION_WITH_TWO_SIGNERS,
{
account: fieldNames.account,
},
makeRef(),
);

dependency.onValueChange(walletPublicKey, form);

Expand Down
18 changes: 11 additions & 7 deletions app/features/idl/interactive-idl/model/form-prefill/providers/wallet-prefill-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { InstructionData } from '@entities/idl';
import { PublicKey } from '@solana/web3.js';
import type { MutableRefObject } from 'react';
import type { FieldPath, UseFormReturn } from 'react-hook-form';

import type { FormValue, InstructionFormData, InstructionFormFieldNames } from '../../use-instruction-form';
import { isPrefilledAccount, WALLET_ACCOUNT_PATTERNS } from '../const';
import type { ExternalDependency } from '../types';
import { traverseInstructionAccounts } from './traverse-accounts';

/**
Expand All @@ -13,9 +13,9 @@ import { traverseInstructionAccounts } from './traverse-accounts';
*/
export function createWalletPrefillDependency(
instruction: InstructionData,
publicKey: PublicKey | null,
fieldNames: Pick<InstructionFormFieldNames, 'account'>,
): ExternalDependency<PublicKey> {
lastPrefillAddressRef: MutableRefObject<string | undefined>,
): { onValueChange: (value: unknown, form: UseFormReturn<InstructionFormData>) => void } {
const signerPaths: FieldPath<InstructionFormData>[] = [];

traverseInstructionAccounts(instruction, (account, parentGroup) => {
Expand Down Expand Up @@ -43,22 +43,26 @@ export function createWalletPrefillDependency(
});

return {
getValue: () => publicKey,
id: 'wallet',
onValueChange: (value: unknown, form: UseFormReturn<InstructionFormData>) => {
if (!value || !(value instanceof PublicKey)) return;

const walletAddress = value.toBase58();
const lastPrefillAddress = lastPrefillAddressRef.current;

for (const path of signerPaths) {
const currentValue = form.getValues(path);
if (!currentValue || String(currentValue).trim() === '') {
const currentValue = String(form.getValues(path) ?? '').trim();
const isEmpty = currentValue === '';
const hasPreviousWallet = lastPrefillAddress !== undefined && currentValue === lastPrefillAddress;

if (isEmpty || hasPreviousWallet) {
form.setValue(path, walletAddress as unknown as FormValue, {
shouldDirty: false,
shouldValidate: false,
});
}
}

lastPrefillAddressRef.current = walletAddress;
},
};
}
11 changes: 9 additions & 2 deletions app/features/idl/interactive-idl/ui/InteractInstruction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { Button } from '@shared/ui/button';
import { Card } from '@shared/ui/card';
import { Tooltip, TooltipContent, TooltipTrigger } from '@shared/ui/tooltip';
import { useWallet } from '@solana/wallet-adapter-react';
import { useEffect, useRef } from 'react';
import { Loader, Send } from 'react-feather';
import { Control, Controller, FieldPath } from 'react-hook-form';

Expand Down Expand Up @@ -50,12 +51,18 @@ export function InteractInstruction({
const pdas = usePdas({ form, idl, instruction });
const getAutocompleteItems = createGetAutocompleteItems({ pdas, publicKey });

const walletPrefillDependency = createWalletPrefillDependency(instruction, publicKey, fieldNames);
const lastPrefillAddressRef = useRef<string | undefined>(undefined);
useEffect(() => {
createWalletPrefillDependency(instruction, fieldNames, lastPrefillAddressRef).onValueChange(publicKey, form);
// instruction and fieldNames are stable for the lifetime of this component instance
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [publicKey, form]);

const knownAccountsPrefillDependency = createKnownAccountsPrefillDependency(instruction, fieldNames);
const pdaPrefillDependency = createPdaPrefillDependency(idl, instruction, fieldNames);
useFormPrefill({
config: {
externalDependencies: [walletPrefillDependency, knownAccountsPrefillDependency, pdaPrefillDependency],
externalDependencies: [knownAccountsPrefillDependency, pdaPrefillDependency],
},
form,
});
Expand Down
2 changes: 1 addition & 1 deletion bench/BUILD.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
| Dynamic | `/address/[address]/idl` | 130 kB | 1.27 MB |
| Dynamic | `/address/[address]/instructions` | 10 kB | 1.13 MB |
| Dynamic | `/address/[address]/metadata` | 10 kB | 1.03 MB |
| Dynamic | `/address/[address]/nftoken-collection-nfts` | 10 kB | 1.10 MB |
| Dynamic | `/address/[address]/nftoken-collection-nfts` | 10 kB | 1.08 MB |
| Dynamic | `/address/[address]/program-multisig` | 10 kB | 1.08 MB |
| Dynamic | `/address/[address]/rewards` | 10 kB | 1.02 MB |
| Dynamic | `/address/[address]/security` | 10 kB | 1.08 MB |
Expand Down
Loading