Skip to content

fix: wrong stx chain id #37461

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 5 commits into from
Nov 4, 2025
+4 −2
Merged

fix: wrong stx chain id #37461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d197348
fix: wrong stx chain id #37194
klejeune Nov 3, 2025
703e905
chore: fix lint
klejeune Nov 3, 2025
d980314
chore: fix unit tests
klejeune Nov 3, 2025
cfdb0a9
Merge branch 'main' into fix/stx-wrong-chain-id
klejeune Nov 4, 2025
14d874c
Merge branch 'main' into fix/stx-wrong-chain-id
klejeune Nov 4, 2025
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
1 change: 1 addition & 0 deletions app/scripts/lib/smart-transaction/smart-transactions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,7 @@ class SmartTransactionHook {
status: SmartTransactionStatuses.PENDING,
creationTime: Date.now(),
uuid,
chainId: this.#chainId,
},
isDapp: this.#isDapp,
txId: this.#transactionMeta.id,
Expand Down
2 changes: 2 additions & 0 deletions test/jest/mock-store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,7 @@ export const createSwapsMockStore = () => {
'0x55ad39634ee10d417b6e190cfd3736098957e958879cffe78f1f00f4fd2654d6',
minedTx: 'success',
},
chainId: CHAIN_IDS.MAINNET,
},
{
uuid: 'uuid2',
Expand All @@ -689,6 +690,7 @@ export const createSwapsMockStore = () => {
'0x55ad39634ee10d417b6e190cfd3736098957e958879cffe78f1f00f4fd2654d6',
minedTx: 'success',
},
chainId: CHAIN_IDS.MAINNET,
},
],
},
Expand Down
3 changes: 1 addition & 2 deletions ui/pages/smart-transactions/smart-transaction-status-page/smart-transaction-status-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import {
IconColor,
} from '../../../helpers/constants/design-system';
import { useI18nContext } from '../../../hooks/useI18nContext';
import { getCurrentChainId } from '../../../../shared/modules/selectors/networks';
import { getFullTxData } from '../../../selectors';
import { BaseUrl } from '../../../../shared/constants/urls';
import { hideLoadingIndication } from '../../../store/actions';
Expand Down Expand Up @@ -296,7 +295,7 @@ export const SmartTransactionStatusPage = ({
smartTransaction?.status?.startsWith(SmartTransactionStatuses.CANCELLED),
);

const chainId: string = useSelector(getCurrentChainId);
const chainId: string | undefined = smartTransaction?.chainId;
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore: This same selector is used in the awaiting-swap component.
const fullTxData = useSelector((state) => getFullTxData(state, txId)) || {};
Expand Down
Loading