@rozoai/intent-pay 0.0.16-beta.9 → 0.0.17
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/hooks/useDaimoPay.d.ts +7 -2
- package/build/hooks/usePaymentState.d.ts +2 -0
- package/build/package.json.js +2 -2
- 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 +4 -5
- package/build/src/components/Pages/PayWithToken/index.js.map +1 -1
- package/build/src/components/Pages/Stellar/PayWithStellarToken/index.js +16 -10
- package/build/src/components/Pages/Stellar/PayWithStellarToken/index.js.map +1 -1
- package/build/src/hooks/useDaimoPay.js +31 -12
- package/build/src/hooks/useDaimoPay.js.map +1 -1
- package/build/src/hooks/usePaymentState.js +3 -0
- package/build/src/hooks/usePaymentState.js.map +1 -1
- package/build/src/hooks/useStellarDestination.js +4 -3
- package/build/src/hooks/useStellarDestination.js.map +1 -1
- package/build/src/payment/paymentEffects.js +15 -11
- package/build/src/payment/paymentEffects.js.map +1 -1
- package/build/src/utils/api/payment.js +3 -3
- 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/payment.d.ts +11 -11
- 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
|
@@ -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
|
|
@@ -71,6 +71,8 @@ export interface PaymentState {
|
|
|
71
71
|
senderEnsName: string | undefined;
|
|
72
72
|
setTxHash: (txHash: string) => void;
|
|
73
73
|
txHash: string | undefined;
|
|
74
|
+
setRozoPaymentId: (paymentId: string) => void;
|
|
75
|
+
rozoPaymentId: string | undefined;
|
|
74
76
|
}
|
|
75
77
|
export declare function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl, }: {
|
|
76
78
|
trpc: TrpcClient;
|
package/build/package.json.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
var name = "@rozoai/intent-pay";
|
|
2
|
-
var version = "0.0.
|
|
2
|
+
var version = "0.0.17";
|
|
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.
|
|
55
|
+
"@rozoai/intent-common": "0.0.17",
|
|
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",
|
|
@@ -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';
|
|
@@ -21,10 +20,8 @@ var PayState;
|
|
|
21
20
|
})(PayState || (PayState = {}));
|
|
22
21
|
const PayWithToken = () => {
|
|
23
22
|
const { triggerResize, paymentState, setRoute, log, trpc } = usePayContext();
|
|
24
|
-
const { payWithToken, selectedTokenOption
|
|
25
|
-
useRozoPay();
|
|
23
|
+
const { payWithToken, selectedTokenOption } = paymentState;
|
|
26
24
|
const [payState, setPayStateInner] = useState(PayState.RequestingPayment);
|
|
27
|
-
useState();
|
|
28
25
|
const setPayState = (state) => {
|
|
29
26
|
if (state === payState)
|
|
30
27
|
return;
|
|
@@ -94,7 +91,9 @@ const PayWithToken = () => {
|
|
|
94
91
|
if (retryResult.success) {
|
|
95
92
|
setPayState(PayState.RequestSuccessful);
|
|
96
93
|
setTimeout(() => {
|
|
97
|
-
setRoute(ROUTES.CONFIRMATION, {
|
|
94
|
+
setRoute(ROUTES.CONFIRMATION, {
|
|
95
|
+
event: "wait-pay-with-token",
|
|
96
|
+
});
|
|
98
97
|
}, 200);
|
|
99
98
|
}
|
|
100
99
|
else {
|
|
@@ -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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"}
|
|
@@ -11,7 +11,7 @@ import Button from '../../../Common/Button/index.js';
|
|
|
11
11
|
import PaymentBreakdown from '../../../Common/PaymentBreakdown/index.js';
|
|
12
12
|
import TokenLogoSpinner from '../../../Spinners/TokenLogoSpinner/index.js';
|
|
13
13
|
import { roundTokenAmount } from '../../../../utils/format.js';
|
|
14
|
-
import {
|
|
14
|
+
import { createRozoPaymentRequest, createRozoPayment } from '../../../../utils/api/payment.js';
|
|
15
15
|
import { ROZO_STELLAR_ADDRESS, ROZO_DAIMO_APP_ID, STELLAR_USDC_ASSET_CODE, STELLAR_USDC_ISSUER_PK } from '../../../../constants/rozoConfig.js';
|
|
16
16
|
import { useStellar } from '../../../../provider/StellarContextProvider.js';
|
|
17
17
|
|
|
@@ -25,14 +25,14 @@ var PayState;
|
|
|
25
25
|
})(PayState || (PayState = {}));
|
|
26
26
|
const PayWithStellarToken = () => {
|
|
27
27
|
const { triggerResize, paymentState, setRoute } = usePayContext();
|
|
28
|
-
const { selectedStellarTokenOption, payWithStellarToken, setTxHash, payParams, } = paymentState;
|
|
29
|
-
const { order } = useRozoPay();
|
|
28
|
+
const { selectedStellarTokenOption, payWithStellarToken: payWithStellarTokenImpl, setTxHash, payParams, setRozoPaymentId, } = paymentState;
|
|
29
|
+
const { order, setPaymentRozoCompleted, hydrateOrder } = useRozoPay();
|
|
30
30
|
const [payState, setPayState] = useState(PayState.CreatingPayment);
|
|
31
31
|
const [txURL, setTxURL] = useState();
|
|
32
32
|
const [isLoading, setIsLoading] = useState(true);
|
|
33
33
|
const [activeRozoPayment, setActiveRozoPayment] = useState();
|
|
34
34
|
// Get the destination address and payment direction using our custom hook
|
|
35
|
-
const { destinationAddress, isPayInStellarOutBase
|
|
35
|
+
const { destinationAddress, isPayInStellarOutBase } = useStellarDestination(payParams);
|
|
36
36
|
const { convertXlmToUsdc } = useStellar();
|
|
37
37
|
// ROZO API CALL
|
|
38
38
|
const handleCreatePayment = async (payToken, destinationAddress) => {
|
|
@@ -42,7 +42,7 @@ const PayWithStellarToken = () => {
|
|
|
42
42
|
if (payToken.token.symbol === "XLM") {
|
|
43
43
|
amount = await convertXlmToUsdc(amount);
|
|
44
44
|
}
|
|
45
|
-
const paymentData =
|
|
45
|
+
const paymentData = createRozoPaymentRequest({
|
|
46
46
|
appId: payParams?.appId ?? ROZO_DAIMO_APP_ID,
|
|
47
47
|
display: {
|
|
48
48
|
intent: order?.metadata?.intent ?? "",
|
|
@@ -52,7 +52,9 @@ const PayWithStellarToken = () => {
|
|
|
52
52
|
preferredChain: String(stellar.chainId),
|
|
53
53
|
preferredToken: "USDC_XLM",
|
|
54
54
|
destination: {
|
|
55
|
-
destinationAddress: isPayInStellarOutBase
|
|
55
|
+
destinationAddress: isPayInStellarOutBase
|
|
56
|
+
? payParams?.toAddress
|
|
57
|
+
: destinationAddress,
|
|
56
58
|
chainId: isPayInStellarOutBase
|
|
57
59
|
? String(base.chainId)
|
|
58
60
|
: String(stellar.chainId),
|
|
@@ -71,7 +73,7 @@ const PayWithStellarToken = () => {
|
|
|
71
73
|
},
|
|
72
74
|
});
|
|
73
75
|
// API Call
|
|
74
|
-
const response = await
|
|
76
|
+
const response = await createRozoPayment(paymentData);
|
|
75
77
|
if (!response?.data?.id) {
|
|
76
78
|
throw new Error(response?.error?.message ?? "Payment creation failed");
|
|
77
79
|
}
|
|
@@ -85,24 +87,28 @@ const PayWithStellarToken = () => {
|
|
|
85
87
|
if (!destinationAddress) {
|
|
86
88
|
throw new Error("Stellar destination address is required");
|
|
87
89
|
}
|
|
90
|
+
await hydrateOrder();
|
|
88
91
|
let payment = activeRozoPayment;
|
|
89
92
|
if (!payment) {
|
|
90
93
|
// Use destinationAddress directly as it's now the middleware address
|
|
91
94
|
payment = await handleCreatePayment(option.required, destinationAddress);
|
|
92
95
|
}
|
|
96
|
+
setRozoPaymentId(payment.id);
|
|
93
97
|
setPayState(PayState.RequestingPayment);
|
|
94
|
-
const result = await
|
|
95
|
-
destAddress: isPayInStellarOutBase
|
|
98
|
+
const result = await payWithStellarTokenImpl(option.required, {
|
|
99
|
+
destAddress: isPayInStellarOutBase
|
|
100
|
+
? payment.destination.destinationAddress ?? ROZO_STELLAR_ADDRESS
|
|
101
|
+
: destinationAddress,
|
|
96
102
|
usdcAmount: payment.destination.amountUnits,
|
|
97
103
|
stellarAmount: roundTokenAmount(option.required.amount, option.required.token),
|
|
98
104
|
});
|
|
99
105
|
setTxURL(getChainExplorerTxUrl(stellar.chainId, result.txHash));
|
|
100
|
-
// const result = { success: false, txHash: "" }
|
|
101
106
|
if (result.success) {
|
|
102
107
|
setPayState(PayState.RequestSuccessful);
|
|
103
108
|
setTxHash(result.txHash);
|
|
104
109
|
setTimeout(() => {
|
|
105
110
|
setActiveRozoPayment(undefined);
|
|
111
|
+
setPaymentRozoCompleted(true);
|
|
106
112
|
setRoute(ROUTES.CONFIRMATION, { event: "wait-pay-with-stellar" });
|
|
107
113
|
}, 200);
|
|
108
114
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../../../../src/components/Pages/Stellar/PayWithStellarToken/index.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs"],"mappings":";;;;;;;;;;;;;;;;;AAsCA,IAAK,QAMJ,CAAA;AAND,CAAA,UAAK,QAAQ,EAAA;AACX,IAAA,QAAA,CAAA,iBAAA,CAAA,GAAA,4BAA8C,CAAA;AAC9C,IAAA,QAAA,CAAA,mBAAA,CAAA,GAAA,qBAAyC,CAAA;AACzC,IAAA,QAAA,CAAA,kBAAA,CAAA,GAAA,mBAAsC,CAAA;AACtC,IAAA,QAAA,CAAA,eAAA,CAAA,GAAA,gBAAgC,CAAA;AAChC,IAAA,QAAA,CAAA,mBAAA,CAAA,GAAA,oBAAwC,CAAA;AAC1C,CAAC,EANI,QAAQ,KAAR,QAAQ,GAMZ,EAAA,CAAA,CAAA,CAAA;AAEK,MAAA,mBAAmB,GAAa,MAAK;IACzC,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,aAAa,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../../../../src/components/Pages/Stellar/PayWithStellarToken/index.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs"],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { RozoPayOrderStatusSource } from '@rozoai/intent-common';
|
|
2
|
-
import { useContext, useSyncExternalStore, useMemo, useCallback } from 'react';
|
|
1
|
+
import { RozoPayOrderStatusSource, RozoPayIntentStatus } from '@rozoai/intent-common';
|
|
2
|
+
import { useState, useContext, useSyncExternalStore, useMemo, useCallback } from 'react';
|
|
3
3
|
import { waitForPaymentState } from '../payment/paymentStore.js';
|
|
4
4
|
import { PaymentContext } from '../provider/PaymentProvider.js';
|
|
5
5
|
|
|
@@ -15,6 +15,8 @@ import { PaymentContext } from '../provider/PaymentProvider.js';
|
|
|
15
15
|
* manage Rozo Pay orders and payments.
|
|
16
16
|
*/
|
|
17
17
|
function useRozoPay() {
|
|
18
|
+
const [rozoPaymentId, setRozoPaymentId] = useState(null);
|
|
19
|
+
const [paymentRozoCompleted, setPaymentRozoCompleted] = useState(false);
|
|
18
20
|
const store = useContext(PaymentContext);
|
|
19
21
|
if (!store) {
|
|
20
22
|
throw new Error("useRozoPay must be used within <PaymentProvider>");
|
|
@@ -88,12 +90,12 @@ function useRozoPay() {
|
|
|
88
90
|
...hydratedOrder,
|
|
89
91
|
sourceStartTxHash: args.paymentTxHash,
|
|
90
92
|
// Set source status to completed
|
|
91
|
-
sourceStatus: RozoPayOrderStatusSource.PROCESSED
|
|
93
|
+
sourceStatus: RozoPayOrderStatusSource.PROCESSED,
|
|
92
94
|
};
|
|
93
95
|
// Directly dispatch a payment_verified event to set the state to completed
|
|
94
96
|
dispatch({
|
|
95
97
|
type: "payment_verified",
|
|
96
|
-
order: updatedOrder
|
|
98
|
+
order: updatedOrder,
|
|
97
99
|
});
|
|
98
100
|
// Wait for the state to change to payment_completed
|
|
99
101
|
const paidState = await waitForPaymentState(store, "payment_completed");
|
|
@@ -101,18 +103,22 @@ function useRozoPay() {
|
|
|
101
103
|
}, [dispatch, store]);
|
|
102
104
|
const reset = useCallback(() => dispatch({ type: "reset" }), [dispatch]);
|
|
103
105
|
const setChosenUsd = useCallback((usd) => dispatch({ type: "set_chosen_usd", usd }), [dispatch]);
|
|
104
|
-
const setPaymentCompleted = useCallback(async (txHash) => {
|
|
106
|
+
const setPaymentCompleted = useCallback(async (txHash, rozoPaymentId) => {
|
|
105
107
|
// Get the current order from the state
|
|
106
108
|
const currentState = store.getState();
|
|
107
109
|
if (currentState.type === "idle" || !currentState.order) {
|
|
108
110
|
throw new Error("Cannot complete payment: No active order");
|
|
109
111
|
}
|
|
110
112
|
// Check if the order is already hydrated
|
|
111
|
-
if (
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
113
|
+
/* if (
|
|
114
|
+
currentState.type !== "payment_unpaid" &&
|
|
115
|
+
currentState.type !== "payment_started" &&
|
|
116
|
+
currentState.type !== "unhydrated"
|
|
117
|
+
) {
|
|
118
|
+
throw new Error(
|
|
119
|
+
`Cannot complete payment: Invalid state ${currentState.type}`
|
|
120
|
+
);
|
|
121
|
+
} */
|
|
116
122
|
// For TypeScript safety, we need to ensure the order is treated as hydrated
|
|
117
123
|
// This is safe because the payment_verified handler will validate the order
|
|
118
124
|
const hydratedOrder = currentState.order;
|
|
@@ -125,9 +131,18 @@ function useRozoPay() {
|
|
|
125
131
|
sourceStartTxHash: txHash, // Cast to Hex as required by the type
|
|
126
132
|
};
|
|
127
133
|
// Directly dispatch a payment_verified event to set the state to completed
|
|
134
|
+
// dispatch({
|
|
135
|
+
// type: "payment_verified",
|
|
136
|
+
// order: updatedOrder,
|
|
137
|
+
// });
|
|
128
138
|
dispatch({
|
|
129
|
-
type: "
|
|
130
|
-
order:
|
|
139
|
+
type: "order_refreshed",
|
|
140
|
+
order: {
|
|
141
|
+
...updatedOrder,
|
|
142
|
+
externalId: rozoPaymentId ?? updatedOrder?.externalId ?? "",
|
|
143
|
+
destFastFinishTxHash: txHash,
|
|
144
|
+
intentStatus: RozoPayIntentStatus.COMPLETED,
|
|
145
|
+
},
|
|
131
146
|
});
|
|
132
147
|
// Wait for the state to change to payment_completed
|
|
133
148
|
const completedState = await waitForPaymentState(store, "payment_completed");
|
|
@@ -147,6 +162,10 @@ function useRozoPay() {
|
|
|
147
162
|
setPaymentCompleted,
|
|
148
163
|
reset,
|
|
149
164
|
setChosenUsd,
|
|
165
|
+
rozoPaymentId,
|
|
166
|
+
setRozoPaymentId,
|
|
167
|
+
setPaymentRozoCompleted,
|
|
168
|
+
paymentRozoCompleted,
|
|
150
169
|
};
|
|
151
170
|
}
|
|
152
171
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDaimoPay.js","sources":["../../../src/hooks/useDaimoPay.tsx"],"sourcesContent":[null],"names":[],"mappings":";;;;;AAAA;
|
|
1
|
+
{"version":3,"file":"useDaimoPay.js","sources":["../../../src/hooks/useDaimoPay.tsx"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -401,6 +401,7 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
|
|
|
401
401
|
}, [setRoute, pay, currPayParams]);
|
|
402
402
|
const [tokenMode, setTokenMode] = useState("evm");
|
|
403
403
|
const [txHash, setTxHash] = useState(undefined);
|
|
404
|
+
const [rozoPaymentId, setRozoPaymentId] = useState(undefined);
|
|
404
405
|
return {
|
|
405
406
|
buttonProps,
|
|
406
407
|
setButtonProps,
|
|
@@ -446,6 +447,8 @@ function usePaymentState({ trpc, lockPayParams, setRoute, log, redirectReturnUrl
|
|
|
446
447
|
senderEnsName: senderEnsName ?? undefined,
|
|
447
448
|
txHash,
|
|
448
449
|
setTxHash,
|
|
450
|
+
setRozoPaymentId,
|
|
451
|
+
rozoPaymentId,
|
|
449
452
|
};
|
|
450
453
|
}
|
|
451
454
|
|