Skip to content

Commit d45d974

Browse files
author
Giannis Chatziveroglou
committed
fix on client side remaning accounts
1 parent 56ac21b commit d45d974

1 file changed

Lines changed: 12 additions & 11 deletions

File tree

src/programs/tokenManager/utils.ts

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ export const withRemainingAccountsForInvalidate = async (
131131
metadata: Metadata | null
132132
): Promise<AccountMeta[]> => {
133133
const remainingAccounts: AccountMeta[] = [];
134+
console.log(tokenManagerData.parsed.state);
134135
if (tokenManagerData.parsed.state === TokenManagerState.Claimed) {
135136
if (
136137
tokenManagerData.parsed.kind === TokenManagerKind.Edition &&
@@ -147,17 +148,7 @@ export const withRemainingAccountsForInvalidate = async (
147148
);
148149
}
149150
}
150-
if (tokenManagerData.parsed.invalidationType === InvalidationType.Return) {
151-
const returnAccounts = await withRemainingAccountsForReturn(
152-
transaction,
153-
connection,
154-
wallet,
155-
tokenManagerData,
156-
recipientTokenAccountOwnerId,
157-
metadata?.programmableConfig?.ruleSet ?? undefined
158-
);
159-
remainingAccounts.push(...returnAccounts);
160-
} else if (
151+
if (
161152
tokenManagerData.parsed.invalidationType === InvalidationType.Release &&
162153
tokenManagerData.parsed.kind === TokenManagerKind.Programmable
163154
) {
@@ -170,6 +161,16 @@ export const withRemainingAccountsForInvalidate = async (
170161
metadata?.programmableConfig?.ruleSet
171162
);
172163
remainingAccounts.push(...releaseAccounts);
164+
} else {
165+
const returnAccounts = await withRemainingAccountsForReturn(
166+
transaction,
167+
connection,
168+
wallet,
169+
tokenManagerData,
170+
recipientTokenAccountOwnerId,
171+
metadata?.programmableConfig?.ruleSet ?? undefined
172+
);
173+
remainingAccounts.push(...returnAccounts);
173174
}
174175

175176
return remainingAccounts;

0 commit comments

Comments
 (0)