Skip to content

Commit dd54580

Browse files
authored
Fix style:fix then run style:fix (#1005)
1 parent d7f5a0c commit dd54580

File tree

5 files changed

+94
-6
lines changed

5 files changed

+94
-6
lines changed

examples/react-app/eslint.config.mjs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,19 @@ export default [
3636
],
3737
},
3838
},
39-
];
39+
].map(
40+
// FIXME: Without this hack, this error results:
41+
// ConfigError: Config (unnamed): Key "plugins": Cannot redefine plugin "typescript-sort-keys".
42+
(() => {
43+
let typescriptSortKeysPluginFound = false;
44+
return config => {
45+
if (config.plugins?.['typescript-sort-keys']) {
46+
if (typescriptSortKeysPluginFound === false) {
47+
delete config.plugins['typescript-sort-keys'];
48+
}
49+
typescriptSortKeysPluginFound = true;
50+
}
51+
return config;
52+
};
53+
})(),
54+
);

examples/react-app/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"swr": "^2.3.6"
2828
},
2929
"devDependencies": {
30+
"@solana/eslint-config-solana": "^5.0.0",
3031
"@solana/wallet-standard-features": "^1.3.0",
3132
"@types/react": "^19",
3233
"@types/react-dom": "^19",

packages/transaction-confirmation/src/__tests__/confirmation-strategy-signature-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ describe('createSignatureConfirmationPromiseFactory', () => {
114114
it('fatals when the signature status returned by the one-shot query is an error', async () => {
115115
expect.assertions(1);
116116
getSignatureStatusesMock.mockResolvedValue({
117-
value: [{ err: 'o no', confirmationStatus: 'finalized' }],
117+
value: [{ confirmationStatus: 'finalized', err: 'o no' }],
118118
});
119119
const signatureConfirmationPromise = getSignatureConfirmationPromise({
120120
abortSignal: new AbortController().signal,

packages/transaction-confirmation/src/confirmation-strategy-recent-signature.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,12 @@ export function createRecentSignatureConfirmationPromiseFactory<
111111
const signatureStatus = signatureStatusResults[0];
112112
if (signatureStatus?.err) {
113113
throw getSolanaErrorFromTransactionError(signatureStatus.err);
114-
}
115-
else if (
114+
} else if (
116115
signatureStatus?.confirmationStatus &&
117116
commitmentComparator(signatureStatus.confirmationStatus, commitment) >= 0
118117
) {
119118
return;
120-
}
121-
else {
119+
} else {
122120
await new Promise(() => {
123121
/* never resolve */
124122
});

pnpm-lock.yaml

Lines changed: 74 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)