Skip to content
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.

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

[FRE-1503] add loading state in useAutoSetAddress #819

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/long-flowers-change.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@skip-go/widget": patch
---

add loading state in useAutoSetAddress
6 changes: 5 additions & 1 deletion packages/widget/src/hooks/useAutoSetAddress.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export const useAutoSetAddress = () => {
const requiredChainAddresses = route?.requiredChainAddresses;
const { data: chains } = useAtomValue(skipChainsAtom);
const sourceWallet = useAtomValue(walletsAtom);
const [isLoading, setIsLoading] = useState(true);

const [currentSourceWallets, setCurrentSourceWallets] = useState<typeof sourceWallet>();
const getAccount = useGetAccount();
Expand All @@ -45,6 +46,7 @@ export const useAutoSetAddress = () => {

const connectRequiredChains = useCallback(
async (openModal?: boolean) => {
setIsLoading(true);
const createWallets = {
[ChainType.Cosmos]: createCosmosWallets,
[ChainType.EVM]: createEvmWallets,
Expand Down Expand Up @@ -108,6 +110,8 @@ export const useAutoSetAddress = () => {
console.error(_error);
if (!openModal) return;
showSetAddressModal();
} finally {
setIsLoading(false);
}
});
},
Expand Down Expand Up @@ -146,5 +150,5 @@ export const useAutoSetAddress = () => {
sourceWallet.cosmos,
]);

return { connectRequiredChains };
return { connectRequiredChains, isLoading };
};
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ export const SwapExecutionButton: React.FC<SwapExecutionButtonProps> = ({
}}
/>
);
case SwapExecutionState.pendingGettingAddresses:
return <MainButton label="Getting addresses" loading />;

default:
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,15 @@ export enum SwapExecutionState {
confirmed,
validatingGasBalance,
approving,
pendingGettingAddresses,
}

export const SwapExecutionPage = () => {
const setCurrentPage = useSetAtom(currentPageAtom);
const { route, overallStatus, transactionDetailsArray, isValidatingGasBalance } =
useAtomValue(swapExecutionStateAtom);
const chainAddresses = useAtomValue(chainAddressesAtom);
const { connectRequiredChains } = useAutoSetAddress();
const { connectRequiredChains, isLoading } = useAutoSetAddress();
const [simpleRoute, setSimpleRoute] = useState(true);

const { mutate: submitExecuteRouteMutation } = useAtomValue(skipSubmitSwapExecutionAtom);
Expand Down Expand Up @@ -72,6 +73,7 @@ export const SwapExecutionPage = () => {
overallStatus,
isValidatingGasBalance,
signaturesRemaining,
isLoading,
});

useHandleTransactionFailed(statusData?.isSettled && !statusData?.isSuccess);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ type UseSwapExecutionStateParams = {
overallStatus: SimpleStatus;
isValidatingGasBalance?: { status: string };
signaturesRemaining: number;
isLoading: boolean;
};

export function useSwapExecutionState({
Expand All @@ -19,8 +20,10 @@ export function useSwapExecutionState({
overallStatus,
isValidatingGasBalance,
signaturesRemaining,
isLoading,
}: UseSwapExecutionStateParams): SwapExecutionState {
return useMemo(() => {
if (isLoading) return SwapExecutionState.pendingGettingAddresses;
if (!chainAddresses) return SwapExecutionState.destinationAddressUnset;
const requiredChainAddresses = route?.requiredChainAddresses;
if (!requiredChainAddresses) return SwapExecutionState.destinationAddressUnset;
Expand Down Expand Up @@ -64,6 +67,7 @@ export function useSwapExecutionState({

return SwapExecutionState.ready;
}, [
isLoading,
chainAddresses,
route?.requiredChainAddresses,
overallStatus,
Expand Down