diff --git a/examples/react/src/config.ts b/examples/react/src/config.ts index 97f1657a..9a7e269e 100644 --- a/examples/react/src/config.ts +++ b/examples/react/src/config.ts @@ -81,7 +81,7 @@ export const config = }, walletConnect: { projectId: walletConnectProjectId - }, + } }) : createConfig('universal', { ...kitConfig, @@ -111,16 +111,12 @@ export const getErc1155SaleContractConfig = (walletAddress: string) => ({ // collectionAddress: '0x92473261f2c26f2264429c451f70b0192f858795', wallet: walletAddress, items: [ - { - tokenId: '1', - quantity: '1' - } - + tokenId: '1', + quantity: '1' + } ], onSuccess: () => { - console.log('success') - } }) diff --git a/examples/react/src/index.tsx b/examples/react/src/index.tsx index de817d13..0434e31c 100644 --- a/examples/react/src/index.tsx +++ b/examples/react/src/index.tsx @@ -4,7 +4,10 @@ import ReactDOM from 'react-dom/client' import './index.css' import { App } from './App' -console.log('VERSION:', process.env.PACKAGE_VERSION) +// @ts-ignore +console.log('VERSION:', __SEQUENCE_KIT_PACKAGE_VERSION__) +// @ts-ignore +console.log('DEBUG: ', __SEQUENCE_KIT_DEBUG__) const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement) root.render() diff --git a/examples/react/vite.config.js b/examples/react/vite.config.js index 0e4a0acc..b0ec1eb9 100644 --- a/examples/react/vite.config.js +++ b/examples/react/vite.config.js @@ -21,8 +21,8 @@ export default defineConfig(() => { svgrPlugin() ], define: { - 'process.env.PACKAGE_VERSION': JSON.stringify(process.env.npm_package_version), - 'process.env.DEBUG': JSON.stringify(process.env.DEBUG || false) + __SEQUENCE_KIT_PACKAGE_VERSION__: JSON.stringify(process.env.npm_package_version), + __SEQUENCE_KIT_DEBUG__: JSON.stringify(process.env.DEBUG || false) }, resolve: { dedupe: ['wagmi', 'viem'] diff --git a/packages/checkout/CHANGELOG.md b/packages/checkout/CHANGELOG.md index ec8b50f6..829bdda9 100644 --- a/packages/checkout/CHANGELOG.md +++ b/packages/checkout/CHANGELOG.md @@ -1,5 +1,14 @@ # @0xsequence/kit-connectors +## 4.5.8 + +### Patch Changes + +- Fixing process.env inclusion + +- Updated dependencies []: + - @0xsequence/kit@4.5.8 + ## 4.5.7 ### Patch Changes diff --git a/packages/checkout/package.json b/packages/checkout/package.json index 84ced684..2524c5bc 100644 --- a/packages/checkout/package.json +++ b/packages/checkout/package.json @@ -1,6 +1,6 @@ { "name": "@0xsequence/kit-checkout", - "version": "4.5.7", + "version": "4.5.8", "description": "Checkout UI for Sequence Kit", "repository": "https://github.com/0xsequence/kit/tree/master/packages/checkout", "author": "Horizon Blockchain Games", diff --git a/packages/checkout/src/api/data.ts b/packages/checkout/src/api/data.ts index 05300a10..eb28d86e 100644 --- a/packages/checkout/src/api/data.ts +++ b/packages/checkout/src/api/data.ts @@ -1,3 +1,4 @@ +import { DEBUG } from '@0xsequence/kit' import { TokenMetadata } from '@0xsequence/metadata' import { ChainId, networks } from '@0xsequence/network' @@ -24,8 +25,8 @@ export const fetchSardineClientToken = async ({ tokenMetadata }: FetchSardineClientTokenArgs): Promise => { // Test credentials: https://docs.sardine.ai/docs/integrate-payments/nft-checkout-testing-credentials - const accessKey = process.env.DEBUG ? '17xhjK4yjRf1fr0am8kgKfICAAAAAAAAA' : projectAccessKey - const url = process.env.DEBUG + const accessKey = DEBUG ? '17xhjK4yjRf1fr0am8kgKfICAAAAAAAAA' : projectAccessKey + const url = DEBUG ? 'https://dev-api.sequence.app/rpc/API/SardineGetNFTCheckoutToken' : 'https://api.sequence.app/rpc/API/SardineGetNFTCheckoutToken' @@ -68,8 +69,8 @@ export const fetchSardineClientToken = async ({ export const fetchSardineOrderStatus = async (orderId: string, projectAccessKey: string) => { // Test credentials: https://docs.sardine.ai/docs/integrate-payments/nft-checkout-testing-credentials - const accessKey = process.env.DEBUG ? '17xhjK4yjRf1fr0am8kgKfICAAAAAAAAA' : projectAccessKey - const url = process.env.DEBUG + const accessKey = DEBUG ? '17xhjK4yjRf1fr0am8kgKfICAAAAAAAAA' : projectAccessKey + const url = DEBUG ? 'https://dev-api.sequence.app/rpc/API/SardineGetNFTCheckoutOrderStatus' : 'https://api.sequence.app/rpc/API/SardineGetNFTCheckoutOrderStatus' const response = await fetch(url, { diff --git a/packages/checkout/src/contexts/SelectPaymentModal.ts b/packages/checkout/src/contexts/SelectPaymentModal.ts index 39ab36fd..16811478 100644 --- a/packages/checkout/src/contexts/SelectPaymentModal.ts +++ b/packages/checkout/src/contexts/SelectPaymentModal.ts @@ -1,8 +1,9 @@ import { Hex } from 'viem' -import { createGenericContext } from './genericContext' import type { TransakConfig } from '../contexts/CheckoutModal' +import { createGenericContext } from './genericContext' + export type CreditCardProviders = 'sardine' | 'transak' export interface Collectible { diff --git a/packages/checkout/src/contexts/SwapModal.ts b/packages/checkout/src/contexts/SwapModal.ts index 270a9493..423cbdd2 100644 --- a/packages/checkout/src/contexts/SwapModal.ts +++ b/packages/checkout/src/contexts/SwapModal.ts @@ -1,9 +1,9 @@ 'use client' -import { createGenericContext } from './genericContext' - import { Hex } from 'viem' +import { createGenericContext } from './genericContext' + interface Transaction { to: Hex data?: Hex diff --git a/packages/checkout/src/contexts/TransactionStatusModal.ts b/packages/checkout/src/contexts/TransactionStatusModal.ts index 1ecafa67..bb934b39 100644 --- a/packages/checkout/src/contexts/TransactionStatusModal.ts +++ b/packages/checkout/src/contexts/TransactionStatusModal.ts @@ -1,5 +1,3 @@ -import { Hex } from 'viem' - import { createGenericContext } from './genericContext' interface Item { diff --git a/packages/checkout/src/hooks/useCheckoutOptionsSalesContract.ts b/packages/checkout/src/hooks/useCheckoutOptionsSalesContract.ts index bab7f649..bffbfa1d 100644 --- a/packages/checkout/src/hooks/useCheckoutOptionsSalesContract.ts +++ b/packages/checkout/src/hooks/useCheckoutOptionsSalesContract.ts @@ -1,5 +1,6 @@ -import { useQuery } from '@tanstack/react-query' import { CheckoutOptionsSalesContractArgs } from '@0xsequence/marketplace' +import { useQuery } from '@tanstack/react-query' + import { useMarketplaceClient } from './useMarketplaceClient' export interface UseGenerateBuyTransactionOptions { diff --git a/packages/checkout/src/hooks/useERC1155SaleContractCheckout.ts b/packages/checkout/src/hooks/useERC1155SaleContractCheckout.ts index d306f5ff..970b4026 100644 --- a/packages/checkout/src/hooks/useERC1155SaleContractCheckout.ts +++ b/packages/checkout/src/hooks/useERC1155SaleContractCheckout.ts @@ -1,14 +1,13 @@ -import { CheckoutOptionsSalesContractArgs } from '@0xsequence/marketplace' +import { CheckoutOptionsSalesContractArgs, TransactionSwapProvider } from '@0xsequence/marketplace' import { findSupportedNetwork } from '@0xsequence/network' -import { TransactionSwapProvider, TransactionNFTCheckoutProvider } from '@0xsequence/marketplace' +import { Abi, Hex } from 'viem' +import { useReadContract, useReadContracts } from 'wagmi' -import { useERC1155SaleContractPaymentModal } from './useSelectPaymentModal' -import { useCheckoutOptionsSalesContract } from './useCheckoutOptionsSalesContract' import { ERC_1155_SALE_CONTRACT } from '../constants/abi' import { SelectPaymentSettings } from '../contexts/SelectPaymentModal' -import { Abi, Hex, padBytes } from 'viem' -import { useReadContract, useReadContracts } from 'wagmi' +import { useCheckoutOptionsSalesContract } from './useCheckoutOptionsSalesContract' +import { useERC1155SaleContractPaymentModal } from './useSelectPaymentModal' type BasePaymentModalSettings = Pick< SelectPaymentSettings, diff --git a/packages/checkout/src/hooks/useMarketplaceClient.ts b/packages/checkout/src/hooks/useMarketplaceClient.ts index 8e1a0f48..ae20a6ca 100644 --- a/packages/checkout/src/hooks/useMarketplaceClient.ts +++ b/packages/checkout/src/hooks/useMarketplaceClient.ts @@ -1,4 +1,4 @@ -import { useProjectAccessKey } from '@0xsequence/kit' +import { DEBUG, useProjectAccessKey } from '@0xsequence/kit' import { MarketplaceIndexer } from '@0xsequence/marketplace' import { networks, stringTemplate } from '@0xsequence/network' import { useMemo } from 'react' @@ -11,7 +11,7 @@ export const useMarketplaceClient = ({ chain }: UseMarketplaceClientArgs) => { const projectAccessKey = useProjectAccessKey() const marketplaceClient = useMemo(() => { - const env = process.env.DEBUG ? 'development' : 'production' + const env = DEBUG ? 'development' : 'production' const clientUrl = marketplaceApiURL(chain, env) return new MarketplaceIndexer(clientUrl, projectAccessKey) }, [projectAccessKey]) diff --git a/packages/checkout/src/hooks/useSkipOnCloseCallback.ts b/packages/checkout/src/hooks/useSkipOnCloseCallback.ts index 70638f48..230aef17 100644 --- a/packages/checkout/src/hooks/useSkipOnCloseCallback.ts +++ b/packages/checkout/src/hooks/useSkipOnCloseCallback.ts @@ -1,4 +1,4 @@ -import { useEffect, useRef, MutableRefObject } from 'react' +import { useEffect, useRef } from 'react' interface UseSkipOnCloseCallbackReturn { skipOnCloseCallback: () => void @@ -6,7 +6,7 @@ interface UseSkipOnCloseCallbackReturn { export const useSkipOnCloseCallback = (onClose: () => void): UseSkipOnCloseCallbackReturn => { const skipOnCloseCallbackFlag = useRef(false) - + const skipOnCloseCallback = () => { skipOnCloseCallbackFlag.current = true } @@ -22,4 +22,4 @@ export const useSkipOnCloseCallback = (onClose: () => void): UseSkipOnCloseCallb return { skipOnCloseCallback } -} \ No newline at end of file +} diff --git a/packages/checkout/src/utils/sardine.ts b/packages/checkout/src/utils/sardine.ts index 804588e0..5b90bcdd 100644 --- a/packages/checkout/src/utils/sardine.ts +++ b/packages/checkout/src/utils/sardine.ts @@ -1,3 +1,4 @@ +import { DEBUG } from '@0xsequence/kit' import { ChainId, networks } from '@0xsequence/network' import { ethers } from 'ethers' @@ -12,9 +13,9 @@ export const checkSardineWhitelistStatus = async ( ) => { const referenceId = `sequence-kit-sardine-whitelist-check` - const accessKey = process.env.DEBUG ? '17xhjK4yjRf1fr0am8kgKfICAAAAAAAAA' : projectAccessKey + const accessKey = DEBUG ? '17xhjK4yjRf1fr0am8kgKfICAAAAAAAAA' : projectAccessKey - const url = process.env.DEBUG + const url = DEBUG ? 'https://dev-api.sequence.app/rpc/API/SardineGetNFTCheckoutToken' : 'https://api.sequence.app/rpc/API/SardineGetNFTCheckoutToken' diff --git a/packages/checkout/src/utils/transak.ts b/packages/checkout/src/utils/transak.ts index 893cf319..f9c0b954 100644 --- a/packages/checkout/src/utils/transak.ts +++ b/packages/checkout/src/utils/transak.ts @@ -1,11 +1,13 @@ +import { DEBUG } from '@0xsequence/kit' + import { AddFundsSettings } from '../contexts' export const TRANSAK_API_KEY = '5911d9ec-46b5-48fa-a755-d59a715ff0cf' export const TRANSAK_API_KEY_STAGING = 'c20f2a0e-fe6a-4133-8fa7-77e9f84edf98' export const TRANSAK_PROXY_ADDRESS = '0x4a598b7ec77b1562ad0df7dc64a162695ce4c78a' -const TransakUrlProd = 'https://global.transak.com'; -const TransakUrlSandbox = 'https://global-stg.transak.com'; +const TransakUrlProd = 'https://global.transak.com' +const TransakUrlSandbox = 'https://global-stg.transak.com' export const getTransakLink = (addFundsSettings: AddFundsSettings) => { const defaultNetworks = @@ -15,8 +17,8 @@ export const getTransakLink = (addFundsSettings: AddFundsSettings) => { [index: string]: string | undefined } - const url = new URL(process.env.DEBUG ? TransakUrlSandbox : TransakUrlProd); - const apiKey = process.env.DEBUG ? TRANSAK_API_KEY_STAGING : TRANSAK_API_KEY; + const url = new URL(DEBUG ? TransakUrlSandbox : TransakUrlProd) + const apiKey = DEBUG ? TRANSAK_API_KEY_STAGING : TRANSAK_API_KEY const options: Options = { apiKey: apiKey, diff --git a/packages/checkout/src/views/AddFunds.tsx b/packages/checkout/src/views/AddFunds.tsx index 9f71c088..ffdaf198 100644 --- a/packages/checkout/src/views/AddFunds.tsx +++ b/packages/checkout/src/views/AddFunds.tsx @@ -5,10 +5,10 @@ import { HEADER_HEIGHT } from '../constants' import { useAddFundsModal } from '../hooks' import { getTransakLink } from '../utils/transak' -const IframeId = 'sequenceOnRamp'; -const EventTypeOrderCreated = 'TRANSAK_ORDER_CREATED'; -const EventTypeOrderSuccessful = 'TRANSAK_ORDER_SUCCESSFUL'; -const EventTypeOrderFailed = 'TRANSAK_ORDER_FAILED'; +const IframeId = 'sequenceOnRamp' +const EventTypeOrderCreated = 'TRANSAK_ORDER_CREATED' +const EventTypeOrderSuccessful = 'TRANSAK_ORDER_SUCCESSFUL' +const EventTypeOrderFailed = 'TRANSAK_ORDER_FAILED' export const AddFundsContent = () => { const { addFundsSettings } = useAddFundsModal() @@ -18,28 +18,28 @@ export const AddFundsContent = () => { } useEffect(() => { - window.addEventListener('message', messageReceived); + window.addEventListener('message', messageReceived) return () => { - window.removeEventListener('message', messageReceived); - }; - }, []); + window.removeEventListener('message', messageReceived) + } + }, []) function messageReceived(message: MessageEvent) { - const element = document.getElementById(IframeId) as HTMLIFrameElement | undefined; - const iframe = element?.contentWindow; + const element = document.getElementById(IframeId) as HTMLIFrameElement | undefined + const iframe = element?.contentWindow if (message.source === iframe) { - const data = message.data; - const eventType = data.eventType as string; + const data = message.data + const eventType = data.eventType as string switch (eventType) { case EventTypeOrderCreated: - addFundsSettings?.onOrderCreated?.(data); - break; + addFundsSettings?.onOrderCreated?.(data) + break case EventTypeOrderSuccessful: - addFundsSettings?.onOrderSuccessful?.(data); - break; + addFundsSettings?.onOrderSuccessful?.(data) + break case EventTypeOrderFailed: - addFundsSettings?.onOrderFailed?.(data); - break; + addFundsSettings?.onOrderFailed?.(data) + break } } } diff --git a/packages/checkout/src/views/PaymentSelection/Footer.tsx b/packages/checkout/src/views/PaymentSelection/Footer.tsx index 50f46cdd..826dd1df 100644 --- a/packages/checkout/src/views/PaymentSelection/Footer.tsx +++ b/packages/checkout/src/views/PaymentSelection/Footer.tsx @@ -1,4 +1,5 @@ import { Box, Text } from '@0xsequence/design-system' + import { useSelectPaymentModal } from '../../hooks' export const Footer = () => { diff --git a/packages/checkout/src/views/PaymentSelection/PayWithCreditCard/index.tsx b/packages/checkout/src/views/PaymentSelection/PayWithCreditCard/index.tsx index b5cb010b..69fea4b1 100644 --- a/packages/checkout/src/views/PaymentSelection/PayWithCreditCard/index.tsx +++ b/packages/checkout/src/views/PaymentSelection/PayWithCreditCard/index.tsx @@ -1,18 +1,7 @@ -import { useEffect } from 'react' -import { - ArrowRightIcon, - Box, - Card, - PaymentsIcon, - SendIcon, - Spinner, - Text, - Scroll, - useMediaQuery -} from '@0xsequence/design-system' +import { ArrowRightIcon, Box, Card, PaymentsIcon, Spinner, Text } from '@0xsequence/design-system' import { useContractInfo } from '@0xsequence/kit' import { findSupportedNetwork } from '@0xsequence/network' -import { useState } from 'react' +import { useEffect, useState } from 'react' import { useAccount } from 'wagmi' import { SelectPaymentSettings } from '../../../contexts' diff --git a/packages/checkout/src/views/PaymentSelection/PayWithCrypto/index.tsx b/packages/checkout/src/views/PaymentSelection/PayWithCrypto/index.tsx index 9b29a489..941ccc6f 100644 --- a/packages/checkout/src/views/PaymentSelection/PayWithCrypto/index.tsx +++ b/packages/checkout/src/views/PaymentSelection/PayWithCrypto/index.tsx @@ -92,8 +92,8 @@ export const PayWithCrypto = ({ const balanceInfo = currencyBalanceData?.find(balanceData => compareAddress(currencyAddress, balanceData.contractAddress)) const balance: bigint = BigInt(balanceInfo?.balance || '0') - let balanceFormatted = Number(formatUnits(balance, currencyInfoData?.decimals || 0)) - balanceFormatted = Math.trunc(Number(balanceFormatted) * 10000) / 10000 + // let balanceFormatted = Number(formatUnits(balance, currencyInfoData?.decimals || 0)) + // balanceFormatted = Math.trunc(Number(balanceFormatted) * 10000) / 10000 const isNotEnoughFunds: boolean = BigInt(price) > balance diff --git a/packages/checkout/src/views/PaymentSelection/TransferFunds.tsx b/packages/checkout/src/views/PaymentSelection/TransferFunds.tsx index 7325d044..3892ddb7 100644 --- a/packages/checkout/src/views/PaymentSelection/TransferFunds.tsx +++ b/packages/checkout/src/views/PaymentSelection/TransferFunds.tsx @@ -1,10 +1,10 @@ -import { useState, useEffect } from 'react' import { Box, Card, CheckmarkIcon, CopyIcon, IconButton, Text, truncateAddress } from '@0xsequence/design-system' +import { QRCodeCanvas } from 'qrcode.react' +import { useState, useEffect } from 'react' import { CopyToClipboard } from 'react-copy-to-clipboard' +import { useAccount } from 'wagmi' import { useSelectPaymentModal, useTransferFundsModal } from '../../hooks' -import { QRCodeCanvas } from 'qrcode.react' -import { useAccount } from 'wagmi' export const TransferFunds = () => { const { openTransferFundsModal } = useTransferFundsModal() diff --git a/packages/checkout/src/views/PaymentSelection/index.tsx b/packages/checkout/src/views/PaymentSelection/index.tsx index b6290a80..ef986f31 100644 --- a/packages/checkout/src/views/PaymentSelection/index.tsx +++ b/packages/checkout/src/views/PaymentSelection/index.tsx @@ -12,7 +12,13 @@ import { } from '@0xsequence/kit' import { findSupportedNetwork } from '@0xsequence/network' import { useState, useEffect } from 'react' -import { encodeFunctionData, formatUnits, Hex, zeroAddress } from 'viem' +import { encodeFunctionData, Hex, zeroAddress } from 'viem' +import { usePublicClient, useWalletClient, useReadContract, useAccount } from 'wagmi' + +import { HEADER_HEIGHT } from '../../constants' +import { ERC_20_CONTRACT_ABI } from '../../constants/abi' +import { useClearCachedBalances, useSelectPaymentModal, useTransactionStatusModal, useSkipOnCloseCallback } from '../../hooks' +import { NavigationHeader } from '../../shared/components/NavigationHeader' import { Footer } from './Footer' import { OrderSummary } from './OrderSummary' @@ -20,13 +26,6 @@ import { PayWithCreditCard } from './PayWithCreditCard' import { PayWithCrypto } from './PayWithCrypto/index' import { TransferFunds } from './TransferFunds' -import { usePublicClient, useWalletClient, useReadContract, useAccount } from 'wagmi' - -import { HEADER_HEIGHT } from '../../constants' -import { NavigationHeader } from '../../shared/components/NavigationHeader' -import { ERC_20_CONTRACT_ABI } from '../../constants/abi' -import { useClearCachedBalances, useSelectPaymentModal, useTransactionStatusModal, useSkipOnCloseCallback } from '../../hooks' - export const PaymentSelection = () => { return ( <> @@ -93,7 +92,7 @@ export const PaymentSelectionContent = () => { } }) - const { data: currencyBalanceData, isLoading: currencyBalanceIsLoading } = useBalancesSummary({ + const { data: _currencyBalanceData, isLoading: currencyBalanceIsLoading } = useBalancesSummary({ chainIds: [chainId], filter: { accountAddresses: userAddress ? [userAddress] : [], @@ -105,12 +104,12 @@ export const PaymentSelectionContent = () => { omitMetadata: true }) - const { data: currencyInfoData, isLoading: isLoadingCurrencyInfo } = useContractInfo(chainId, currencyAddress) + const { data: _currencyInfoData, isLoading: isLoadingCurrencyInfo } = useContractInfo(chainId, currencyAddress) const buyCurrencyAddress = currencyAddress const sellCurrencyAddress = selectedCurrency || '' - const { data: swapPrices = [], isLoading: swapPricesIsLoading } = useSwapPrices( + const { data: swapPrices = [], isLoading: _swapPricesIsLoading } = useSwapPrices( { userAddress: userAddress ?? '', buyCurrencyAddress, @@ -141,11 +140,10 @@ export const PaymentSelectionContent = () => { const isApproved: boolean = (allowanceData as bigint) >= BigInt(price) || isNativeToken - const balanceInfo = currencyBalanceData?.find(balanceData => compareAddress(currencyAddress, balanceData.contractAddress)) - - const balance: bigint = BigInt(balanceInfo?.balance || '0') - let balanceFormatted = Number(formatUnits(balance, currencyInfoData?.decimals || 0)) - balanceFormatted = Math.trunc(Number(balanceFormatted) * 10000) / 10000 + // const balanceInfo = currencyBalanceData?.find(balanceData => compareAddress(currencyAddress, balanceData.contractAddress)) + // const balance: bigint = BigInt(balanceInfo?.balance || '0') + // let balanceFormatted = Number(formatUnits(balance, currencyInfoData?.decimals || 0)) + // balanceFormatted = Math.trunc(Number(balanceFormatted) * 10000) / 10000 useEffect(() => { clearCachedBalances() diff --git a/packages/checkout/src/views/PendingCreditCardTransaction.tsx b/packages/checkout/src/views/PendingCreditCardTransaction.tsx index 19f863e9..b954ed04 100644 --- a/packages/checkout/src/views/PendingCreditCardTransaction.tsx +++ b/packages/checkout/src/views/PendingCreditCardTransaction.tsx @@ -1,5 +1,5 @@ import { Box, Spinner, Text } from '@0xsequence/design-system' -import { useProjectAccessKey, useContractInfo, useTokenMetadata } from '@0xsequence/kit' +import { useProjectAccessKey, useContractInfo, useTokenMetadata, DEBUG } from '@0xsequence/kit' import { findSupportedNetwork } from '@0xsequence/network' import pako from 'pako' import { useEffect } from 'react' @@ -68,7 +68,7 @@ export const PendingCreditCardTransactionTransak = ({ skipOnCloseCallback }: Pen const transakConfig = settings?.creditCardCheckout?.transakConfig - const baseUrl = process.env.DEBUG ? 'https://global-stg.transak.com' : 'https://global.transak.com' + const baseUrl = DEBUG ? 'https://global-stg.transak.com' : 'https://global.transak.com' // Transak requires the recipient address to be the proxy address // so we need to replace the recipient address with the proxy address in the calldata @@ -228,7 +228,7 @@ export const PendingCreditCardTransactionTransak = ({ skipOnCloseCallback }: Pen export const PendingCreditCardTransactionSardine = ({ skipOnCloseCallback }: PendingCreditTransactionProps) => { const { openTransactionStatusModal } = useTransactionStatusModal() const nav = useNavigation() - const { settings, closeCheckout } = useCheckoutModal() + const { closeCheckout } = useCheckoutModal() const { params: { creditCardCheckout } @@ -256,7 +256,7 @@ export const PendingCreditCardTransactionSardine = ({ skipOnCloseCallback }: Pen const authToken = data?.token - const url = process.env.DEBUG + const url = DEBUG ? `https://sardine-checkout-sandbox.sequence.info?api_url=https://sardine-api-sandbox.sequence.info&client_token=${authToken}&show_features=true` : `https://sardine-checkout.sequence.info?api_url=https://sardine-api.sequence.info&client_token=${authToken}&show_features=true` diff --git a/packages/checkout/src/views/Swap/index.tsx b/packages/checkout/src/views/Swap/index.tsx index 0f05ae97..90ec851e 100644 --- a/packages/checkout/src/views/Swap/index.tsx +++ b/packages/checkout/src/views/Swap/index.tsx @@ -1,13 +1,13 @@ -import { useState } from 'react' import { Box, Button, Spinner, Text } from '@0xsequence/design-system' import { compareAddress, formatDisplay, useContractInfo, useSwapPrices, useSwapQuote, sendTransactions } from '@0xsequence/kit' import { findSupportedNetwork } from '@0xsequence/network' +import { useState } from 'react' import { zeroAddress, formatUnits, Hex } from 'viem' import { useAccount, usePublicClient, useWalletClient } from 'wagmi' -import { CryptoOption } from '../PaymentSelection/PayWithCrypto/CryptoOption' import { HEADER_HEIGHT } from '../../constants' import { useSwapModal, useTransactionStatusModal } from '../../hooks' +import { CryptoOption } from '../PaymentSelection/PayWithCrypto/CryptoOption' export const Swap = () => { const { openTransactionStatusModal } = useTransactionStatusModal() diff --git a/packages/checkout/src/views/TransactionStatus/index.tsx b/packages/checkout/src/views/TransactionStatus/index.tsx index 8aa00560..04e318c6 100644 --- a/packages/checkout/src/views/TransactionStatus/index.tsx +++ b/packages/checkout/src/views/TransactionStatus/index.tsx @@ -1,4 +1,3 @@ -import { useState, useEffect } from 'react' import { ArrowDownIcon, Box, @@ -11,9 +10,6 @@ import { CloseIcon, truncateAddress } from '@0xsequence/design-system' -import TimeAgo from 'timeago-react' -import { formatUnits, Hex, PublicClient } from 'viem' -import { usePublicClient } from 'wagmi' import { CollectibleTileImage, useContractInfo, @@ -22,6 +18,10 @@ import { TRANSACTION_CONFIRMATIONS_DEFAULT } from '@0xsequence/kit' import { findSupportedNetwork } from '@0xsequence/network' +import { useState, useEffect } from 'react' +import TimeAgo from 'timeago-react' +import { formatUnits, Hex, PublicClient } from 'viem' +import { usePublicClient } from 'wagmi' import { HEADER_HEIGHT } from '../../constants' import { useTransactionStatusModal } from '../../hooks' diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md index 35d24ef3..a5c84388 100644 --- a/packages/kit/CHANGELOG.md +++ b/packages/kit/CHANGELOG.md @@ -1,5 +1,11 @@ # @0xsequence/kit +## 4.5.8 + +### Patch Changes + +- Fixing process.env inclusion + ## 4.5.7 ### Patch Changes diff --git a/packages/kit/package.json b/packages/kit/package.json index 952e2b6d..eb24337e 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -1,6 +1,6 @@ { "name": "@0xsequence/kit", - "version": "4.5.7", + "version": "4.5.8", "description": "Core package for Sequence Kit", "keywords": [ "sequence", diff --git a/packages/kit/src/connectors/wagmiConnectors/sequenceWaasConnector.ts b/packages/kit/src/connectors/wagmiConnectors/sequenceWaasConnector.ts index 24e5aed3..65905169 100644 --- a/packages/kit/src/connectors/wagmiConnectors/sequenceWaasConnector.ts +++ b/packages/kit/src/connectors/wagmiConnectors/sequenceWaasConnector.ts @@ -20,6 +20,7 @@ import { import { createConnector } from 'wagmi' import { LocalStorageKey } from '../../constants/localStorage' +import { DEBUG } from '../../env' export interface SequenceWaasConnectConfig { googleClientId?: string @@ -51,7 +52,7 @@ export function sequenceWaasWallet(params: BaseSequenceWaasConnectorOptions) { [LocalStorageKey.WaasSignInEmail]: string } - const nodesUrl = process.env.DEBUG ? 'https://dev-nodes.sequence.app' : 'https://nodes.sequence.app' + const nodesUrl = DEBUG ? 'https://dev-nodes.sequence.app' : 'https://nodes.sequence.app' const showConfirmationModal = params.enableConfirmationModal ?? false diff --git a/packages/kit/src/constants/localStorage.ts b/packages/kit/src/constants/localStorage.ts index 3423b2fa..9650b5e5 100644 --- a/packages/kit/src/constants/localStorage.ts +++ b/packages/kit/src/constants/localStorage.ts @@ -1,5 +1,3 @@ -import { Sign } from 'crypto' - const PREFIX = '@kit' const SETTINGS = 'settings' const THEME = 'theme' diff --git a/packages/kit/src/env.ts b/packages/kit/src/env.ts new file mode 100644 index 00000000..cd093741 --- /dev/null +++ b/packages/kit/src/env.ts @@ -0,0 +1,2 @@ +// @ts-ignore +export const DEBUG = !!globalThis.__SEQUENCE_KIT_DEBUG__ diff --git a/packages/kit/src/hooks/data.ts b/packages/kit/src/hooks/data.ts index 21957665..9e2def6d 100644 --- a/packages/kit/src/hooks/data.ts +++ b/packages/kit/src/hooks/data.ts @@ -1,24 +1,26 @@ import { SequenceAPIClient, Token, SwapPrice, GetSwapQuoteArgs } from '@0xsequence/api' -import { ContractType, Page, SequenceIndexer, TokenBalance } from '@0xsequence/indexer' +import { + ContractType, + Page, + SequenceIndexer, + TokenBalance, + ContractVerificationStatus, + GetTokenBalancesSummaryArgs, + GetTokenBalancesDetailsArgs, + GetTokenBalancesByContractArgs +} from '@0xsequence/indexer' import { ContractInfo, SequenceMetadata } from '@0xsequence/metadata' import { findSupportedNetwork } from '@0xsequence/network' import { useInfiniteQuery, useQuery } from '@tanstack/react-query' import { zeroAddress } from 'viem' -import { compareAddress } from '../utils/helpers' import { NATIVE_TOKEN_ADDRESS_0X } from '../constants' +import { compareAddress } from '../utils/helpers' import { useAPIClient } from './useAPIClient' import { useIndexerClient, useIndexerClients } from './useIndexerClient' import { useMetadataClient } from './useMetadataClient' -import { - ContractVerificationStatus, - GetTokenBalancesSummaryArgs, - GetTokenBalancesDetailsArgs, - GetTokenBalancesByContractArgs -} from '@0xsequence/indexer' - export const time = { oneSecond: 1 * 1000, oneMinute: 60 * 1000, @@ -545,7 +547,7 @@ const getSwapPrices = async ( const isNativeToken = compareAddress(currencyAddress, zeroAddress) if (currencyAddress && !currencyInfoMap.has(currencyAddress)) { const getNativeTokenInfo = () => - new Promise((resolve, reject) => { + new Promise(resolve => { resolve({ ...network?.nativeToken, logoURI: network?.logoURI || '', diff --git a/packages/kit/src/hooks/useAPIClient.ts b/packages/kit/src/hooks/useAPIClient.ts index dbdebdc6..7327c093 100644 --- a/packages/kit/src/hooks/useAPIClient.ts +++ b/packages/kit/src/hooks/useAPIClient.ts @@ -1,14 +1,14 @@ import { SequenceAPIClient } from '@0xsequence/api' import { useMemo } from 'react' -import { useKitConfig } from '../contexts/KitConfig' +import { DEBUG } from '../env' import { useProjectAccessKey } from './useProjectAccessKey' export const useAPIClient = () => { const projectAccessKey = useProjectAccessKey() - const clientUrl = process.env.DEBUG ? 'https://dev-api.sequence.app' : 'https://api.sequence.app' + const clientUrl = DEBUG ? 'https://dev-api.sequence.app' : 'https://api.sequence.app' const apiClient = useMemo(() => { return new SequenceAPIClient(clientUrl, projectAccessKey) diff --git a/packages/kit/src/hooks/useIndexerClient.ts b/packages/kit/src/hooks/useIndexerClient.ts index d9466693..1ae98a09 100644 --- a/packages/kit/src/hooks/useIndexerClient.ts +++ b/packages/kit/src/hooks/useIndexerClient.ts @@ -2,7 +2,7 @@ import { SequenceIndexer } from '@0xsequence/indexer' import { ChainId, networks } from '@0xsequence/network' import { useMemo } from 'react' -import { useKitConfig } from '../contexts/KitConfig' +import { DEBUG } from '../env' import { useProjectAccessKey } from './useProjectAccessKey' @@ -14,9 +14,7 @@ export const useIndexerClient = (chainId: ChainId) => { }, [projectAccessKey]) const network = networks[chainId] - const clientUrl = process.env.DEBUG - ? `https://dev-${network.name}-indexer.sequence.app` - : `https://${network.name}-indexer.sequence.app` + const clientUrl = DEBUG ? `https://dev-${network.name}-indexer.sequence.app` : `https://${network.name}-indexer.sequence.app` if (!indexerClients.has(chainId)) { indexerClients.set(chainId, new SequenceIndexer(clientUrl, projectAccessKey)) @@ -42,9 +40,7 @@ export const useIndexerClients = (chainIds: ChainId[]) => { for (const chainId of chainIds) { const network = networks[chainId] - const clientUrl = process.env.DEBUG - ? `https://dev-${network.name}-indexer.sequence.app` - : `https://${network.name}-indexer.sequence.app` + const clientUrl = DEBUG ? `https://dev-${network.name}-indexer.sequence.app` : `https://${network.name}-indexer.sequence.app` if (!indexerClients.has(chainId)) { indexerClients.set(chainId, new SequenceIndexer(clientUrl, projectAccessKey)) diff --git a/packages/kit/src/hooks/useMetadataClient.ts b/packages/kit/src/hooks/useMetadataClient.ts index 2e5e0e9d..982779cc 100644 --- a/packages/kit/src/hooks/useMetadataClient.ts +++ b/packages/kit/src/hooks/useMetadataClient.ts @@ -1,7 +1,7 @@ import { SequenceMetadata } from '@0xsequence/metadata' import { useMemo } from 'react' -import { useKitConfig } from '../contexts/KitConfig' +import { DEBUG } from '../env' import { useProjectAccessKey } from './useProjectAccessKey' @@ -9,7 +9,7 @@ export const useMetadataClient = () => { const projectAccessKey = useProjectAccessKey() const metadataClient = useMemo(() => { - const clientUrl = process.env.DEBUG ? 'https://dev-metadata.sequence.app' : 'https://metadata.sequence.app' + const clientUrl = DEBUG ? 'https://dev-metadata.sequence.app' : 'https://metadata.sequence.app' return new SequenceMetadata(clientUrl, projectAccessKey) }, [projectAccessKey]) diff --git a/packages/kit/src/hooks/useWaasEmailAuth.ts b/packages/kit/src/hooks/useWaasEmailAuth.ts index cd76db90..fa1b184d 100644 --- a/packages/kit/src/hooks/useWaasEmailAuth.ts +++ b/packages/kit/src/hooks/useWaasEmailAuth.ts @@ -1,7 +1,7 @@ import { SequenceWaaS, SignInResponse } from '@0xsequence/waas' import { useState } from 'react' -import { EmailWaasOptions } from '../connectors/email/emailWaas' +// import { EmailWaasOptions } from '../connectors/email/emailWaas' import { randomName } from '../connectors/wagmiConnectors' import { ExtendedConnector } from '../types' @@ -32,10 +32,10 @@ export function useEmailAuth({ } } - const [email, setEmail] = useState('') + const [_email, setEmail] = useState('') const [error, setError] = useState() const [loading, setLoading] = useState(false) - const [instance, setInstance] = useState('') + const [instance, _setInstance] = useState('') const [respondWithCode, setRespondWithCode] = useState<((code: string) => Promise) | null>() const getSequenceWaas = () => { @@ -53,7 +53,7 @@ export function useEmailAuth({ } const initiateAuth = async (email: string) => { - const params = (connector as any).params as EmailWaasOptions + // const params = (connector as any).params as EmailWaasOptions const waas = getSequenceWaas() setLoading(true) @@ -80,8 +80,8 @@ export function useEmailAuth({ } const sendChallengeAnswer = async (answer: string) => { - const params = (connector as any).params as EmailWaasOptions - const waas = getSequenceWaas() + // const params = (connector as any).params as EmailWaasOptions + // const waas = getSequenceWaas() setLoading(true) setError(undefined) diff --git a/packages/kit/src/index.ts b/packages/kit/src/index.ts index 1cfd3aec..993365e0 100644 --- a/packages/kit/src/index.ts +++ b/packages/kit/src/index.ts @@ -128,3 +128,6 @@ export { CollectibleTileImage } from './components/CollectibleTileImage' // Indexer export { ContractVerificationStatus } from '@0xsequence/indexer' + +// XXX +export { DEBUG } from './env' diff --git a/packages/kit/src/utils/transactions.ts b/packages/kit/src/utils/transactions.ts index 08014e40..923af1bc 100644 --- a/packages/kit/src/utils/transactions.ts +++ b/packages/kit/src/utils/transactions.ts @@ -1,7 +1,7 @@ import { sequence } from '0xsequence' import { SequenceWaaS } from '@0xsequence/waas' import { PublicClient, WalletClient, Hex } from 'viem' -import { Connector, Config } from 'wagmi' +import { Connector } from 'wagmi' import { TRANSACTION_CONFIRMATIONS_DEFAULT } from '../constants' import { ExtendedConnector } from '../types' diff --git a/packages/wallet/CHANGELOG.md b/packages/wallet/CHANGELOG.md index 049d6231..5b287be9 100644 --- a/packages/wallet/CHANGELOG.md +++ b/packages/wallet/CHANGELOG.md @@ -1,5 +1,14 @@ # @0xsequence/kit-wallet +## 4.5.8 + +### Patch Changes + +- Fixing process.env inclusion + +- Updated dependencies []: + - @0xsequence/kit@4.5.8 + ## 4.5.7 ### Patch Changes diff --git a/packages/wallet/package.json b/packages/wallet/package.json index 7792b975..0a0ac194 100644 --- a/packages/wallet/package.json +++ b/packages/wallet/package.json @@ -1,6 +1,6 @@ { "name": "@0xsequence/kit-wallet", - "version": "4.5.7", + "version": "4.5.8", "description": "Wallet UI for Sequence Kit", "repository": "https://github.com/0xsequence/kit/tree/master/packages/wallet", "author": "Horizon Blockchain Games", diff --git a/packages/wallet/src/contexts/WalletModal.ts b/packages/wallet/src/contexts/WalletModal.ts index 8ed1b193..e65db969 100644 --- a/packages/wallet/src/contexts/WalletModal.ts +++ b/packages/wallet/src/contexts/WalletModal.ts @@ -1,7 +1,5 @@ 'use client' -import React from 'react' - import { createGenericContext } from './genericContext' import { Navigation } from './Navigation' diff --git a/packages/wallet/src/index.ts b/packages/wallet/src/index.ts index 262e050e..80535820 100644 --- a/packages/wallet/src/index.ts +++ b/packages/wallet/src/index.ts @@ -3,4 +3,4 @@ export { KitWalletProvider } from './shared/KitWalletProvider' // Hooks export { useOpenWalletModal } from './hooks/useOpenWalletModal' -export { useNavigation as useWalletNavigation} from './hooks/useNavigation' +export { useNavigation as useWalletNavigation } from './hooks/useNavigation' diff --git a/packages/wallet/src/shared/NavigationHeader/index.tsx b/packages/wallet/src/shared/NavigationHeader/index.tsx index fdc187e9..503786b0 100644 --- a/packages/wallet/src/shared/NavigationHeader/index.tsx +++ b/packages/wallet/src/shared/NavigationHeader/index.tsx @@ -1,8 +1,8 @@ import { Box, IconButton, ChevronLeftIcon, Text, ModalPrimitive } from '@0xsequence/design-system' import { HEADER_HEIGHT } from '../../constants' -import { useNavigation } from '../../hooks/useNavigation' import { useNavigationContext } from '../../contexts/Navigation' +import { useNavigation } from '../../hooks/useNavigation' interface NavigationHeaderProps { primaryText?: string diff --git a/packages/wallet/src/shared/TransactionConfirmation.tsx b/packages/wallet/src/shared/TransactionConfirmation.tsx index 9aeea5df..511b46e1 100644 --- a/packages/wallet/src/shared/TransactionConfirmation.tsx +++ b/packages/wallet/src/shared/TransactionConfirmation.tsx @@ -6,7 +6,7 @@ import { useAccount } from 'wagmi' import { truncateAtMiddle } from '../utils' -import { FeeOption, FeeOptionSelector, type FeeOptionBalance } from './FeeOptionSelector' +import { FeeOption, FeeOptionSelector } from './FeeOptionSelector' import { SendItemInfo } from './SendItemInfo' interface TransactionConfirmationProps { diff --git a/packages/wallet/src/views/SendCoin.tsx b/packages/wallet/src/views/SendCoin.tsx index 7fda3f23..ce8e28eb 100644 --- a/packages/wallet/src/views/SendCoin.tsx +++ b/packages/wallet/src/views/SendCoin.tsx @@ -67,7 +67,7 @@ export const SendCoin = ({ chainId, contractAddress }: SendCoinProps) => { const [isCheckingFeeOptions, setIsCheckingFeeOptions] = useState(false) const [selectedFeeTokenAddress, setSelectedFeeTokenAddress] = useState(null) const checkFeeOptions = useCheckWaasFeeOptions() - const [pendingFeeOption, confirmFeeOption, rejectFeeOption] = useWaasFeeOptions() + const [pendingFeeOption, confirmFeeOption, _rejectFeeOption] = useWaasFeeOptions() const { data: balances = [], isPending: isPendingBalances } = useBalancesSummary({ chainIds: [chainId], diff --git a/packages/wallet/src/views/SendCollectible.tsx b/packages/wallet/src/views/SendCollectible.tsx index e5f14a52..f9450544 100644 --- a/packages/wallet/src/views/SendCollectible.tsx +++ b/packages/wallet/src/views/SendCollectible.tsx @@ -68,7 +68,7 @@ export const SendCollectible = ({ chainId, contractAddress, tokenId }: SendColle const [isCheckingFeeOptions, setIsCheckingFeeOptions] = useState(false) const [selectedFeeTokenAddress, setSelectedFeeTokenAddress] = useState(null) const checkFeeOptions = useCheckWaasFeeOptions() - const [pendingFeeOption, confirmFeeOption, rejectFeeOption] = useWaasFeeOptions() + const [pendingFeeOption, confirmFeeOption, _rejectFeeOption] = useWaasFeeOptions() const { data: tokenBalance, isPending: isPendingBalances } = useCollectibleBalanceDetails({ filter: {