@rozoai/intent-pay 0.0.13 → 0.0.15
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/assets/rozo-dark.d.ts +4 -4
- package/build/assets/rozo-white.d.ts +4 -4
- package/build/components/Common/OrderHeader/index.d.ts +2 -4
- package/build/components/DaimoPayModal/ConnectWithQRCode.d.ts +9 -0
- package/build/components/Pages/SelectExchange/index.d.ts +3 -0
- package/build/components/Pages/SelectWalletChain/index.d.ts +3 -0
- package/build/constants/routes.d.ts +2 -1
- package/build/hooks/useExternalPaymentOptions.d.ts +1 -1
- package/build/package.json.js +2 -2
- package/build/src/assets/chains.js +1 -2
- package/build/src/assets/chains.js.map +1 -1
- package/build/src/components/Common/ConnectorList/index.js +24 -9
- package/build/src/components/Common/ConnectorList/index.js.map +1 -1
- package/build/src/components/Common/Modal/index.js +4 -4
- package/build/src/components/Common/Modal/index.js.map +1 -1
- package/build/src/components/Common/OrderHeader/index.js +5 -2
- package/build/src/components/Common/OrderHeader/index.js.map +1 -1
- package/build/src/components/Common/SelectAnotherMethodButton/index.js +4 -4
- package/build/src/components/Common/SelectAnotherMethodButton/index.js.map +1 -1
- package/build/src/components/DaimoPayModal/ConnectWithQRCode.js +15 -4
- package/build/src/components/DaimoPayModal/ConnectWithQRCode.js.map +1 -1
- package/build/src/components/DaimoPayModal/index.js +14 -7
- package/build/src/components/DaimoPayModal/index.js.map +1 -1
- package/build/src/components/Pages/Connectors/index.js +3 -4
- package/build/src/components/Pages/Connectors/index.js.map +1 -1
- package/build/src/components/Pages/PayWithToken/index.js +12 -2
- package/build/src/components/Pages/PayWithToken/index.js.map +1 -1
- package/build/src/components/Pages/SelectDepositAddressChain/index.js +1 -3
- package/build/src/components/Pages/SelectDepositAddressChain/index.js.map +1 -1
- package/build/src/components/Pages/SelectExchange/index.js +36 -0
- package/build/src/components/Pages/SelectExchange/index.js.map +1 -0
- package/build/src/components/Pages/SelectMethod/index.js +66 -59
- package/build/src/components/Pages/SelectMethod/index.js.map +1 -1
- package/build/src/components/Pages/SelectToken/index.js +48 -8
- package/build/src/components/Pages/SelectToken/index.js.map +1 -1
- package/build/src/components/Pages/SelectWalletAmount/index.js +3 -2
- package/build/src/components/Pages/SelectWalletAmount/index.js.map +1 -1
- package/build/src/components/Pages/SelectWalletChain/index.js +51 -0
- package/build/src/components/Pages/SelectWalletChain/index.js.map +1 -0
- package/build/src/components/Pages/SelectZKP/index.js +2 -2
- package/build/src/components/Pages/SelectZKP/index.js.map +1 -1
- package/build/src/components/Pages/Solana/ConnectorSolana/index.js +18 -1
- package/build/src/components/Pages/Solana/ConnectorSolana/index.js.map +1 -1
- package/build/src/components/Pages/Solana/PayWithSolanaToken/index.js +12 -2
- package/build/src/components/Pages/Solana/PayWithSolanaToken/index.js.map +1 -1
- package/build/src/components/Pages/WaitingDepositAddress/index.js +36 -4
- package/build/src/components/Pages/WaitingDepositAddress/index.js.map +1 -1
- package/build/src/constants/routes.js +2 -1
- package/build/src/constants/routes.js.map +1 -1
- package/build/src/defaultConfig.js +1 -2
- package/build/src/defaultConfig.js.map +1 -1
- package/build/src/hooks/useExternalPaymentOptions.js +3 -1
- package/build/src/hooks/useExternalPaymentOptions.js.map +1 -1
- package/build/src/hooks/useWalletPaymentOptions.js +20 -7
- package/build/src/hooks/useWalletPaymentOptions.js.map +1 -1
- package/build/src/payment/paymentEffects.js.map +1 -1
- package/build/src/utils/trpc.js +1 -1
- package/build/src/wallets/useWallets.js +57 -13
- package/build/src/wallets/useWallets.js.map +1 -1
- package/build/src/wallets/walletConfigs.js +1 -1
- package/build/src/wallets/walletConfigs.js.map +1 -1
- package/build/src/world-mini-app/WorldPayButton.js +55 -1
- package/build/src/world-mini-app/WorldPayButton.js.map +1 -1
- package/build/wallets/useWallets.d.ts +7 -0
- package/build/wallets/walletConfigs.d.ts +1 -0
- package/build/world-mini-app/WorldPayButton.d.ts +7 -1
- package/package.json +2 -2
|
@@ -14,19 +14,21 @@ import About from '../Pages/About/index.js';
|
|
|
14
14
|
import Confirmation from '../Pages/Confirmation/index.js';
|
|
15
15
|
import Wallets from '../Pages/Connectors/index.js';
|
|
16
16
|
import DownloadApp from '../Pages/DownloadApp/index.js';
|
|
17
|
+
import ErrorPage from '../Pages/Error/index.js';
|
|
17
18
|
import MobileConnectors from '../Pages/MobileConnectors/index.js';
|
|
18
19
|
import Introduction from '../Pages/Onboarding/index.js';
|
|
19
20
|
import PayWithToken from '../Pages/PayWithToken/index.js';
|
|
20
21
|
import SelectAmount from '../Pages/SelectAmount/index.js';
|
|
21
22
|
import SelectDepositAddressAmount from '../Pages/SelectDepositAddressAmount/index.js';
|
|
22
23
|
import SelectDepositAddressChain from '../Pages/SelectDepositAddressChain/index.js';
|
|
24
|
+
import SelectExchange from '../Pages/SelectExchange/index.js';
|
|
23
25
|
import SelectExternalAmount from '../Pages/SelectExternalAmount/index.js';
|
|
24
26
|
import SelectMethod from '../Pages/SelectMethod/index.js';
|
|
25
27
|
import SelectToken from '../Pages/SelectToken/index.js';
|
|
26
28
|
import SelectWalletAmount from '../Pages/SelectWalletAmount/index.js';
|
|
29
|
+
import SelectWalletChain from '../Pages/SelectWalletChain/index.js';
|
|
27
30
|
import SelectZKP from '../Pages/SelectZKP/index.js';
|
|
28
|
-
import ConnectSolana
|
|
29
|
-
import ConnectSolana from '../Pages/Solana/ConnectSolana/index.js';
|
|
31
|
+
import ConnectSolana from '../Pages/Solana/ConnectorSolana/index.js';
|
|
30
32
|
import PayWithSolanaToken from '../Pages/Solana/PayWithSolanaToken/index.js';
|
|
31
33
|
import SelectSolanaAmount from '../Pages/Solana/SelectSolanaAmount/index.js';
|
|
32
34
|
import SwitchNetworks from '../Pages/SwitchNetworks/index.js';
|
|
@@ -34,7 +36,6 @@ import WaitingDepositAddress from '../Pages/WaitingDepositAddress/index.js';
|
|
|
34
36
|
import WaitingExternal from '../Pages/WaitingExternal/index.js';
|
|
35
37
|
import WaitingWallet from '../Pages/WaitingWallet/index.js';
|
|
36
38
|
import ConnectUsing from './ConnectUsing.js';
|
|
37
|
-
import ErrorPage from '../Pages/Error/index.js';
|
|
38
39
|
|
|
39
40
|
const RozoPayModal = ({ mode, theme, customTheme, lang, disableMobileInjector, }) => {
|
|
40
41
|
const context = usePayContext();
|
|
@@ -104,8 +105,13 @@ const RozoPayModal = ({ mode, theme, customTheme, lang, disableMobileInjector, }
|
|
|
104
105
|
}
|
|
105
106
|
else if (context.route === ROUTES.WAITING_DEPOSIT_ADDRESS) {
|
|
106
107
|
if (isDepositFlow) {
|
|
107
|
-
|
|
108
|
-
|
|
108
|
+
if (paymentState.selectedDepositAddressOption === undefined) {
|
|
109
|
+
context.setRoute(ROUTES.SELECT_DEPOSIT_ADDRESS_CHAIN, meta);
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
generatePreviewOrder();
|
|
113
|
+
context.setRoute(ROUTES.SELECT_DEPOSIT_ADDRESS_AMOUNT, meta);
|
|
114
|
+
}
|
|
109
115
|
}
|
|
110
116
|
else {
|
|
111
117
|
setSelectedDepositAddressOption(undefined);
|
|
@@ -145,8 +151,10 @@ const RozoPayModal = ({ mode, theme, customTheme, lang, disableMobileInjector, }
|
|
|
145
151
|
[ROUTES.SELECT_TOKEN]: jsx(SelectToken, {}),
|
|
146
152
|
[ROUTES.SELECT_AMOUNT]: jsx(SelectAmount, {}),
|
|
147
153
|
[ROUTES.SELECT_EXTERNAL_AMOUNT]: jsx(SelectExternalAmount, {}),
|
|
154
|
+
[ROUTES.SELECT_EXCHANGE]: jsx(SelectExchange, {}),
|
|
148
155
|
[ROUTES.SELECT_DEPOSIT_ADDRESS_AMOUNT]: jsx(SelectDepositAddressAmount, {}),
|
|
149
156
|
[ROUTES.SELECT_WALLET_AMOUNT]: jsx(SelectWalletAmount, {}),
|
|
157
|
+
[ROUTES.SELECT_WALLET_CHAIN]: jsx(SelectWalletChain, {}),
|
|
150
158
|
[ROUTES.WAITING_EXTERNAL]: jsx(WaitingExternal, {}),
|
|
151
159
|
[ROUTES.SELECT_DEPOSIT_ADDRESS_CHAIN]: jsx(SelectDepositAddressChain, {}),
|
|
152
160
|
[ROUTES.WAITING_DEPOSIT_ADDRESS]: jsx(WaitingDepositAddress, {}),
|
|
@@ -155,8 +163,7 @@ const RozoPayModal = ({ mode, theme, customTheme, lang, disableMobileInjector, }
|
|
|
155
163
|
[ROUTES.CONFIRMATION]: jsx(Confirmation, {}),
|
|
156
164
|
[ROUTES.ERROR]: jsx(ErrorPage, {}),
|
|
157
165
|
[ROUTES.PAY_WITH_TOKEN]: jsx(PayWithToken, {}),
|
|
158
|
-
[ROUTES.
|
|
159
|
-
[ROUTES.SOLANA_CONNECTOR]: jsx(ConnectSolana$1, {}),
|
|
166
|
+
[ROUTES.SOLANA_CONNECTOR]: jsx(ConnectSolana, {}),
|
|
160
167
|
[ROUTES.SOLANA_SELECT_AMOUNT]: jsx(SelectSolanaAmount, {}),
|
|
161
168
|
[ROUTES.SOLANA_PAY_WITH_TOKEN]: jsx(PayWithSolanaToken, {}),
|
|
162
169
|
// Unused routes. Kept to minimize connectkit merge conflicts.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../../src/components/DaimoPayModal/index.tsx"],"sourcesContent":[null],"names":["_jsx","ConnectorSolana","Onboarding","Connectors"],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../../src/components/DaimoPayModal/index.tsx"],"sourcesContent":[null],"names":["_jsx","ConnectorSolana","Onboarding","Connectors"],"mappings":"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"}
|
|
@@ -18,15 +18,14 @@ const Wallets = () => {
|
|
|
18
18
|
const locales = useLocales({});
|
|
19
19
|
const { isMobile } = useIsMobile();
|
|
20
20
|
const { hydrateOrder, order } = useRozoPay();
|
|
21
|
-
// If we're
|
|
21
|
+
// If we're not in deposit mode, hydrate immediately.
|
|
22
22
|
useEffect(() => {
|
|
23
|
-
if (
|
|
24
|
-
!context.paymentState.isDepositFlow &&
|
|
23
|
+
if (!context.paymentState.isDepositFlow &&
|
|
25
24
|
order != null &&
|
|
26
25
|
order.mode !== RozoPayOrderMode.HYDRATED) {
|
|
27
26
|
hydrateOrder();
|
|
28
27
|
}
|
|
29
|
-
}, [
|
|
28
|
+
}, [context.paymentState.isDepositFlow, hydrateOrder, order]);
|
|
30
29
|
// Show new-user education buttons
|
|
31
30
|
const showLearnMore = !context.options?.hideQuestionMarkCTA;
|
|
32
31
|
const showGetWallet = !context.options?.hideNoWalletCTA;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../../../src/components/Pages/Connectors/index.tsx"],"sourcesContent":[null],"names":["_jsxs","_jsx"],"mappings":";;;;;;;;;;;;;;;AA2BM,MAAA,OAAO,GAAa,MAAK;AAC7B,IAAA,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;AAChC,IAAA,MAAM,OAAO,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;AAE/B,IAAA,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,EAAE,CAAC;IACnC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,UAAU,EAAE,CAAC;;IAG7C,SAAS,CAAC,MAAK;AACb,QAAA,IACE,
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../../../src/components/Pages/Connectors/index.tsx"],"sourcesContent":[null],"names":["_jsxs","_jsx"],"mappings":";;;;;;;;;;;;;;;AA2BM,MAAA,OAAO,GAAa,MAAK;AAC7B,IAAA,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;AAChC,IAAA,MAAM,OAAO,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;AAE/B,IAAA,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,EAAE,CAAC;IACnC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,UAAU,EAAE,CAAC;;IAG7C,SAAS,CAAC,MAAK;AACb,QAAA,IACE,CAAC,OAAO,CAAC,YAAY,CAAC,aAAa;AACnC,YAAA,KAAK,IAAI,IAAI;AACb,YAAA,KAAK,CAAC,IAAI,KAAK,gBAAgB,CAAC,QAAQ,EACxC;AACA,YAAA,YAAY,EAAE,CAAC;SAChB;AACH,KAAC,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,aAAa,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC;;IAG9D,MAAM,aAAa,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,mBAAmB,CAAC;IAC5D,MAAM,aAAa,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC;IAExD,QACEA,KAAC,WAAW,EAAA,EAAA,QAAA,EAAA,CACVC,IAAC,WAAW,EAAA,EAAC,QAAQ,EAAG,IAAA,EAAA,CAAA,EACxBA,IAAC,aAAa,EAAA,EAAA,CAAG,EAEhB,QAAQ,IACPA,0BACED,IAAC,CAAA,OAAO,eACNA,IAAC,CAAA,YAAY,IAAC,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,aACpDC,GAAC,CAAA,OAAO,8BAAS,OAAO,CAAC,mBAAmB,EAAA,CAAW,EACvDA,GAAA,CAAC,SAAS,EAAE,EAAA,QAAA,EAAA,OAAO,CAAC,kBAAkB,EAAA,CAAa,IACtC,EACfD,IAAA,CAAC,cAAc,EACZ,EAAA,QAAA,EAAA,CAAA,aAAa,KACZC,GAAA,CAAC,MAAM,EACL,EAAA,OAAO,EAAE,UAAU,EACnB,OAAO,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,YAE5C,OAAO,CAAC,SAAS,EACX,CAAA,CACV,EACA,aAAa,KACZA,GAAC,CAAA,MAAM,EACL,EAAA,OAAO,EAAE,UAAU,EACnB,OAAO,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAAA,QAAA,EAEjD,OAAO,CAAC,SAAS,GACX,CACV,CAAA,EAAA,CACc,CACT,EAAA,CAAA,EAAA,CACT,KAEHA,0BACG,aAAa,KACZA,GAAC,CAAA,kBAAkB,cACjBD,IAAC,CAAA,eAAe,IACd,OAAO,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAElD,QAAA,EAAA,CAAAC,GAAA,CAAC,UAAU,EAAG,EAAA,CAAA,EAAA,GAAA,EAAE,OAAO,CAAC,yBAAyB,IACjC,EACC,CAAA,CACtB,GACA,CACJ,EACA,OAAO,CAAC,OAAO,EAAE,UAAU,KAC1BA,GAAA,CAAC,UAAU,EAAA,EAAC,KAAK,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,EAAA,QAAA,EAChEA,uBAAM,OAAO,CAAC,OAAO,EAAE,UAAU,GAAO,EAC7B,CAAA,CACd,CACW,EAAA,CAAA,EACd;AACJ;;;;"}
|
|
@@ -19,10 +19,20 @@ var PayState;
|
|
|
19
19
|
PayState["RequestFailed"] = "Payment Failed";
|
|
20
20
|
})(PayState || (PayState = {}));
|
|
21
21
|
const PayWithToken = () => {
|
|
22
|
-
const { triggerResize, paymentState, setRoute, log } = usePayContext();
|
|
22
|
+
const { triggerResize, paymentState, setRoute, log, trpc } = usePayContext();
|
|
23
23
|
const { payWithToken, selectedTokenOption } = paymentState;
|
|
24
24
|
useRozoPay();
|
|
25
|
-
const [payState,
|
|
25
|
+
const [payState, setPayStateInner] = useState(PayState.RequestingPayment);
|
|
26
|
+
const setPayState = (state) => {
|
|
27
|
+
if (state === payState)
|
|
28
|
+
return;
|
|
29
|
+
setPayStateInner(state);
|
|
30
|
+
log(`[PayWithToken] payState: ${state}`);
|
|
31
|
+
trpc.nav.mutate({
|
|
32
|
+
action: "pay-with-token-state",
|
|
33
|
+
data: { state },
|
|
34
|
+
});
|
|
35
|
+
};
|
|
26
36
|
const [txURL, setTxURL] = useState();
|
|
27
37
|
const walletChainId = useChainId();
|
|
28
38
|
const { switchChainAsync } = useSwitchChain();
|
|
@@ -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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"}
|
|
@@ -21,9 +21,7 @@ const SelectDepositAddressChain = () => {
|
|
|
21
21
|
justifyContent: "center",
|
|
22
22
|
paddingTop: 16,
|
|
23
23
|
paddingBottom: 16,
|
|
24
|
-
}, children: [jsx(ModalH1, { children: "Chains unavailable." }), jsx(SelectAnotherMethodButton, {})] })), jsx(OptionsList, { requiredSkeletons: 4, isLoading: depositAddressOptions.loading, options:
|
|
25
|
-
//TODO: Hide Tron and Ethereum from the deposit address options
|
|
26
|
-
depositAddressOptions.options?.filter(option => !option.id.toLowerCase().includes("tron") &&
|
|
24
|
+
}, children: [jsx(ModalH1, { children: "Chains unavailable." }), jsx(SelectAnotherMethodButton, {})] })), jsx(OptionsList, { requiredSkeletons: 4, isLoading: depositAddressOptions.loading, options: depositAddressOptions.options?.filter(option => !option.id.toLowerCase().includes("tron") &&
|
|
27
25
|
!option.id.toLowerCase().includes("ethereum")).map((option) => {
|
|
28
26
|
return {
|
|
29
27
|
id: option.id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../../../src/components/Pages/SelectDepositAddressChain/index.tsx"],"sourcesContent":[null],"names":["_jsxs","_jsx"],"mappings":";;;;;;;;;;;AAaM,MAAA,yBAAyB,GAAa,MAAK;IAC/C,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,aAAa,EAAE,CAAC;AACnD,IAAA,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;AACzB,IAAA,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC;IACtB,MAAM,EACJ,aAAa,EACb,+BAA+B,EAC/B,qBAAqB,GACtB,GAAG,YAAY,CAAC;IAEjB,QACEA,KAAC,WAAW,EAAA,EAAA,QAAA,EAAA,CACVC,IAAC,WAAW,EAAA,EAAC,QAAQ,EAAC,IAAA,EAAA,YAAY,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,GAAI,EAEtD,CAAC,qBAAqB,CAAC,OAAO;AAC7B,gBAAA,qBAAqB,CAAC,OAAO,EAAE,MAAM,KAAK,CAAC,KACzCD,IAAC,CAAA,YAAY,EACX,EAAA,KAAK,EAAE;AACL,oBAAA,OAAO,EAAE,MAAM;AACf,oBAAA,UAAU,EAAE,QAAQ;AACpB,oBAAA,cAAc,EAAE,QAAQ;AACxB,oBAAA,UAAU,EAAE,EAAE;AACd,oBAAA,aAAa,EAAE,EAAE;iBAClB,EAED,QAAA,EAAA,CAAAC,GAAA,CAAC,OAAO,EAA8B,EAAA,QAAA,EAAA,qBAAA,EAAA,CAAA,EACtCA,IAAC,yBAAyB,EAAA,EAAA,CAAG,
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../../../src/components/Pages/SelectDepositAddressChain/index.tsx"],"sourcesContent":[null],"names":["_jsxs","_jsx"],"mappings":";;;;;;;;;;;AAaM,MAAA,yBAAyB,GAAa,MAAK;IAC/C,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,aAAa,EAAE,CAAC;AACnD,IAAA,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;AACzB,IAAA,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC;IACtB,MAAM,EACJ,aAAa,EACb,+BAA+B,EAC/B,qBAAqB,GACtB,GAAG,YAAY,CAAC;IAEjB,QACEA,KAAC,WAAW,EAAA,EAAA,QAAA,EAAA,CACVC,IAAC,WAAW,EAAA,EAAC,QAAQ,EAAC,IAAA,EAAA,YAAY,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,GAAI,EAEtD,CAAC,qBAAqB,CAAC,OAAO;AAC7B,gBAAA,qBAAqB,CAAC,OAAO,EAAE,MAAM,KAAK,CAAC,KACzCD,IAAC,CAAA,YAAY,EACX,EAAA,KAAK,EAAE;AACL,oBAAA,OAAO,EAAE,MAAM;AACf,oBAAA,UAAU,EAAE,QAAQ;AACpB,oBAAA,cAAc,EAAE,QAAQ;AACxB,oBAAA,UAAU,EAAE,EAAE;AACd,oBAAA,aAAa,EAAE,EAAE;iBAClB,EAED,QAAA,EAAA,CAAAC,GAAA,CAAC,OAAO,EAA8B,EAAA,QAAA,EAAA,qBAAA,EAAA,CAAA,EACtCA,IAAC,yBAAyB,EAAA,EAAA,CAAG,IAChB,CAChB,EAEHA,IAAC,WAAW,EAAA,EACV,iBAAiB,EAAE,CAAC,EACpB,SAAS,EAAE,qBAAqB,CAAC,OAAO,EACxC,OAAO,EAEL,qBAAqB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,IAC1C,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC;AACzC,oBAAA,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAC9C,CAAC,GAAG,CAAC,CAAC,MAAM,KAAI;oBACf,OAAO;wBACL,EAAE,EAAE,MAAM,CAAC,EAAE;wBACb,KAAK,EAAE,MAAM,CAAC,EAAE;AAChB,wBAAA,KAAK,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC;AACvB,wBAAA,QAAQ,EACN,MAAM,CAAC,UAAU,GAAG,CAAC;AACrB,4BAAA,KAAK,EAAE,IAAI,KAAK,gBAAgB,CAAC,QAAQ;AACzC,4BAAA,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,UAAU;wBACpC,OAAO,EAAE,MAAK;4BACZ,+BAA+B,CAAC,MAAM,CAAC,CAAC;AACxC,4BAAA,MAAM,IAAI,GAAG,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;4BAC1D,IAAI,aAAa,EAAE;AACjB,gCAAA,QAAQ,CAAC,MAAM,CAAC,6BAA6B,EAAE,IAAI,CAAC,CAAC;6BACtD;iCAAM;AACL,gCAAA,QAAQ,CAAC,MAAM,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;6BAChD;yBACF;qBACF,CAAC;iBACH,CAAC,IAAI,EAAE,EAEV,CAAA,EACFA,IAAC,eAAe,EAAA,EAAA,CAAG,CACP,EAAA,CAAA,EACd;AACJ;;;;"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { jsxs, jsx } from 'react/jsx-runtime';
|
|
2
|
+
import { PageContent, ModalH1 } from '../../Common/Modal/styles.js';
|
|
3
|
+
import { ROUTES } from '../../../constants/routes.js';
|
|
4
|
+
import { usePayContext } from '../../../hooks/usePayContext.js';
|
|
5
|
+
import { OptionsList } from '../../Common/OptionsList/index.js';
|
|
6
|
+
import { OrderHeader } from '../../Common/OrderHeader/index.js';
|
|
7
|
+
|
|
8
|
+
const SelectExchange = () => {
|
|
9
|
+
const { paymentState, setRoute } = usePayContext();
|
|
10
|
+
const { externalPaymentOptions, setSelectedExternalOption } = paymentState;
|
|
11
|
+
const exchangeOptions = externalPaymentOptions.options.get("exchange");
|
|
12
|
+
if (!exchangeOptions) {
|
|
13
|
+
return (jsxs(PageContent, { children: [jsx(OrderHeader, { minified: true, show: "zkp2p" }), jsx(ModalH1, { children: "No Exchange options available" })] }));
|
|
14
|
+
}
|
|
15
|
+
const options = exchangeOptions.map((option) => ({
|
|
16
|
+
id: option.id,
|
|
17
|
+
title: option.cta,
|
|
18
|
+
icons: [option.logoURI],
|
|
19
|
+
onClick: () => {
|
|
20
|
+
setSelectedExternalOption(option);
|
|
21
|
+
const meta = { event: "click-option", option: option.id };
|
|
22
|
+
if (paymentState.isDepositFlow) {
|
|
23
|
+
setRoute(ROUTES.SELECT_EXTERNAL_AMOUNT, meta);
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
setRoute(ROUTES.WAITING_EXTERNAL, meta);
|
|
27
|
+
}
|
|
28
|
+
},
|
|
29
|
+
disabled: option.disabled,
|
|
30
|
+
subtitle: option.message,
|
|
31
|
+
}));
|
|
32
|
+
return (jsxs(PageContent, { children: [jsx(OrderHeader, { minified: true, show: "zkp2p" }), jsx(OptionsList, { options: options })] }));
|
|
33
|
+
};
|
|
34
|
+
|
|
35
|
+
export { SelectExchange as default };
|
|
36
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../../../src/components/Pages/SelectExchange/index.tsx"],"sourcesContent":[null],"names":["_jsxs","_jsx"],"mappings":";;;;;;;AASM,MAAA,cAAc,GAAa,MAAK;IACpC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,aAAa,EAAE,CAAC;AACnD,IAAA,MAAM,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,GAAG,YAAY,CAAC;IAC3E,MAAM,eAAe,GAAG,sBAAsB,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAEvE,IAAI,CAAC,eAAe,EAAE;AACpB,QAAA,QACEA,IAAC,CAAA,WAAW,eACVC,GAAC,CAAA,WAAW,IAAC,QAAQ,EAAA,IAAA,EAAC,IAAI,EAAC,OAAO,GAAG,EACrCA,GAAA,CAAC,OAAO,EAAwC,EAAA,QAAA,EAAA,+BAAA,EAAA,CAAA,CAAA,EAAA,CACpC,EACd;KACH;IAED,MAAM,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,MAAM,MAAM;QAC/C,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,KAAK,EAAE,MAAM,CAAC,GAAG;AACjB,QAAA,KAAK,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC;QACvB,OAAO,EAAE,MAAK;YACZ,yBAAyB,CAAC,MAAM,CAAC,CAAC;AAClC,YAAA,MAAM,IAAI,GAAG,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;AAC1D,YAAA,IAAI,YAAY,CAAC,aAAa,EAAE;AAC9B,gBAAA,QAAQ,CAAC,MAAM,CAAC,sBAAsB,EAAE,IAAI,CAAC,CAAC;aAC/C;iBAAM;AACL,gBAAA,QAAQ,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;aACzC;SACF;QACD,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,QAAQ,EAAE,MAAM,CAAC,OAAO;AACzB,KAAA,CAAC,CAAC,CAAC;IAEJ,QACED,KAAC,WAAW,EAAA,EAAA,QAAA,EAAA,CACVC,IAAC,WAAW,EAAA,EAAC,QAAQ,EAAA,IAAA,EAAC,IAAI,EAAC,OAAO,EAAG,CAAA,EACrCA,GAAC,CAAA,WAAW,EAAC,EAAA,OAAO,EAAE,OAAO,EAAA,CAAI,CACrB,EAAA,CAAA,EACd;AACJ;;;;"}
|
|
@@ -6,8 +6,9 @@ import { getAddressContraction } from '@rozoai/intent-common';
|
|
|
6
6
|
import { useWallet } from '@solana/wallet-adapter-react';
|
|
7
7
|
import { useAccount, useDisconnect } from 'wagmi';
|
|
8
8
|
import { Ethereum, Solana, Base, Arbitrum, Optimism, Polygon } from '../../../assets/chains.js';
|
|
9
|
-
import { WalletIcon, Trust, Rainbow, Phantom,
|
|
9
|
+
import { WalletIcon, Trust, Rainbow, Phantom, Rabby, MetaMask } from '../../../assets/logos.js';
|
|
10
10
|
import useIsMobile from '../../../hooks/useIsMobile.js';
|
|
11
|
+
import { walletConfigs } from '../../../wallets/walletConfigs.js';
|
|
11
12
|
import { OptionsList } from '../../Common/OptionsList/index.js';
|
|
12
13
|
import { OrderHeader } from '../../Common/OrderHeader/index.js';
|
|
13
14
|
import PoweredByFooter from '../../Common/PoweredByFooter/index.js';
|
|
@@ -18,22 +19,34 @@ function SelectMethod() {
|
|
|
18
19
|
const { address, chain, isConnected: isEthConnected, connector, } = useAccount();
|
|
19
20
|
const { connected: isSolanaConnected, wallet: solanaWallet, wallets: solanaWallets, disconnect: disconnectSolana, publicKey, } = useWallet();
|
|
20
21
|
const { setRoute, paymentState, log, disableMobileInjector } = usePayContext();
|
|
22
|
+
const { showSolanaPaymentMethod } = paymentState;
|
|
21
23
|
const { disconnectAsync } = useDisconnect();
|
|
22
|
-
const {
|
|
24
|
+
const { externalPaymentOptions, senderEnsName } = paymentState;
|
|
23
25
|
// Decide whether to show the connected eth account, solana account, or both.
|
|
24
26
|
// Desktop: Always show connected wallets when available
|
|
25
27
|
// Mobile: Only show connected wallets when mobile injector is enabled (!disableMobileInjector)
|
|
26
28
|
const showConnectedEth = isEthConnected && (!isMobile || !disableMobileInjector);
|
|
27
|
-
const showConnectedSolana = isSolanaConnected &&
|
|
28
|
-
showSolanaPaymentMethod &&
|
|
29
|
-
(!isMobile || !disableMobileInjector);
|
|
29
|
+
const showConnectedSolana = isSolanaConnected && (!isMobile || !disableMobileInjector);
|
|
30
30
|
const getConnectedWalletOptions = () => {
|
|
31
|
-
const showChainLogo = isEthConnected && isSolanaConnected;
|
|
31
|
+
const showChainLogo = isEthConnected && isSolanaConnected && showSolanaPaymentMethod;
|
|
32
32
|
const connectedOptions = [];
|
|
33
33
|
if (showConnectedEth) {
|
|
34
34
|
const ethWalletDisplayName = senderEnsName ?? (address ? getAddressContraction(address) : "wallet");
|
|
35
|
+
// Prefer icon from walletConfigs if there's a name match, otherwise fall back
|
|
36
|
+
// to the connector-provided icon, and finally to the generic WalletIcon.
|
|
35
37
|
let walletIcon;
|
|
36
|
-
|
|
38
|
+
const matchedConfig = Object.values(walletConfigs).find((cfg) => {
|
|
39
|
+
if (!cfg.name || !connector?.name)
|
|
40
|
+
return false;
|
|
41
|
+
const cfgName = cfg.name.toLowerCase();
|
|
42
|
+
const connName = connector.name.toLowerCase();
|
|
43
|
+
return cfgName.includes(connName) || connName.includes(cfgName);
|
|
44
|
+
});
|
|
45
|
+
if (matchedConfig?.icon) {
|
|
46
|
+
walletIcon =
|
|
47
|
+
typeof matchedConfig.icon === "string" ? (jsx("img", { src: matchedConfig.icon, alt: matchedConfig.name })) : matchedConfig.icon;
|
|
48
|
+
}
|
|
49
|
+
else if (connector?.icon) {
|
|
37
50
|
walletIcon = (jsx("div", { style: { borderRadius: "22.5%", overflow: "hidden" }, children: jsx("img", { src: connector.icon, alt: connector.name }) }));
|
|
38
51
|
}
|
|
39
52
|
else {
|
|
@@ -57,18 +70,33 @@ function SelectMethod() {
|
|
|
57
70
|
};
|
|
58
71
|
connectedOptions.push(connectedEthWalletOption);
|
|
59
72
|
}
|
|
60
|
-
if (showConnectedSolana) {
|
|
73
|
+
if (showConnectedSolana && showSolanaPaymentMethod) {
|
|
61
74
|
const solWalletDisplayName = getAddressContraction(publicKey?.toBase58() ?? "");
|
|
75
|
+
// Prefer icon from walletConfigs if available
|
|
76
|
+
let solWalletIcon;
|
|
77
|
+
const solMatchedConfig = Object.values(walletConfigs).find((cfg) => {
|
|
78
|
+
if (!cfg.name)
|
|
79
|
+
return false;
|
|
80
|
+
const cfgName = cfg.name.toLowerCase();
|
|
81
|
+
const solName = solanaWallet?.adapter.name.toLowerCase() || "";
|
|
82
|
+
return cfgName.includes(solName) || solName.includes(cfgName);
|
|
83
|
+
});
|
|
84
|
+
if (solMatchedConfig?.icon) {
|
|
85
|
+
solWalletIcon =
|
|
86
|
+
typeof solMatchedConfig.icon === "string" ? (jsx("img", { src: solMatchedConfig.icon, alt: solMatchedConfig.name })) : solMatchedConfig.icon;
|
|
87
|
+
}
|
|
88
|
+
else if (solanaWallet?.adapter.icon) {
|
|
89
|
+
solWalletIcon = solanaWallet.adapter.icon;
|
|
90
|
+
}
|
|
91
|
+
else {
|
|
92
|
+
solWalletIcon = jsx(Solana, {});
|
|
93
|
+
}
|
|
62
94
|
const connectedSolWalletOption = {
|
|
63
95
|
id: "connectedSolanaWallet",
|
|
64
96
|
title: `Pay with ${solWalletDisplayName}`,
|
|
65
|
-
icons:
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
]
|
|
69
|
-
: [
|
|
70
|
-
jsx(WalletChainLogo, { walletIcon: jsx(Solana, {}), walletName: "Default wallet icon", chainLogo: null }, "sol-wallet"),
|
|
71
|
-
],
|
|
97
|
+
icons: [
|
|
98
|
+
jsx(WalletChainLogo, { walletIcon: solWalletIcon, walletName: solanaWallet?.adapter.name || "Wallet", chainLogo: showChainLogo && jsx(Solana, {}) }, "sol-wallet"),
|
|
99
|
+
],
|
|
72
100
|
onClick: () => {
|
|
73
101
|
paymentState.setTokenMode("solana");
|
|
74
102
|
setRoute(ROUTES.SELECT_TOKEN, {
|
|
@@ -92,6 +120,7 @@ function SelectMethod() {
|
|
|
92
120
|
icons: getBestUnconnectedWalletIcons(connector, isMobile),
|
|
93
121
|
onClick: async () => {
|
|
94
122
|
await disconnectAsync();
|
|
123
|
+
await disconnectSolana();
|
|
95
124
|
setRoute(ROUTES.CONNECTORS);
|
|
96
125
|
},
|
|
97
126
|
};
|
|
@@ -99,30 +128,22 @@ function SelectMethod() {
|
|
|
99
128
|
options.push(...connectedWalletOptions);
|
|
100
129
|
options.push(unconnectedWalletOption);
|
|
101
130
|
log(`[SELECT_METHOD] loading: ${externalPaymentOptions.loading}, options: ${JSON.stringify(externalPaymentOptions.options)}`);
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
131
|
+
// Pay with Exchange
|
|
132
|
+
const exchangeOptions = externalPaymentOptions.options.get("exchange") ?? [];
|
|
133
|
+
const showExchangePaymentMethod = exchangeOptions.length > 0;
|
|
134
|
+
if (showExchangePaymentMethod) {
|
|
135
|
+
options.push({
|
|
136
|
+
id: "exchange",
|
|
137
|
+
title: "Pay with exchange",
|
|
138
|
+
icons: exchangeOptions.slice(0, 3).map((option) => option.logoURI),
|
|
139
|
+
onClick: () => {
|
|
140
|
+
setRoute(ROUTES.SELECT_EXCHANGE, {
|
|
141
|
+
event: "click-option",
|
|
142
|
+
option: "exchange",
|
|
143
|
+
});
|
|
144
|
+
},
|
|
145
|
+
});
|
|
107
146
|
}
|
|
108
|
-
// External payment options, e.g. Binance, Coinbase, etc.
|
|
109
|
-
options.push(...(externalPaymentOptions.options.get("external") ?? []).map((option) => ({
|
|
110
|
-
id: option.id,
|
|
111
|
-
title: option.cta,
|
|
112
|
-
icons: [option.logoURI],
|
|
113
|
-
onClick: () => {
|
|
114
|
-
setSelectedExternalOption(option);
|
|
115
|
-
const meta = { event: "click-option", option: option.id };
|
|
116
|
-
if (paymentState.isDepositFlow) {
|
|
117
|
-
setRoute(ROUTES.SELECT_EXTERNAL_AMOUNT, meta);
|
|
118
|
-
}
|
|
119
|
-
else {
|
|
120
|
-
setRoute(ROUTES.WAITING_EXTERNAL, meta);
|
|
121
|
-
}
|
|
122
|
-
},
|
|
123
|
-
disabled: option.disabled,
|
|
124
|
-
subtitle: option.message,
|
|
125
|
-
})));
|
|
126
147
|
const depositAddressOption = getDepositAddressOption(setRoute);
|
|
127
148
|
options.push(depositAddressOption);
|
|
128
149
|
// ZKP2P is currently only available on desktop. Check if the user is on
|
|
@@ -147,11 +168,13 @@ function SelectMethod() {
|
|
|
147
168
|
function getBestUnconnectedWalletIcons(connector, isMobile) {
|
|
148
169
|
const icons = [];
|
|
149
170
|
const strippedId = connector?.id.toLowerCase(); // some connector ids can have weird casing and or suffixes and prefixes
|
|
150
|
-
const [isRainbow, isTrust, isPhantom, isCoinbase] = [
|
|
171
|
+
const [isRainbow, isTrust, isPhantom, isCoinbase, isMetamask, isRabby] = [
|
|
151
172
|
strippedId?.includes("rainbow"),
|
|
152
173
|
strippedId?.includes("trust"),
|
|
153
174
|
strippedId?.includes("phantom"),
|
|
154
175
|
strippedId?.includes("coinbase"),
|
|
176
|
+
strippedId?.includes("metamask"),
|
|
177
|
+
strippedId?.includes("rabby"),
|
|
155
178
|
];
|
|
156
179
|
if (isMobile) {
|
|
157
180
|
if (!isTrust)
|
|
@@ -160,35 +183,19 @@ function getBestUnconnectedWalletIcons(connector, isMobile) {
|
|
|
160
183
|
icons.push(jsx(Rainbow, {}));
|
|
161
184
|
if (!isPhantom)
|
|
162
185
|
icons.push(jsx(Phantom, {}));
|
|
163
|
-
if (!isCoinbase && icons.length < 3)
|
|
164
|
-
icons.push(jsx(Coinbase, {}));
|
|
165
186
|
}
|
|
166
187
|
else {
|
|
167
188
|
if (!isRainbow)
|
|
168
189
|
icons.push(jsx(Rainbow, {}));
|
|
169
190
|
if (!isPhantom)
|
|
170
191
|
icons.push(jsx(Phantom, {}));
|
|
171
|
-
if (!
|
|
172
|
-
icons.push(jsx(
|
|
192
|
+
if (!isRabby)
|
|
193
|
+
icons.push(jsx(Rabby, {}));
|
|
194
|
+
if (!isMetamask && icons.length < 3)
|
|
195
|
+
icons.push(jsx(MetaMask, {}));
|
|
173
196
|
}
|
|
174
197
|
return icons;
|
|
175
198
|
}
|
|
176
|
-
function getSolanaOption(isIOS, isAndroid, solanaWallets, disconnectSolana, setRoute) {
|
|
177
|
-
// If we're on iOS and there are no wallets, we don't need to show the Solana option
|
|
178
|
-
// If we're on Android and there are less than 2 wallets, we don't need to show the Solana option because there is always a default wallet called Mobile Wallet Adapter that is not useful
|
|
179
|
-
if ((isIOS && solanaWallets.length === 0) ||
|
|
180
|
-
(isAndroid && solanaWallets.length < 2))
|
|
181
|
-
return null;
|
|
182
|
-
return {
|
|
183
|
-
id: "solana",
|
|
184
|
-
title: "Pay on Solana",
|
|
185
|
-
icons: [jsx(Solana, {}, "solana")],
|
|
186
|
-
onClick: async () => {
|
|
187
|
-
await disconnectSolana();
|
|
188
|
-
setRoute(ROUTES.SOLANA_CONNECT);
|
|
189
|
-
},
|
|
190
|
-
};
|
|
191
|
-
}
|
|
192
199
|
function getDepositAddressOption(setRoute) {
|
|
193
200
|
return {
|
|
194
201
|
id: "depositAddress",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../../../src/components/Pages/SelectMethod/index.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs"],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../../../src/components/Pages/SelectMethod/index.tsx"],"sourcesContent":[null],"names":["_jsx","_jsxs"],"mappings":"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"}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { jsxs, jsx } from 'react/jsx-runtime';
|
|
2
|
+
import { useWallet } from '@solana/wallet-adapter-react';
|
|
3
|
+
import { useAccount, injected } from 'wagmi';
|
|
4
|
+
import { Ethereum, Solana } from '../../../assets/chains.js';
|
|
2
5
|
import defaultTheme from '../../../constants/defaultTheme.js';
|
|
6
|
+
import { useConnect } from '../../../hooks/useConnect.js';
|
|
3
7
|
import useIsMobile from '../../../hooks/useIsMobile.js';
|
|
4
8
|
import { usePayContext } from '../../../hooks/usePayContext.js';
|
|
5
9
|
import { useTokenOptions } from '../../../hooks/useTokenOptions.js';
|
|
@@ -14,16 +18,52 @@ function SelectToken() {
|
|
|
14
18
|
const { paymentState } = usePayContext();
|
|
15
19
|
const { tokenMode } = paymentState;
|
|
16
20
|
const { optionsList, isLoading } = useTokenOptions(tokenMode);
|
|
21
|
+
const { isConnected: isEvmConnected } = useAccount();
|
|
22
|
+
const solanaWallets = useWallet();
|
|
23
|
+
const isSolConnected = solanaWallets.connected;
|
|
24
|
+
const isConnected = isEvmConnected || isSolConnected;
|
|
17
25
|
const isAnotherMethodButtonVisible = optionsList.length > 0 && tokenMode !== "all";
|
|
18
|
-
return (jsxs(PageContent, { children: [jsx(OrderHeader, { minified: true,
|
|
19
|
-
display: "flex",
|
|
20
|
-
alignItems: "center",
|
|
21
|
-
justifyContent: "center",
|
|
22
|
-
paddingTop: 16,
|
|
23
|
-
paddingBottom: 16,
|
|
24
|
-
}, children: [jsx(ModalH1, { children: "Insufficient balance." }), jsx(SelectAnotherMethodButton, {})] })), jsx(OptionsList, { requiredSkeletons: 4, isLoading: isLoading,
|
|
26
|
+
return (jsxs(PageContent, { children: [jsx(OrderHeader, { minified: true, show: tokenMode }), jsx(OptionsList, { requiredSkeletons: 4, isLoading: isLoading,
|
|
25
27
|
// TODO: Hide Tron and Ethereum from the token options
|
|
26
|
-
options: optionsList.filter((option) => option.id !== "1-0x0000000000000000000000000000000000000000"), scrollHeight: isAnotherMethodButtonVisible && isMobileFormat ? 225 : 300, orDivider: isAnotherMethodButtonVisible, hideBottomLine: !isAnotherMethodButtonVisible }), isAnotherMethodButtonVisible && jsx(SelectAnotherMethodButton, {})] }));
|
|
28
|
+
options: optionsList.filter((option) => option.id !== "1-0x0000000000000000000000000000000000000000"), scrollHeight: isAnotherMethodButtonVisible && isMobileFormat ? 225 : 300, orDivider: isAnotherMethodButtonVisible, hideBottomLine: !isAnotherMethodButtonVisible }), !isLoading && isConnected && optionsList.length === 0 && (jsx(InsufficientBalance, {})), !isLoading && !isConnected && tokenMode === "all" && jsx(ConnectButton, {}), isAnotherMethodButtonVisible && jsx(SelectAnotherMethodButton, {})] }));
|
|
29
|
+
}
|
|
30
|
+
function InsufficientBalance() {
|
|
31
|
+
return (jsxs(ModalContent, { style: {
|
|
32
|
+
display: "flex",
|
|
33
|
+
alignItems: "center",
|
|
34
|
+
justifyContent: "center",
|
|
35
|
+
paddingTop: 16,
|
|
36
|
+
paddingBottom: 16,
|
|
37
|
+
}, children: [jsx(ModalH1, { children: "Insufficient balance." }), jsx(SelectAnotherMethodButton, {})] }));
|
|
38
|
+
}
|
|
39
|
+
function ConnectButton() {
|
|
40
|
+
const { connect } = useConnect();
|
|
41
|
+
const solanaWallets = useWallet();
|
|
42
|
+
// On Android, filter out the Android Intent deeplink fake wallet.
|
|
43
|
+
const filteredWallets = solanaWallets.wallets.filter((w) => w.adapter.name !== "Mobile Wallet Adapter");
|
|
44
|
+
const hasSolanaWallet = filteredWallets.length > 0;
|
|
45
|
+
const icons = [jsx(Ethereum, {}, "ethereum")];
|
|
46
|
+
if (hasSolanaWallet) {
|
|
47
|
+
icons.push(jsx(Solana, {}, "solana"));
|
|
48
|
+
}
|
|
49
|
+
const onClick = () => {
|
|
50
|
+
connect({
|
|
51
|
+
connector: injected(),
|
|
52
|
+
});
|
|
53
|
+
if (hasSolanaWallet) {
|
|
54
|
+
if (solanaWallets.wallet == null) {
|
|
55
|
+
solanaWallets.select(solanaWallets.wallets[0].adapter.name);
|
|
56
|
+
}
|
|
57
|
+
solanaWallets.connect();
|
|
58
|
+
}
|
|
59
|
+
};
|
|
60
|
+
const connectOption = {
|
|
61
|
+
id: "connect-wallet",
|
|
62
|
+
title: "Connect Wallet",
|
|
63
|
+
icons,
|
|
64
|
+
onClick,
|
|
65
|
+
};
|
|
66
|
+
return jsx(OptionsList, { options: [connectOption] });
|
|
27
67
|
}
|
|
28
68
|
|
|
29
69
|
export { SelectToken as default };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../../../src/components/Pages/SelectToken/index.tsx"],"sourcesContent":[null],"names":["_jsxs","_jsx"],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../../../src/components/Pages/SelectToken/index.tsx"],"sourcesContent":[null],"names":["_jsxs","_jsx"],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ import { useRozoPay } from '../../../hooks/useDaimoPay.js';
|
|
|
7
7
|
import styled from '../../../styles/styled/index.js';
|
|
8
8
|
import { USD_DECIMALS } from '../../../utils/format.js';
|
|
9
9
|
import { isValidNumber, sanitizeNumber } from '../../../utils/validateInput.js';
|
|
10
|
+
import { WALLET_ID_MOBILE_WALLETS } from '../../../wallets/useWallets.js';
|
|
10
11
|
import AmountInputField from '../../Common/AmountInput/AmountInputField.js';
|
|
11
12
|
import Button from '../../Common/Button/index.js';
|
|
12
13
|
import WalletPaymentSpinner from '../../Spinners/WalletPaymentSpinner/index.js';
|
|
@@ -33,8 +34,8 @@ const SelectWalletAmount = () => {
|
|
|
33
34
|
const amountUsd = Number(sanitizeNumber(usdInput));
|
|
34
35
|
setChosenUsd(amountUsd);
|
|
35
36
|
await hydrateOrder();
|
|
36
|
-
if (selectedWallet.
|
|
37
|
-
setPendingConnectorId(
|
|
37
|
+
if (selectedWallet.id === WALLET_ID_MOBILE_WALLETS) {
|
|
38
|
+
setPendingConnectorId(WALLET_ID_MOBILE_WALLETS);
|
|
38
39
|
setRoute(ROUTES.CONNECT);
|
|
39
40
|
}
|
|
40
41
|
else {
|