@rozoai/intent-pay 0.1.1-alpha.3 → 0.1.1-alpha.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/package.json.js +1 -1
- package/build/src/components/Pages/SelectToken/index.js +28 -10
- package/build/src/components/Pages/SelectToken/index.js.map +1 -1
- package/build/src/components/Pages/Solana/ConnectorSolana/index.js +7 -3
- package/build/src/components/Pages/Solana/ConnectorSolana/index.js.map +1 -1
- package/build/src/hooks/useSolanaPaymentOptions.js +26 -0
- package/build/src/hooks/useSolanaPaymentOptions.js.map +1 -1
- package/package.json +1 -1
package/build/package.json.js
CHANGED
|
@@ -23,14 +23,16 @@ function SelectToken() {
|
|
|
23
23
|
const { tokenMode, connectedWalletOnly } = paymentState;
|
|
24
24
|
const { isConnected: isEvmConnected } = useAccount();
|
|
25
25
|
const { isConnected: isStellarConnected, connector } = useStellar();
|
|
26
|
-
const { connected: isSolConnected } = useWallet();
|
|
27
|
-
|
|
26
|
+
const { connected: isSolConnected, publicKey: solPublicKey } = useWallet();
|
|
27
|
+
// For Solana, only consider truly connected when we have publicKey
|
|
28
|
+
const isSolanaReady = useMemo(() => isSolConnected && solPublicKey != null, [isSolConnected, solPublicKey]);
|
|
29
|
+
const isConnected = useMemo(() => isEvmConnected || isSolanaReady || isStellarConnected, [isEvmConnected, isSolanaReady, isStellarConnected]);
|
|
28
30
|
// Detect if multiple networks are connected (e.g., Phantom connecting both EVM and Solana)
|
|
29
31
|
const connectedNetworksCount = useMemo(() => {
|
|
30
32
|
return ((isEvmConnected ? 1 : 0) +
|
|
31
|
-
(
|
|
33
|
+
(isSolanaReady ? 1 : 0) +
|
|
32
34
|
(isStellarConnected ? 1 : 0));
|
|
33
|
-
}, [isEvmConnected,
|
|
35
|
+
}, [isEvmConnected, isSolanaReady, isStellarConnected]);
|
|
34
36
|
// If multiple networks are connected, override tokenMode to "all" to show all available tokens
|
|
35
37
|
const effectiveTokenMode = useMemo(() => {
|
|
36
38
|
return connectedNetworksCount > 1 ? "all" : tokenMode;
|
|
@@ -42,28 +44,44 @@ function SelectToken() {
|
|
|
42
44
|
return false;
|
|
43
45
|
// Check if there's a connected wallet that matches the payment options
|
|
44
46
|
const hasMatchingConnectedWallet = (effectiveTokenMode === "evm" && isEvmConnected) ||
|
|
45
|
-
(effectiveTokenMode === "solana" &&
|
|
47
|
+
(effectiveTokenMode === "solana" && isSolanaReady) ||
|
|
46
48
|
(effectiveTokenMode === "stellar" && isStellarConnected && connector) ||
|
|
47
49
|
(effectiveTokenMode === "all" &&
|
|
48
|
-
(isEvmConnected ||
|
|
50
|
+
(isEvmConnected || isSolanaReady || isStellarConnected));
|
|
49
51
|
return !hasMatchingConnectedWallet;
|
|
50
52
|
}, [
|
|
51
53
|
isEvmConnected,
|
|
52
|
-
|
|
54
|
+
isSolanaReady,
|
|
53
55
|
isStellarConnected,
|
|
54
56
|
connectedWalletOnly,
|
|
55
57
|
effectiveTokenMode,
|
|
56
58
|
connector,
|
|
57
59
|
]);
|
|
60
|
+
// Check if we're waiting for Solana publicKey to become available
|
|
61
|
+
const waitingForSolanaKey = useMemo(() => {
|
|
62
|
+
return ((effectiveTokenMode === "solana" || effectiveTokenMode === "all") &&
|
|
63
|
+
isSolConnected &&
|
|
64
|
+
!solPublicKey);
|
|
65
|
+
}, [effectiveTokenMode, isSolConnected, solPublicKey]);
|
|
58
66
|
// Prevent showing "Insufficient balance" too quickly to avoid flickering
|
|
59
67
|
const showInsufficientBalance = useMemo(() => {
|
|
60
|
-
return !isLoading && isConnected && optionsList.length === 0;
|
|
61
|
-
}, [isLoading, isConnected, optionsList.length]);
|
|
62
|
-
return (jsxs(PageContent, { children: [jsx(OrderHeader, { minified: !connectedWalletOnly, show: effectiveTokenMode, excludeLogos: ["stellar"] }), jsx(OptionsList, { requiredSkeletons: 3, isLoading: isLoading, options: optionsList, scrollHeight: isAnotherMethodButtonVisible && isMobileFormat ? 225 : 300, orDivider: isAnotherMethodButtonVisible, hideBottomLine: !isAnotherMethodButtonVisible }), showInsufficientBalance && !noConnectedWallet && (jsx(InsufficientBalance, { onRefresh: refreshOptions })), !isLoading && !isConnected && effectiveTokenMode === "all" && (jsx(ConnectButton, {})), isAnotherMethodButtonVisible && jsx(SelectAnotherMethodButton, {}), noConnectedWallet && jsx(NoConnectedWallet, {})] }));
|
|
68
|
+
return !isLoading && isConnected && optionsList.length === 0 && !waitingForSolanaKey;
|
|
69
|
+
}, [isLoading, isConnected, optionsList.length, waitingForSolanaKey]);
|
|
70
|
+
return (jsxs(PageContent, { children: [jsx(OrderHeader, { minified: !connectedWalletOnly, show: effectiveTokenMode, excludeLogos: ["stellar"] }), jsx(OptionsList, { requiredSkeletons: 3, isLoading: isLoading || waitingForSolanaKey, options: optionsList, scrollHeight: isAnotherMethodButtonVisible && isMobileFormat ? 225 : 300, orDivider: isAnotherMethodButtonVisible, hideBottomLine: !isAnotherMethodButtonVisible }), waitingForSolanaKey && (jsx(WaitingForWallet, { message: "Connecting to Solana wallet..." })), showInsufficientBalance && !noConnectedWallet && (jsx(InsufficientBalance, { onRefresh: refreshOptions })), !isLoading && !isConnected && effectiveTokenMode === "all" && (jsx(ConnectButton, {})), isAnotherMethodButtonVisible && jsx(SelectAnotherMethodButton, {}), noConnectedWallet && jsx(NoConnectedWallet, {})] }));
|
|
63
71
|
}
|
|
64
72
|
function NoConnectedWallet() {
|
|
65
73
|
return (jsxs(ModalContent, { children: [jsx(ModalH1, { children: "No connected wallet." }), jsx(SelectAnotherMethodButton, {})] }));
|
|
66
74
|
}
|
|
75
|
+
function WaitingForWallet({ message }) {
|
|
76
|
+
return (jsx(ModalContent, { style: {
|
|
77
|
+
display: "flex",
|
|
78
|
+
flexDirection: "column",
|
|
79
|
+
alignItems: "center",
|
|
80
|
+
justifyContent: "center",
|
|
81
|
+
paddingTop: 8,
|
|
82
|
+
paddingBottom: 8,
|
|
83
|
+
}, children: jsx(ModalH1, { style: { fontSize: "14px", fontWeight: 500 }, children: message }) }));
|
|
84
|
+
}
|
|
67
85
|
function InsufficientBalance({ onRefresh, }) {
|
|
68
86
|
const [isRefreshing, setIsRefreshing] = useState(false);
|
|
69
87
|
const handleRefresh = async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../../../src/components/Pages/SelectToken/index.tsx"],"sourcesContent":[null],"names":["_jsxs","_jsx"],"mappings":";;;;;;;;;;;;;;;;;;AAiBc,SAAU,WAAW,GAAA;AACjC,IAAA,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,EAAE,CAAC;IACnC,MAAM,cAAc,GAClB,QAAQ,IAAI,MAAM,EAAE,UAAU,GAAG,YAAY,CAAC,WAAW,CAAC;AAE5D,IAAA,MAAM,EAAE,YAAY,EAAE,GAAG,aAAa,EAAE,CAAC;AACzC,IAAA,MAAM,EAAE,SAAS,EAAE,mBAAmB,EAAE,GAAG,YAAY,CAAC;IAExD,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,UAAU,EAAE,CAAC;IACrD,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAE,SAAS,EAAE,GAAG,UAAU,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../../../src/components/Pages/SelectToken/index.tsx"],"sourcesContent":[null],"names":["_jsxs","_jsx"],"mappings":";;;;;;;;;;;;;;;;;;AAiBc,SAAU,WAAW,GAAA;AACjC,IAAA,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,EAAE,CAAC;IACnC,MAAM,cAAc,GAClB,QAAQ,IAAI,MAAM,EAAE,UAAU,GAAG,YAAY,CAAC,WAAW,CAAC;AAE5D,IAAA,MAAM,EAAE,YAAY,EAAE,GAAG,aAAa,EAAE,CAAC;AACzC,IAAA,MAAM,EAAE,SAAS,EAAE,mBAAmB,EAAE,GAAG,YAAY,CAAC;IAExD,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,UAAU,EAAE,CAAC;IACrD,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAE,SAAS,EAAE,GAAG,UAAU,EAAE,CAAC;AACpE,IAAA,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,SAAS,EAAE,CAAC;;AAG3E,IAAA,MAAM,aAAa,GAAG,OAAO,CAC3B,MAAM,cAAc,IAAI,YAAY,IAAI,IAAI,EAC5C,CAAC,cAAc,EAAE,YAAY,CAAC,CAC/B,CAAC;IAEF,MAAM,WAAW,GAAG,OAAO,CACzB,MAAM,cAAc,IAAI,aAAa,IAAI,kBAAkB,EAC3D,CAAC,cAAc,EAAE,aAAa,EAAE,kBAAkB,CAAC,CACpD,CAAC;;AAGF,IAAA,MAAM,sBAAsB,GAAG,OAAO,CAAC,MAAK;QAC1C,QACE,CAAC,cAAc,GAAG,CAAC,GAAG,CAAC;aACtB,aAAa,GAAG,CAAC,GAAG,CAAC,CAAC;aACtB,kBAAkB,GAAG,CAAC,GAAG,CAAC,CAAC,EAC5B;KACH,EAAE,CAAC,cAAc,EAAE,aAAa,EAAE,kBAAkB,CAAC,CAAC,CAAC;;AAGxD,IAAA,MAAM,kBAAkB,GAAG,OAAO,CAAC,MAAK;QACtC,OAAO,sBAAsB,GAAG,CAAC,GAAG,KAAK,GAAG,SAAS,CAAC;AACxD,KAAC,EAAE,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC,CAAC;AAExC,IAAA,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,GAC9C,eAAe,CAAC,kBAAkB,CAAC,CAAC;AAEtC,IAAA,MAAM,4BAA4B,GAAG,OAAO,CAC1C,MAAM,CAAC,mBAAmB,EAC1B,CAAC,mBAAmB,CAAC,CACtB,CAAC;AAEF,IAAA,MAAM,iBAAiB,GAAG,OAAO,CAAC,MAAK;AACrC,QAAA,IAAI,CAAC,mBAAmB;AAAE,YAAA,OAAO,KAAK,CAAC;;QAGvC,MAAM,0BAA0B,GAC9B,CAAC,kBAAkB,KAAK,KAAK,IAAI,cAAc;AAC/C,aAAC,kBAAkB,KAAK,QAAQ,IAAI,aAAa,CAAC;AAClD,aAAC,kBAAkB,KAAK,SAAS,IAAI,kBAAkB,IAAI,SAAS,CAAC;aACpE,kBAAkB,KAAK,KAAK;AAC3B,iBAAC,cAAc,IAAI,aAAa,IAAI,kBAAkB,CAAC,CAAC,CAAC;QAE7D,OAAO,CAAC,0BAA0B,CAAC;AACrC,KAAC,EAAE;QACD,cAAc;QACd,aAAa;QACb,kBAAkB;QAClB,mBAAmB;QACnB,kBAAkB;QAClB,SAAS;AACV,KAAA,CAAC,CAAC;;AAGH,IAAA,MAAM,mBAAmB,GAAG,OAAO,CAAC,MAAK;QACvC,QACE,CAAC,kBAAkB,KAAK,QAAQ,IAAI,kBAAkB,KAAK,KAAK;YAChE,cAAc;YACd,CAAC,YAAY,EACb;KACH,EAAE,CAAC,kBAAkB,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC;;AAGvD,IAAA,MAAM,uBAAuB,GAAG,OAAO,CAAC,MAAK;AAC3C,QAAA,OAAO,CAAC,SAAS,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC;AACvF,KAAC,EAAE,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAEtE,QACEA,IAAC,CAAA,WAAW,EACV,EAAA,QAAA,EAAA,CAAAC,GAAA,CAAC,WAAW,EAAA,EACV,QAAQ,EAAE,CAAC,mBAAmB,EAC9B,IAAI,EAAE,kBAAkB,EACxB,YAAY,EAAE,CAAC,SAAS,CAAC,EACzB,CAAA,EACFA,GAAC,CAAA,WAAW,EACV,EAAA,iBAAiB,EAAE,CAAC,EACpB,SAAS,EAAE,SAAS,IAAI,mBAAmB,EAC3C,OAAO,EAAE,WAAW,EACpB,YAAY,EACV,4BAA4B,IAAI,cAAc,GAAG,GAAG,GAAG,GAAG,EAE5D,SAAS,EAAE,4BAA4B,EACvC,cAAc,EAAE,CAAC,4BAA4B,EAAA,CAC7C,EACD,mBAAmB,KAClBA,GAAC,CAAA,gBAAgB,EAAC,EAAA,OAAO,EAAC,gCAAgC,EAAG,CAAA,CAC9D,EACA,uBAAuB,IAAI,CAAC,iBAAiB,KAC5CA,GAAA,CAAC,mBAAmB,EAAA,EAAC,SAAS,EAAE,cAAc,EAAA,CAAI,CACnD,EACA,CAAC,SAAS,IAAI,CAAC,WAAW,IAAI,kBAAkB,KAAK,KAAK,KACzDA,GAAC,CAAA,aAAa,EAAG,EAAA,CAAA,CAClB,EACA,4BAA4B,IAAIA,GAAA,CAAC,yBAAyB,EAAA,EAAA,CAAG,EAC7D,iBAAiB,IAAIA,GAAA,CAAC,iBAAiB,EAAA,EAAA,CAAG,CAC/B,EAAA,CAAA,EACd;AACJ,CAAC;AAED,SAAS,iBAAiB,GAAA;AACxB,IAAA,QACED,IAAA,CAAC,YAAY,EAAA,EAAA,QAAA,EAAA,CACXC,GAAC,CAAA,OAAO,EAA+B,EAAA,QAAA,EAAA,sBAAA,EAAA,CAAA,EACvCA,GAAC,CAAA,yBAAyB,EAAG,EAAA,CAAA,CAAA,EAAA,CAChB,EACf;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,EAAE,OAAO,EAAuB,EAAA;AACxD,IAAA,QACEA,GAAA,CAAC,YAAY,EAAA,EACX,KAAK,EAAE;AACL,YAAA,OAAO,EAAE,MAAM;AACf,YAAA,aAAa,EAAE,QAAQ;AACvB,YAAA,UAAU,EAAE,QAAQ;AACpB,YAAA,cAAc,EAAE,QAAQ;AACxB,YAAA,UAAU,EAAE,CAAC;AACb,YAAA,aAAa,EAAE,CAAC;AACjB,SAAA,EAAA,QAAA,EAEDA,IAAC,OAAO,EAAA,EAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,EAAA,QAAA,EAAG,OAAO,EAAW,CAAA,EAAA,CAC7D,EACf;AACJ,CAAC;AAED,SAAS,mBAAmB,CAAC,EAC3B,SAAS,GAGV,EAAA;IACC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;AAExD,IAAA,MAAM,aAAa,GAAG,YAAW;QAC/B,eAAe,CAAC,IAAI,CAAC,CAAC;AACtB,QAAA,IAAI;YACF,MAAM,SAAS,EAAE,CAAC;SACnB;QAAC,OAAO,KAAK,EAAE;AACd,YAAA,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC;SACrD;gBAAS;YACR,eAAe,CAAC,KAAK,CAAC,CAAC;SACxB;AACH,KAAC,CAAC;AAEF,IAAA,QACED,IAAA,CAAC,YAAY,EAAA,EACX,KAAK,EAAE;AACL,YAAA,OAAO,EAAE,MAAM;AACf,YAAA,aAAa,EAAE,QAAQ;AACvB,YAAA,UAAU,EAAE,QAAQ;AACpB,YAAA,cAAc,EAAE,QAAQ;AACxB,YAAA,UAAU,EAAE,EAAE;AACd,YAAA,aAAa,EAAE,EAAE;AACjB,YAAA,GAAG,EAAE,EAAE;SACR,EAED,QAAA,EAAA,CAAAC,GAAA,CAAC,OAAO,EAAgC,EAAA,QAAA,EAAA,uBAAA,EAAA,CAAA,EACxCA,IAAC,MAAM,EAAA,EACL,OAAO,EAAC,WAAW,EACnB,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,YAAY,EACrB,IAAI,EAAEA,GAAC,CAAA,SAAS,KAAG,EACnB,YAAY,EAAC,MAAM,EAAA,QAAA,EAElB,YAAY,GAAG,eAAe,GAAG,iBAAiB,EAC5C,CAAA,EACTA,IAAC,yBAAyB,EAAA,EAAA,CAAG,CAChB,EAAA,CAAA,EACf;AACJ,CAAC;AAED,SAAS,aAAa,GAAA;AACpB,IAAA,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,CAAC;AACjC,IAAA,MAAM,aAAa,GAAG,SAAS,EAAE,CAAC;;IAElC,MAAM,eAAe,GAAG,aAAa,CAAC,OAAO,CAAC,MAAM,CAClD,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,uBAAuB,CAClD,CAAC;AACF,IAAA,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC;IAEnD,MAAM,KAAK,GAAG,CAACA,GAAA,CAAC,QAAQ,EAAK,EAAA,EAAA,UAAU,CAAG,CAAC,CAAC;IAC5C,IAAI,eAAe,EAAE;QACnB,KAAK,CAAC,IAAI,CAACA,GAAA,CAAC,MAAM,EAAK,EAAA,EAAA,QAAQ,CAAG,CAAC,CAAC;KACrC;IAED,MAAM,OAAO,GAAG,MAAK;AACnB,QAAA,OAAO,CAAC;YACN,SAAS,EAAE,QAAQ,EAAE;AACtB,SAAA,CAAC,CAAC;QACH,IAAI,eAAe,EAAE;AACnB,YAAA,IAAI,aAAa,CAAC,MAAM,IAAI,IAAI,EAAE;AAChC,gBAAA,aAAa,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aAC7D;YACD,aAAa,CAAC,OAAO,EAAE,CAAC;SACzB;AACH,KAAC,CAAC;AAEF,IAAA,MAAM,aAAa,GAAG;AACpB,QAAA,EAAE,EAAE,gBAAgB;AACpB,QAAA,KAAK,EAAE,gBAAgB;QACvB,KAAK;QACL,OAAO;KACR,CAAC;IAEF,OAAOA,GAAA,CAAC,WAAW,EAAC,EAAA,OAAO,EAAE,CAAC,aAAa,CAAC,EAAA,CAAI,CAAC;AACnD;;;;"}
|
|
@@ -12,6 +12,7 @@ import SquircleSpinner from '../../../Spinners/SquircleSpinner/index.js';
|
|
|
12
12
|
const ConnectSolana = () => {
|
|
13
13
|
const solanaWallets = useWallet();
|
|
14
14
|
const isConnected = solanaWallets.connected;
|
|
15
|
+
const publicKey = solanaWallets.publicKey;
|
|
15
16
|
const { solanaConnector, setRoute, paymentState } = usePayContext();
|
|
16
17
|
const { setTokenMode } = paymentState;
|
|
17
18
|
const selectedWallet = solanaWallets.wallets.find((wallet) => wallet.adapter.name === solanaConnector);
|
|
@@ -38,19 +39,22 @@ const ConnectSolana = () => {
|
|
|
38
39
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
39
40
|
}, [solanaConnector]);
|
|
40
41
|
useEffect(() => {
|
|
41
|
-
|
|
42
|
+
// Wait for BOTH connected status AND publicKey to be available
|
|
43
|
+
if (!isConnected || !publicKey)
|
|
42
44
|
return;
|
|
43
45
|
// Wait so user can see it's connected
|
|
44
46
|
const meta = {
|
|
45
47
|
event: "wait-solana-connected",
|
|
46
48
|
walletName: solanaWallets.wallet?.adapter.name,
|
|
49
|
+
publicKey: publicKey.toBase58(),
|
|
47
50
|
};
|
|
51
|
+
// Increased timeout to ensure publicKey has fully propagated through context
|
|
48
52
|
setTimeout(() => {
|
|
49
53
|
setTokenMode("solana");
|
|
50
54
|
setRoute(ROUTES.SELECT_TOKEN, meta);
|
|
51
|
-
},
|
|
55
|
+
}, 800);
|
|
52
56
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
53
|
-
}, [isConnected]);
|
|
57
|
+
}, [isConnected, publicKey]);
|
|
54
58
|
if (!solanaConnector)
|
|
55
59
|
return null;
|
|
56
60
|
return (jsxs(PageContent, { children: [jsx(LoadingContainer, { children: jsx(AnimationContainer, { children: jsx(AnimatePresence, { children: jsx(SquircleSpinner, { logo: jsx("div", { style: { borderRadius: "22.5%", overflow: "hidden" }, children: getWalletIcon() }), loading: true }) }) }) }), jsx(ModalContent, { style: { paddingBottom: 0 }, children: isConnected ? (jsx(ModalH1, { children: "Connected" })) : (jsxs(Fragment, { children: [jsx(ModalH1, { children: "Requesting Connection" }), jsxs(ModalBody, { children: ["Open ", selectedWallet?.adapter.name, " to continue."] })] })) })] }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../../../../src/components/Pages/Solana/ConnectorSolana/index.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs"],"mappings":";;;;;;;;;;;AAiBM,MAAA,aAAa,GAAa,MAAK;AACnC,IAAA,MAAM,aAAa,GAAG,SAAS,EAAE,CAAC;AAClC,IAAA,MAAM,WAAW,GAAG,aAAa,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../../../../src/components/Pages/Solana/ConnectorSolana/index.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs"],"mappings":"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"}
|
|
@@ -98,6 +98,32 @@ function useSolanaPaymentOptions({ trpc, address, usdRequired, isDepositFlow, pa
|
|
|
98
98
|
refreshOptions();
|
|
99
99
|
}
|
|
100
100
|
}, [address, usdRequired, stableAppId]);
|
|
101
|
+
// Polling mechanism: if we're waiting for address to become available
|
|
102
|
+
// This handles the race condition where the component mounts before publicKey is set
|
|
103
|
+
useEffect(() => {
|
|
104
|
+
if (address != null || usdRequired == null || stableAppId == null)
|
|
105
|
+
return;
|
|
106
|
+
// We have usdRequired and appId, but no address yet - poll for it
|
|
107
|
+
const pollInterval = setInterval(() => {
|
|
108
|
+
// The parent component will re-render when address becomes available
|
|
109
|
+
// This effect just ensures we keep showing loading state
|
|
110
|
+
if (address != null) {
|
|
111
|
+
clearInterval(pollInterval);
|
|
112
|
+
}
|
|
113
|
+
}, 100);
|
|
114
|
+
// Set a timeout to stop polling after 5 seconds
|
|
115
|
+
const timeout = setTimeout(() => {
|
|
116
|
+
clearInterval(pollInterval);
|
|
117
|
+
// If still no address after 5 seconds, clear loading state
|
|
118
|
+
if (address == null) {
|
|
119
|
+
setIsLoading(false);
|
|
120
|
+
}
|
|
121
|
+
}, 5000);
|
|
122
|
+
return () => {
|
|
123
|
+
clearInterval(pollInterval);
|
|
124
|
+
clearTimeout(timeout);
|
|
125
|
+
};
|
|
126
|
+
}, [address, usdRequired, stableAppId]);
|
|
101
127
|
return {
|
|
102
128
|
options: filteredOptions,
|
|
103
129
|
isLoading,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSolanaPaymentOptions.js","sources":["../../../src/hooks/useSolanaPaymentOptions.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"useSolanaPaymentOptions.js","sources":["../../../src/hooks/useSolanaPaymentOptions.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|