@rozoai/intent-pay 0.0.16-beta.2 → 0.0.16-beta.20
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/components/Common/PoweredByFooter/index.d.ts +1 -1
- package/build/constants/rozoConfig.d.ts +43 -0
- package/build/hooks/useDaimoPay.d.ts +7 -2
- package/build/hooks/usePaymentState.d.ts +4 -1
- package/build/hooks/useStellarDestination.d.ts +32 -0
- package/build/hooks/useStellarPaymentOptions.d.ts +2 -1
- package/build/package.json.js +2 -2
- package/build/payment/paymentFsm.d.ts +3 -0
- package/build/provider/StellarContextProvider.d.ts +2 -35
- package/build/src/components/Common/PoweredByFooter/index.js +14 -12
- package/build/src/components/Common/PoweredByFooter/index.js.map +1 -1
- package/build/src/components/DaimoPayButton/index.js +16 -5
- package/build/src/components/DaimoPayButton/index.js.map +1 -1
- package/build/src/components/DaimoPayModal/ConnectWithQRCode.js +1 -1
- package/build/src/components/DaimoPayModal/ConnectWithQRCode.js.map +1 -1
- package/build/src/components/Pages/Confirmation/index.js +10 -7
- package/build/src/components/Pages/Confirmation/index.js.map +1 -1
- package/build/src/components/Pages/PayWithToken/index.js +42 -39
- package/build/src/components/Pages/PayWithToken/index.js.map +1 -1
- package/build/src/components/Pages/Stellar/PayWithStellarToken/index.js +52 -20
- package/build/src/components/Pages/Stellar/PayWithStellarToken/index.js.map +1 -1
- package/build/src/constants/rozoConfig.js +49 -0
- package/build/src/constants/rozoConfig.js.map +1 -0
- package/build/src/hooks/useDaimoPay.js +31 -12
- package/build/src/hooks/useDaimoPay.js.map +1 -1
- package/build/src/hooks/usePaymentState.js +21 -23
- package/build/src/hooks/usePaymentState.js.map +1 -1
- package/build/src/hooks/useStellarDestination.js +61 -0
- package/build/src/hooks/useStellarDestination.js.map +1 -0
- package/build/src/hooks/useStellarPaymentOptions.js +4 -3
- package/build/src/hooks/useStellarPaymentOptions.js.map +1 -1
- package/build/src/hooks/useTokenOptions.js +11 -5
- package/build/src/hooks/useTokenOptions.js.map +1 -1
- package/build/src/payment/paymentEffects.js +58 -8
- package/build/src/payment/paymentEffects.js.map +1 -1
- package/build/src/payment/paymentFsm.js.map +1 -1
- package/build/src/provider/StellarContextProvider.js +25 -42
- package/build/src/provider/StellarContextProvider.js.map +1 -1
- package/build/src/utils/api/base.js +17 -15
- package/build/src/utils/api/base.js.map +1 -1
- package/build/src/utils/api/payment.js +10 -17
- package/build/src/utils/api/payment.js.map +1 -1
- package/build/src/utils/trpc.js +1 -1
- package/build/src/wallets/walletConfigs.js +3 -3
- package/build/src/wallets/walletConfigs.js.map +1 -1
- package/build/utils/api/base.d.ts +1 -1
- package/build/utils/api/payment.d.ts +28 -20
- package/package.json +10 -11
- package/src/index.ts +35 -0
- package/build/components/Pages/Solana/ConnectSolana/index.d.ts +0 -3
- package/build/src/assets/rozo-dark.js +0 -8
- package/build/src/assets/rozo-dark.js.map +0 -1
- package/build/src/components/Pages/Solana/ConnectSolana/index.js +0 -81
- package/build/src/components/Pages/Solana/ConnectSolana/index.js.map +0 -1
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { Asset } from "@stellar/stellar-sdk";
|
|
2
|
+
/**
|
|
3
|
+
* ROZO CONFIG
|
|
4
|
+
*/
|
|
5
|
+
export declare const ROZO_API_URL = "https://fxcvfolhncmuvfazuqub.supabase.co/functions/v1/";
|
|
6
|
+
export declare const ROZO_API_TOKEN = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImZ4Y3Zmb2xobmNtdXZmYXp1cXViIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NTI4Mzg2NjYsImV4cCI6MjA2ODQxNDY2Nn0.B4dV5y_-zCMKSNm3_qyCbAvCPJmoOGv_xB783LfAVUA";
|
|
7
|
+
export declare const ROZO_DAIMO_APP_ID = "pay-muggle-FnFUQEgr2XuVSSXNN5EKKn";
|
|
8
|
+
export declare const ROZO_STELLAR_ADDRESS = "GDQDR7RY2GJW7XBENWAX7F5X42HBTA2YREAD6SYGZLUNDGDQ3DRRYBPK";
|
|
9
|
+
export declare const ROZO_BASE_ADDRESS = "0x5772FBe7a7817ef7F586215CA8b23b8dD22C8897";
|
|
10
|
+
export declare const DEFAULT_STELLAR_RPC_URL = "https://horizon.stellar.org";
|
|
11
|
+
export declare const STELLAR_NATIVE_ASSET: Asset;
|
|
12
|
+
export declare const STELLAR_USDC_ASSET_CODE = "USDC";
|
|
13
|
+
export declare const STELLAR_USDC_ISSUER_PK = "GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVN";
|
|
14
|
+
export declare const STELLAR_XLM_TOKEN_INFO: {
|
|
15
|
+
chainId: number;
|
|
16
|
+
token: string;
|
|
17
|
+
name: string;
|
|
18
|
+
symbol: string;
|
|
19
|
+
decimals: number;
|
|
20
|
+
logoSourceURI: string;
|
|
21
|
+
logoURI: string;
|
|
22
|
+
usd: number;
|
|
23
|
+
priceFromUsd: number;
|
|
24
|
+
displayDecimals: number;
|
|
25
|
+
fiatSymbol: string;
|
|
26
|
+
maxAcceptUsd: number;
|
|
27
|
+
maxSendUsd: number;
|
|
28
|
+
};
|
|
29
|
+
export declare const STELLAR_USDC_TOKEN_INFO: {
|
|
30
|
+
chainId: number;
|
|
31
|
+
token: string;
|
|
32
|
+
name: string;
|
|
33
|
+
symbol: string;
|
|
34
|
+
decimals: number;
|
|
35
|
+
logoSourceURI: string;
|
|
36
|
+
logoURI: string;
|
|
37
|
+
usd: number;
|
|
38
|
+
priceFromUsd: number;
|
|
39
|
+
displayDecimals: number;
|
|
40
|
+
fiatSymbol: string;
|
|
41
|
+
maxAcceptUsd: number;
|
|
42
|
+
maxSendUsd: number;
|
|
43
|
+
};
|
|
@@ -75,7 +75,7 @@ type RozoPayFunctions = {
|
|
|
75
75
|
*
|
|
76
76
|
* @param txHash - The transaction hash to associate with the completed payment.
|
|
77
77
|
*/
|
|
78
|
-
setPaymentCompleted: (txHash: string) => Promise<Extract<PaymentState, {
|
|
78
|
+
setPaymentCompleted: (txHash: string, rozoPaymentId?: string) => Promise<Extract<PaymentState, {
|
|
79
79
|
type: "payment_completed";
|
|
80
80
|
}>>;
|
|
81
81
|
/**
|
|
@@ -89,6 +89,9 @@ type RozoPayFunctions = {
|
|
|
89
89
|
* @deprecated
|
|
90
90
|
*/
|
|
91
91
|
setChosenUsd: (usd: number) => void;
|
|
92
|
+
setRozoPaymentId: (id: string | null) => void;
|
|
93
|
+
setPaymentRozoCompleted: (completed: boolean) => void;
|
|
94
|
+
paymentRozoCompleted: boolean;
|
|
92
95
|
};
|
|
93
96
|
type RozoPayState = {
|
|
94
97
|
[S in PaymentState as S["type"]]: {
|
|
@@ -100,7 +103,9 @@ type RozoPayState = {
|
|
|
100
103
|
message: infer M;
|
|
101
104
|
} ? M : null;
|
|
102
105
|
};
|
|
103
|
-
}[PaymentState["type"]]
|
|
106
|
+
}[PaymentState["type"]] & {
|
|
107
|
+
rozoPaymentId: string | null;
|
|
108
|
+
};
|
|
104
109
|
export type UseRozoPay = RozoPayFunctions & RozoPayState;
|
|
105
110
|
/**
|
|
106
111
|
* React hook for interacting with Rozo Pay orders and payments. Use this hook
|
|
@@ -61,7 +61,8 @@ export interface PaymentState {
|
|
|
61
61
|
}>;
|
|
62
62
|
payWithStellarToken: (inputToken: RozoPayTokenAmount, rozoPayment: {
|
|
63
63
|
destAddress: string;
|
|
64
|
-
|
|
64
|
+
usdcAmount: string;
|
|
65
|
+
stellarAmount: string;
|
|
65
66
|
}) => Promise<{
|
|
66
67
|
txHash: string;
|
|
67
68
|
success: boolean;
|
|
@@ -70,6 +71,8 @@ export interface PaymentState {
|
|
|
70
71
|
senderEnsName: string | undefined;
|
|
71
72
|
setTxHash: (txHash: string) => void;
|
|
72
73
|
txHash: string | undefined;
|
|
74
|
+
setRozoPaymentId: (paymentId: string) => void;
|
|
75
|
+
rozoPaymentId: string | undefined;
|
|
73
76
|
}
|
|
74
77
|
export declare function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl, }: {
|
|
75
78
|
trpc: TrpcClient;
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { PayParams } from "../payment/paymentFsm";
|
|
2
|
+
/**
|
|
3
|
+
* Return type for the useStellarDestination hook
|
|
4
|
+
*/
|
|
5
|
+
interface StellarDestinationResult {
|
|
6
|
+
/** The middleware address to use for the transaction */
|
|
7
|
+
readonly destinationAddress: string | undefined;
|
|
8
|
+
/** Whether this is a Stellar payment (Pay In Stellar scenarios) */
|
|
9
|
+
readonly isStellarPayment: boolean;
|
|
10
|
+
/** Pay In Stellar, Pay out Stellar scenario */
|
|
11
|
+
readonly isPayInStellarOutStellar: boolean;
|
|
12
|
+
/** Pay In Stellar, Pay Out Base scenario */
|
|
13
|
+
readonly isPayInStellarOutBase: boolean;
|
|
14
|
+
/** Whether toStellarAddress is provided and not empty */
|
|
15
|
+
readonly hasToStellarAddress: boolean;
|
|
16
|
+
/** Whether the payout destination is Base USDC */
|
|
17
|
+
readonly isPayOutToBase: boolean;
|
|
18
|
+
/** Pay In Base, Pay Out Stellar scenario */
|
|
19
|
+
readonly isPayInBaseOutStellar: boolean;
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* Hook to determine the correct destination address for Stellar transactions.
|
|
23
|
+
*
|
|
24
|
+
* Handles Pay In Stellar scenarios:
|
|
25
|
+
* 1. Pay In Stellar, Pay out Stellar - use toStellarAddress
|
|
26
|
+
* 2. Pay In Stellar, Pay Out Base - use ROZO_STELLAR_ADDRESS (when toChain is Base and toStellarAddress is empty)
|
|
27
|
+
*
|
|
28
|
+
* @param payParams - Payment parameters containing transaction details
|
|
29
|
+
* @returns Object with destination address and payment scenario flags
|
|
30
|
+
*/
|
|
31
|
+
export declare function useStellarDestination(payParams?: PayParams): StellarDestinationResult;
|
|
32
|
+
export {};
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { WalletPaymentOption } from "@rozoai/intent-common";
|
|
2
2
|
/** Wallet payment options. User picks one. */
|
|
3
|
-
export declare function useStellarPaymentOptions({ address, usdRequired, }: {
|
|
3
|
+
export declare function useStellarPaymentOptions({ address, usdRequired, isDepositFlow, }: {
|
|
4
4
|
address: string | undefined;
|
|
5
5
|
usdRequired: number | undefined;
|
|
6
|
+
isDepositFlow: boolean;
|
|
6
7
|
}): {
|
|
7
8
|
options: WalletPaymentOption[] | null;
|
|
8
9
|
isLoading: boolean;
|
package/build/package.json.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
var name = "@rozoai/intent-pay";
|
|
2
|
-
var version = "0.0.16-beta.
|
|
2
|
+
var version = "0.0.16-beta.20";
|
|
3
3
|
var author = "RozoAI";
|
|
4
4
|
var homepage = "https://github.com/RozoAI/intent-pay";
|
|
5
5
|
var license = "BSD-2-Clause";
|
|
@@ -52,7 +52,7 @@ var dependencies = {
|
|
|
52
52
|
"@solana/wallet-adapter-react": "^0.15.35",
|
|
53
53
|
"@solana/web3.js": "^1.95.4",
|
|
54
54
|
"@stellar/stellar-sdk": "^13.3.0",
|
|
55
|
-
"@rozoai/intent-common": "0.0.16-beta.
|
|
55
|
+
"@rozoai/intent-common": "0.0.16-beta.19",
|
|
56
56
|
"@trpc/client": "^11.0.0-next-beta.318",
|
|
57
57
|
"@trpc/server": "^11.0.0-next-beta.318",
|
|
58
58
|
buffer: "^6.0.3",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type ISupportedWallet, StellarWalletsKit } from '@creit.tech/stellar-wallets-kit';
|
|
2
|
-
import { Horizon
|
|
2
|
+
import { Horizon } from '@stellar/stellar-sdk';
|
|
3
3
|
type StellarContextProviderValue = {
|
|
4
4
|
kit: StellarWalletsKit | undefined;
|
|
5
5
|
server: Horizon.Server | undefined;
|
|
@@ -10,42 +10,9 @@ type StellarContextProviderValue = {
|
|
|
10
10
|
connector: ISupportedWallet | undefined;
|
|
11
11
|
setConnector: (connector: ISupportedWallet) => void;
|
|
12
12
|
disconnect: () => void;
|
|
13
|
+
convertXlmToUsdc: (amount: string) => Promise<string>;
|
|
13
14
|
};
|
|
14
15
|
export type StellarWalletName = ISupportedWallet;
|
|
15
|
-
export declare const DEFAULT_STELLAR_RPC_URL = "https://horizon.stellar.org";
|
|
16
|
-
export declare const STELLAR_NATIVE_ASSET: Asset;
|
|
17
|
-
export declare const STELLAR_USDC_ASSET_CODE = "USDC";
|
|
18
|
-
export declare const STELLAR_USDC_ISSUER_PK = "GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVN";
|
|
19
|
-
export declare const STELLAR_XLM_TOKEN_INFO: {
|
|
20
|
-
chainId: number;
|
|
21
|
-
token: string;
|
|
22
|
-
name: string;
|
|
23
|
-
symbol: string;
|
|
24
|
-
decimals: number;
|
|
25
|
-
logoSourceURI: string;
|
|
26
|
-
logoURI: string;
|
|
27
|
-
usd: number;
|
|
28
|
-
priceFromUsd: number;
|
|
29
|
-
displayDecimals: number;
|
|
30
|
-
fiatSymbol: string;
|
|
31
|
-
maxAcceptUsd: number;
|
|
32
|
-
maxSendUsd: number;
|
|
33
|
-
};
|
|
34
|
-
export declare const STELLAR_USDC_TOKEN_INFO: {
|
|
35
|
-
chainId: number;
|
|
36
|
-
token: string;
|
|
37
|
-
name: string;
|
|
38
|
-
symbol: string;
|
|
39
|
-
decimals: number;
|
|
40
|
-
logoSourceURI: string;
|
|
41
|
-
logoURI: string;
|
|
42
|
-
usd: number;
|
|
43
|
-
priceFromUsd: number;
|
|
44
|
-
displayDecimals: number;
|
|
45
|
-
fiatSymbol: string;
|
|
46
|
-
maxAcceptUsd: number;
|
|
47
|
-
maxSendUsd: number;
|
|
48
|
-
};
|
|
49
16
|
export declare const StellarContext: import("react").Context<StellarContextProviderValue>;
|
|
50
17
|
export declare const StellarContextProvider: ({ children, stellarRpcUrl, }: StellarContextProvider) => import("react/jsx-runtime").JSX.Element;
|
|
51
18
|
export declare const useStellar: () => StellarContextProviderValue;
|
|
@@ -8,29 +8,31 @@ import { usePayContext } from '../../../hooks/usePayContext.js';
|
|
|
8
8
|
import RozoTextLogo from '../../../assets/rozo-text.js';
|
|
9
9
|
import { useRozoPay } from '../../../hooks/useDaimoPay.js';
|
|
10
10
|
|
|
11
|
-
const PoweredByFooter = ({ preFilledMessage, showSupport = true } = {}) => {
|
|
11
|
+
const PoweredByFooter = ({ preFilledMessage, showSupport = true, } = {}) => {
|
|
12
12
|
const context = usePayContext();
|
|
13
13
|
const pay = useRozoPay();
|
|
14
|
-
console.log(pay);
|
|
15
14
|
const handleContactClick = (event) => {
|
|
16
15
|
event.preventDefault();
|
|
17
|
-
if (typeof window.Intercom ===
|
|
16
|
+
if (typeof window.Intercom === "function") {
|
|
18
17
|
context.setOpen(false);
|
|
19
|
-
window.Intercom(
|
|
20
|
-
|
|
21
|
-
|
|
18
|
+
window.Intercom("showNewMessage", [
|
|
19
|
+
"Hi, I need help with my payment.",
|
|
20
|
+
"",
|
|
22
21
|
`Version: ${rozoPayVersion}`,
|
|
23
22
|
`Order ID: ${pay.order?.id?.toString()}`,
|
|
24
|
-
preFilledMessage
|
|
25
|
-
]
|
|
23
|
+
preFilledMessage,
|
|
24
|
+
]
|
|
25
|
+
.filter(Boolean)
|
|
26
|
+
.join("\n"));
|
|
26
27
|
}
|
|
27
28
|
else {
|
|
28
|
-
window.open(globalThis.__SUPPORTURL__ ||
|
|
29
|
+
window.open(globalThis.__SUPPORTURL__ ||
|
|
30
|
+
`https://pay.rozo.ai?ref=sdk-v${rozoPayVersion}`);
|
|
29
31
|
}
|
|
30
32
|
};
|
|
31
33
|
return (jsxs(Fragment, { children: [jsx(IntercomInitializer, {}), jsxs(Container, { children: [jsxs(TextButton, { onClick: () => {
|
|
32
|
-
window.open(
|
|
33
|
-
}, children: [jsx("span", { children: "Powered by" }), jsx(RozoTextLogo, { height: 16, style: { position:
|
|
34
|
+
window.open("http://rozo.ai/", "_blank");
|
|
35
|
+
}, children: [jsx("span", { children: "Powered by" }), jsx(RozoTextLogo, { height: 16, style: { position: "relative", top: 2 } })] }), showSupport && (jsx(TextButton, { onClick: handleContactClick, children: "Get help" }))] })] }));
|
|
34
36
|
};
|
|
35
37
|
const Container = styled(motion.div) `
|
|
36
38
|
text-align: center;
|
|
@@ -63,7 +65,7 @@ const TextButton = styled(motion.button) `
|
|
|
63
65
|
font-weight: 500;
|
|
64
66
|
|
|
65
67
|
svg {
|
|
66
|
-
|
|
68
|
+
fill: var(--ck-body-color-muted);
|
|
67
69
|
}
|
|
68
70
|
|
|
69
71
|
transition: color 200ms ease, transform 100ms ease;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../../../src/components/Common/PoweredByFooter/index.tsx"],"sourcesContent":[null],"names":["_jsxs","_Fragment","_jsx"],"mappings":";;;;;;;;;;AASA,MAAM,eAAe,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../../../src/components/Common/PoweredByFooter/index.tsx"],"sourcesContent":[null],"names":["_jsxs","_Fragment","_jsx"],"mappings":";;;;;;;;;;AASA,MAAM,eAAe,GAAG,CAAC,EACvB,gBAAgB,EAChB,WAAW,GAAG,IAAI,GAAA,GACsC,EAAE,KAAI;AAC9D,IAAA,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;AAChC,IAAA,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;AAEzB,IAAA,MAAM,kBAAkB,GAAG,CAAC,KAA0C,KAAI;QACxE,KAAK,CAAC,cAAc,EAAE,CAAC;AAEvB,QAAA,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,UAAU,EAAE;AACzC,YAAA,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AACvB,YAAA,MAAM,CAAC,QAAQ,CACb,gBAAgB,EAChB;gBACE,kCAAkC;gBAClC,EAAE;AACF,gBAAA,CAAA,SAAA,EAAY,cAAc,CAAE,CAAA;gBAC5B,CAAa,UAAA,EAAA,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAE,CAAA;gBACxC,gBAAgB;AACjB,aAAA;iBACE,MAAM,CAAC,OAAO,CAAC;AACf,iBAAA,IAAI,CAAC,IAAI,CAAC,CACd,CAAC;SACH;aAAM;AACL,YAAA,MAAM,CAAC,IAAI,CACT,UAAU,CAAC,cAAc;gBACvB,CAAgC,6BAAA,EAAA,cAAc,CAAE,CAAA,CACnD,CAAC;SACH;AACH,KAAC,CAAC;AAEF,IAAA,QACEA,IAAA,CAAAC,QAAA,EAAA,EAAA,QAAA,EAAA,CACEC,GAAC,CAAA,mBAAmB,KAAG,EACvBF,IAAA,CAAC,SAAS,EAAA,EAAA,QAAA,EAAA,CACRA,KAAC,UAAU,EAAA,EACT,OAAO,EAAE,MAAK;AACZ,4BAAA,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;AAC3C,yBAAC,aAEDE,GAAuB,CAAA,MAAA,EAAA,EAAA,QAAA,EAAA,YAAA,EAAA,CAAA,EACvBA,GAAC,CAAA,YAAY,IAAC,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,EAAE,GAAI,CAC1D,EAAA,CAAA,EACZ,WAAW,KACVA,GAAC,CAAA,UAAU,EAAC,EAAA,OAAO,EAAE,kBAAkB,EAAA,QAAA,EAAA,UAAA,EAAA,CAAuB,CAC/D,CACS,EAAA,CAAA,CAAA,EAAA,CACX,EACH;AACJ,EAAE;AAEF,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA,CAAA;;;;;;;;CAQnC,CAAC;AAEF,MAAM,MAAM,GAAG,SAAS,CAAA,CAAA;;;CAGvB,CAAC;AAEF,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAwCvB,MAAM,CAAA;;CAEtB,CAAC;AAEgB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA,CAAA;;;;;;;"}
|
|
@@ -44,7 +44,7 @@ function RozoPayButtonCustom(props) {
|
|
|
44
44
|
: null;
|
|
45
45
|
let payId = "payId" in props ? props.payId : null;
|
|
46
46
|
const { paymentState, log } = context;
|
|
47
|
-
const { order, paymentState: payState } = useRozoPay();
|
|
47
|
+
const { order, paymentState: payState, rozoPaymentId, paymentRozoCompleted, } = useRozoPay();
|
|
48
48
|
// Set the payId or payParams
|
|
49
49
|
useEffect(() => {
|
|
50
50
|
if (payId != null) {
|
|
@@ -93,6 +93,11 @@ function RozoPayButtonCustom(props) {
|
|
|
93
93
|
context.showPayment(modalOptions);
|
|
94
94
|
}, [connectedWalletOnly, closeOnSuccess, resetOnSuccess, context]);
|
|
95
95
|
const hide = useCallback(() => context.setOpen(false), [context]);
|
|
96
|
+
// Reset the sent flags when order changes to allow events to be fired again
|
|
97
|
+
useEffect(() => {
|
|
98
|
+
sentStart.current = false;
|
|
99
|
+
sentComplete.current = false;
|
|
100
|
+
}, [order?.id]);
|
|
96
101
|
// Emit onPaymentStart handler when payment state changes to payment_started
|
|
97
102
|
const sentStart = useRef(false);
|
|
98
103
|
useEffect(() => {
|
|
@@ -120,9 +125,14 @@ function RozoPayButtonCustom(props) {
|
|
|
120
125
|
// changes to payment_completed or payment_bounced
|
|
121
126
|
const sentComplete = useRef(false);
|
|
122
127
|
useEffect(() => {
|
|
128
|
+
console.log({ paymentRozoCompleted, order, rozoPaymentId });
|
|
123
129
|
if (sentComplete.current)
|
|
124
130
|
return;
|
|
125
|
-
if (
|
|
131
|
+
if (!paymentRozoCompleted) {
|
|
132
|
+
if (payState !== "payment_completed" && payState !== "payment_bounced")
|
|
133
|
+
return;
|
|
134
|
+
}
|
|
135
|
+
if (!order)
|
|
126
136
|
return;
|
|
127
137
|
sentComplete.current = true;
|
|
128
138
|
const eventType = payState === "payment_completed"
|
|
@@ -132,17 +142,18 @@ function RozoPayButtonCustom(props) {
|
|
|
132
142
|
type: eventType,
|
|
133
143
|
paymentId: writeRozoPayOrderID(order.id),
|
|
134
144
|
chainId: getOrderDestChainId(order),
|
|
135
|
-
txHash: assertNotNull(order
|
|
145
|
+
txHash: assertNotNull(order?.destFastFinishTxHash ?? order?.destClaimTxHash, `[PAY BUTTON] dest tx hash null on order ${order.id} when intent status is ${order.intentStatus}`),
|
|
136
146
|
payment: getRozoPayOrderView(order),
|
|
147
|
+
rozoPaymentId: rozoPaymentId ?? order.externalId,
|
|
137
148
|
};
|
|
138
|
-
if (payState === "payment_completed") {
|
|
149
|
+
if (payState === "payment_completed" || paymentRozoCompleted) {
|
|
139
150
|
onPaymentCompleted?.(event);
|
|
140
151
|
}
|
|
141
152
|
else if (payState === "payment_bounced") {
|
|
142
153
|
onPaymentBounced?.(event);
|
|
143
154
|
}
|
|
144
155
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
145
|
-
}, [order, payState]);
|
|
156
|
+
}, [order, payState, paymentRozoCompleted]);
|
|
146
157
|
// Open the modal by default if the defaultOpen prop is true
|
|
147
158
|
const hasAutoOpened = useRef(false);
|
|
148
159
|
useEffect(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../../src/components/DaimoPayButton/index.tsx"],"sourcesContent":[null],"names":["_jsx"],"mappings":";;;;;;;;;;;AAoJA;;;AAGG;AACG,SAAU,aAAa,CAAC,KAAyB,EAAA;IACrD,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;AAC3C,IAAA,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;AAEhC,IAAA,QACEA,GAAC,CAAA,mBAAmB,OAAK,KAAK,EAAA,QAAA,EAC3B,CAAC,EAAE,IAAI,EAAE,MACRA,GAAA,CAAC,cAAc,EACF,EAAA,WAAA,EAAA,KAAK,IAAI,OAAO,CAAC,KAAK,EAAA,UAAA,EACvB,IAAI,IAAI,OAAO,CAAC,IAAI,EAAA,cAAA,EAChB,WAAW,IAAI,OAAO,CAAC,WAAW,EAAA,QAAA,EAEhDA,IAAC,cAAc,EAAA,EAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,GAAG,SAAS,GAAG,IAAI,EAAA,QAAA,EACxDA,IAAC,YAAY,EAAA,EACX,KAAK,EAAE,KAAK,IAAI,OAAO,CAAC,KAAK,EAC7B,IAAI,EAAE,IAAI,IAAI,OAAO,CAAC,IAAI,EAC1B,WAAW,EAAE,WAAW,IAAI,OAAO,CAAC,WAAW,YAE/CA,GAAC,CAAA,kBAAkB,KAAG,EACT,CAAA,EAAA,CACA,GACF,CAClB,EAAA,CACmB,EACtB;AACJ,CAAC;AAED;AACA,SAAS,mBAAmB,CAAC,KAA+B,EAAA;AAC1D,IAAA,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;;;AAIhC,IAAA,IAAI,SAAS,GACX,OAAO,IAAI,KAAK;AACd,UAAE;
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../../src/components/DaimoPayButton/index.tsx"],"sourcesContent":[null],"names":["_jsx"],"mappings":"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"}
|
|
@@ -38,7 +38,7 @@ const ConnectWithQRCode = () => {
|
|
|
38
38
|
const payId = pay.order ? writeRozoPayOrderID(pay.order.id) : "";
|
|
39
39
|
const isDesktopLinkToMobileWallets = wallet?.id === WALLET_ID_MOBILE_WALLETS;
|
|
40
40
|
const mode = isDesktopLinkToMobileWallets ? "browser" : "wallet";
|
|
41
|
-
const url = `https://
|
|
41
|
+
const url = `https://invoice.rozo.ai/checkout?id=${payId}&mode=${mode}`;
|
|
42
42
|
return (jsxs(PageContent, { children: [jsxs(ModalContent, { style: { paddingBottom: 8, gap: 14 }, children: [jsx(CustomQRCode, { value: url, image: jsx("div", { style: {
|
|
43
43
|
width: "100%",
|
|
44
44
|
height: "100%",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectWithQRCode.js","sources":["../../../../src/components/DaimoPayModal/ConnectWithQRCode.tsx"],"sourcesContent":[null],"names":["_jsxs","_Fragment","_jsx"],"mappings":";;;;;;;;;;;;;;;AAkBA;;;;;;;;AAQG;AACG,MAAA,iBAAiB,GAAiB,MAAK;AAC3C,IAAA,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;AAChC,IAAA,MAAM,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC;IACvC,MAAM,MAAM,GAAG,SAAS,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC;AACnD,IAAA,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;IAEzB,MAAM,OAAO,GAAG,UAAU,CAAC;QACzB,aAAa,EAAE,MAAM,EAAE,IAAI;AAC5B,KAAA,CAAC,CAAC;AAEH,IAAA,IAAI,CAAC,MAAM;QAAE,OAAOA,IAAA,CAAAC,QAAA,EAAA,EAAA,QAAA,EAAA,CAAA,mBAAA,EAAoB,kBAAkB,CAAA,EAAA,CAAI,CAAC;AAE/D,IAAA,MAAM,SAAS,GAAG,MAAM,EAAE,YAAY,CAAC;AACvC,IAAA,MAAM,OAAO,GAAG,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;IACjE,MAAM,qBAAqB,GAAG,KAAK,CAAC;IACpC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,GAAG,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;AAEjE,IAAA,MAAM,4BAA4B,GAAG,MAAM,EAAE,EAAE,KAAK,wBAAwB,CAAC;IAC7E,MAAM,IAAI,GAAG,4BAA4B,GAAG,SAAS,GAAG,QAAQ,CAAC;AACjE,IAAA,MAAM,GAAG,GAAG,CAAA,
|
|
1
|
+
{"version":3,"file":"ConnectWithQRCode.js","sources":["../../../../src/components/DaimoPayModal/ConnectWithQRCode.tsx"],"sourcesContent":[null],"names":["_jsxs","_Fragment","_jsx"],"mappings":"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"}
|
|
@@ -10,18 +10,18 @@ import styled from '../../../styles/styled/index.js';
|
|
|
10
10
|
import PoweredByFooter from '../../Common/PoweredByFooter/index.js';
|
|
11
11
|
|
|
12
12
|
const Confirmation = () => {
|
|
13
|
-
const { confirmationMessage, onSuccess, debugMode, paymentState: paymentStateContext } = usePayContext();
|
|
14
|
-
const { order, paymentState, setPaymentCompleted } = useRozoPay();
|
|
13
|
+
const { confirmationMessage, onSuccess, debugMode, paymentState: paymentStateContext, } = usePayContext();
|
|
14
|
+
const { order, paymentState, setPaymentCompleted, setPaymentRozoCompleted } = useRozoPay();
|
|
15
15
|
const [isConfirming, setIsConfirming] = useState(true);
|
|
16
16
|
const { done, txURL } = useMemo(() => {
|
|
17
|
-
const { tokenMode, txHash } = paymentStateContext;
|
|
18
|
-
if (tokenMode ===
|
|
17
|
+
const { tokenMode, txHash, rozoPaymentId } = paymentStateContext;
|
|
18
|
+
if (tokenMode === "stellar" && txHash) {
|
|
19
19
|
// Add delay before setting payment completed to show confirming state
|
|
20
20
|
if (isConfirming) {
|
|
21
21
|
setTimeout(() => {
|
|
22
|
-
setPaymentCompleted(txHash);
|
|
22
|
+
setPaymentCompleted(txHash, rozoPaymentId);
|
|
23
23
|
setIsConfirming(false);
|
|
24
|
-
},
|
|
24
|
+
}, 1000);
|
|
25
25
|
return { done: false, txURL: undefined };
|
|
26
26
|
}
|
|
27
27
|
const txURL = getChainExplorerTxUrl(stellar.chainId, txHash);
|
|
@@ -41,9 +41,12 @@ const Confirmation = () => {
|
|
|
41
41
|
}, [paymentState, order, paymentStateContext, isConfirming]);
|
|
42
42
|
useEffect(() => {
|
|
43
43
|
if (done) {
|
|
44
|
+
if (paymentStateContext.tokenMode === "stellar") {
|
|
45
|
+
setPaymentRozoCompleted(true);
|
|
46
|
+
}
|
|
44
47
|
onSuccess();
|
|
45
48
|
}
|
|
46
|
-
}, [done, onSuccess]);
|
|
49
|
+
}, [done, onSuccess, paymentStateContext]);
|
|
47
50
|
useEffect(() => {
|
|
48
51
|
if (debugMode) {
|
|
49
52
|
console.log(`[ORDER] Order: `, order);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../../../src/components/Pages/Confirmation/index.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs","_Fragment"],"mappings":";;;;;;;;;;;AAuBM,MAAA,YAAY,GAAa,MAAK;AAClC,IAAA,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../../../src/components/Pages/Confirmation/index.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs","_Fragment"],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ import { getChainExplorerTxUrl } from '@rozoai/intent-common';
|
|
|
3
3
|
import { useState, useEffect } from 'react';
|
|
4
4
|
import { useChainId, useSwitchChain } from 'wagmi';
|
|
5
5
|
import { ROUTES } from '../../../constants/routes.js';
|
|
6
|
-
import { useRozoPay } from '../../../hooks/useDaimoPay.js';
|
|
7
6
|
import { usePayContext } from '../../../hooks/usePayContext.js';
|
|
8
7
|
import Button from '../../Common/Button/index.js';
|
|
9
8
|
import { PageContent, ModalContent, ModalH1, Link } from '../../Common/Modal/styles.js';
|
|
@@ -13,6 +12,7 @@ import TokenLogoSpinner from '../../Spinners/TokenLogoSpinner/index.js';
|
|
|
13
12
|
var PayState;
|
|
14
13
|
(function (PayState) {
|
|
15
14
|
PayState["RequestingPayment"] = "Waiting For Payment";
|
|
15
|
+
PayState["CreatingPayment"] = "Creating Payment Record...";
|
|
16
16
|
PayState["SwitchingChain"] = "Switching Chain";
|
|
17
17
|
PayState["RequestCancelled"] = "Payment Cancelled";
|
|
18
18
|
PayState["RequestSuccessful"] = "Payment Successful";
|
|
@@ -21,7 +21,6 @@ var PayState;
|
|
|
21
21
|
const PayWithToken = () => {
|
|
22
22
|
const { triggerResize, paymentState, setRoute, log, trpc } = usePayContext();
|
|
23
23
|
const { payWithToken, selectedTokenOption } = paymentState;
|
|
24
|
-
useRozoPay();
|
|
25
24
|
const [payState, setPayStateInner] = useState(PayState.RequestingPayment);
|
|
26
25
|
const setPayState = (state) => {
|
|
27
26
|
if (state === payState)
|
|
@@ -64,49 +63,53 @@ const PayWithToken = () => {
|
|
|
64
63
|
setPayState(PayState.RequestCancelled);
|
|
65
64
|
return;
|
|
66
65
|
}
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
66
|
+
else {
|
|
67
|
+
try {
|
|
68
|
+
setPayState(PayState.RequestingPayment);
|
|
69
|
+
const result = await payWithToken(option);
|
|
70
|
+
setTxURL(getChainExplorerTxUrl(option.required.token.chainId, result.txHash));
|
|
71
|
+
if (result.success) {
|
|
72
|
+
setPayState(PayState.RequestSuccessful);
|
|
73
|
+
setTimeout(() => {
|
|
74
|
+
setRoute(ROUTES.CONFIRMATION, { event: "wait-pay-with-token" });
|
|
75
|
+
}, 200);
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
setPayState(PayState.RequestFailed);
|
|
79
|
+
}
|
|
79
80
|
}
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
81
|
+
catch (e) {
|
|
82
|
+
if (e?.name === "ConnectorChainMismatchError") {
|
|
83
|
+
// Workaround for Rainbow wallet bug -- user is able to switch chain without
|
|
84
|
+
// the wallet updating the chain ID for wagmi.
|
|
85
|
+
log("Chain mismatch detected, attempting to switch and retry");
|
|
86
|
+
const switchSuccessful = await trySwitchingChain(option, true);
|
|
87
|
+
if (switchSuccessful) {
|
|
88
|
+
try {
|
|
89
|
+
const retryResult = await payWithToken(option);
|
|
90
|
+
setTxURL(getChainExplorerTxUrl(option.required.token.chainId, retryResult.txHash));
|
|
91
|
+
if (retryResult.success) {
|
|
92
|
+
setPayState(PayState.RequestSuccessful);
|
|
93
|
+
setTimeout(() => {
|
|
94
|
+
setRoute(ROUTES.CONFIRMATION, {
|
|
95
|
+
event: "wait-pay-with-token",
|
|
96
|
+
});
|
|
97
|
+
}, 200);
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
setPayState(PayState.RequestFailed);
|
|
101
|
+
}
|
|
102
|
+
return; // Payment handled after switching chain
|
|
96
103
|
}
|
|
97
|
-
|
|
98
|
-
|
|
104
|
+
catch (retryError) {
|
|
105
|
+
console.error("Failed to pay with token after switching chain", retryError);
|
|
106
|
+
throw retryError;
|
|
99
107
|
}
|
|
100
|
-
return; // Payment handled after switching chain
|
|
101
|
-
}
|
|
102
|
-
catch (retryError) {
|
|
103
|
-
console.error("Failed to pay with token after switching chain", retryError);
|
|
104
|
-
throw retryError;
|
|
105
108
|
}
|
|
106
109
|
}
|
|
110
|
+
setPayState(PayState.RequestCancelled);
|
|
111
|
+
console.error("Failed to pay with token", e);
|
|
107
112
|
}
|
|
108
|
-
setPayState(PayState.RequestCancelled);
|
|
109
|
-
console.error("Failed to pay with token", e);
|
|
110
113
|
}
|
|
111
114
|
};
|
|
112
115
|
useEffect(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../../../src/components/Pages/PayWithToken/index.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs"],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../../../src/components/Pages/PayWithToken/index.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs"],"mappings":"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"}
|