Skip to content

fix: clear old uri before creating a new one on connecting view #503

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
ignaciosantise merged 3 commits into from
Nov 14, 2025
Merged

fix: clear old uri before creating a new one on connecting view #503

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c60b5f
fix: clear old uri before creating a new one on connecting view
ignaciosantise Nov 14, 2025
78d3670
chore: moved lastRetry value to a ref
ignaciosantise Nov 14, 2025
5cb1e29
chore: improved logic
ignaciosantise Nov 14, 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
20 changes: 9 additions & 11 deletions packages/appkit/src/views/w3m-connecting-view/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useSnapshot } from 'valtio';
import { useEffect, useLayoutEffect, useState } from 'react';
import { useEffect, useLayoutEffect, useRef, useState } from 'react';
import { ErrorUtil, type Platform } from '@reown/appkit-common-react-native';
import {
WcController,
Expand All @@ -22,23 +22,23 @@ export function ConnectingView() {
const { connect } = useInternalAppKit();
const { installed } = useSnapshot(ApiController.state);
const { data } = RouterController.state;
const [lastRetry, setLastRetry] = useState(Date.now());
const lastRetryRef = useRef<number>(Date.now());
const isQr = !data?.wallet;
const isInstalled = !!installed?.find(wallet => wallet.id === data?.wallet?.id);

const [platform, setPlatform] = useState<Platform>();
const [platforms, setPlatforms] = useState<Platform[]>([]);

const onRetry = () => {
if (CoreHelperUtil.isAllowedRetry(lastRetry)) {
setLastRetry(Date.now());
if (CoreHelperUtil.isAllowedRetry(lastRetryRef.current)) {
lastRetryRef.current = Date.now();
initializeConnection(true);
} else {
SnackController.showError('Please wait a second before retrying');
}
};

const initializeConnection = async (retry = false, retryTimestamp?: number) => {
const initializeConnection = async (retry = false) => {
try {
const { wcPairingExpiry } = WcController.state;
const { data: routeData } = RouterController.state;
Expand Down Expand Up @@ -73,11 +73,9 @@ export function ConnectingView() {
}
});

const currentRetryTime = retryTimestamp ?? lastRetry;
if (isQr && CoreHelperUtil.isAllowedRetry(currentRetryTime)) {
const newRetryTime = Date.now();
setLastRetry(newRetryTime);
initializeConnection(true, newRetryTime);
if (isQr && CoreHelperUtil.isAllowedRetry(lastRetryRef.current)) {
lastRetryRef.current = Date.now();
initializeConnection(true);
}
}
};
Expand Down Expand Up @@ -107,7 +105,7 @@ export function ConnectingView() {
}, [data, isInstalled]);

useEffect(() => {
initializeConnection();
initializeConnection(true);
let _interval: NodeJS.Timeout;

// Check if the pairing expired every 10 seconds. If expired, it will create a new uri.
Expand Down
Loading