diff --git a/packages/uiweb/src/lib/components/chat/ChatPreview/ChatPreview.tsx b/packages/uiweb/src/lib/components/chat/ChatPreview/ChatPreview.tsx index 721b36653..5d62005d5 100644 --- a/packages/uiweb/src/lib/components/chat/ChatPreview/ChatPreview.tsx +++ b/packages/uiweb/src/lib/components/chat/ChatPreview/ChatPreview.tsx @@ -9,7 +9,6 @@ import { CONSTANTS } from '@pushprotocol/restapi'; import { ethers } from 'ethers'; import { CiImageOn } from 'react-icons/ci'; import { FaFile } from 'react-icons/fa'; -import { CoreContractChainId, InfuraAPIKey } from '../../../config'; import { pushBotAddress } from '../../../config/constants'; import { pCAIP10ToWallet, resolveWeb3Name, shortenText } from '../../../helpers'; import { createBlockie } from '../../../helpers/blockies'; diff --git a/packages/uiweb/src/lib/components/chat/ChatProfile/ChatProfile.tsx b/packages/uiweb/src/lib/components/chat/ChatProfile/ChatProfile.tsx index 81c00cc9e..9c89d95e9 100644 --- a/packages/uiweb/src/lib/components/chat/ChatProfile/ChatProfile.tsx +++ b/packages/uiweb/src/lib/components/chat/ChatProfile/ChatProfile.tsx @@ -28,7 +28,7 @@ import { ProfileContainer } from '../reusables'; import { GroupInfoModal } from './ChatProfileInfoModal'; // Internal Configs -import { CoreContractChainId, InfuraAPIKey, allowedNetworks, device } from '../../../config'; +import { device } from '../../../config'; import { ThemeContext } from '../theme/ThemeProvider'; // Assets diff --git a/packages/uiweb/src/lib/components/chat/UserProfile/UserProfile.tsx b/packages/uiweb/src/lib/components/chat/UserProfile/UserProfile.tsx index 7fa81bc57..8fcea502f 100644 --- a/packages/uiweb/src/lib/components/chat/UserProfile/UserProfile.tsx +++ b/packages/uiweb/src/lib/components/chat/UserProfile/UserProfile.tsx @@ -15,7 +15,7 @@ import { ProfileContainer } from '../reusables'; import { ThemeContext } from '../theme/ThemeProvider'; import { UpdateUserProfileModal } from './UpdateUserProfileModal'; -import { Constants, CoreContractChainId, InfuraAPIKey, ProfilePicture, device } from '../../../config'; +import { device } from '../../../config'; import VerticalEllipsisIcon from '../../../icons/VerticalEllipsis.svg'; import UserProfileIcon from '../../../icons/userCircleGear.svg'; import { MODAL_BACKGROUND_TYPE, MODAL_POSITION_TYPE } from '../../../types'; @@ -33,7 +33,7 @@ export const UserProfile: React.FC = ({ updateUserProfileModalBackground = MODAL_BACKGROUND_TYPE.OVERLAY, updateUserProfileModalPositionType = MODAL_POSITION_TYPE.GLOBAL, onUserProfileUpdateModalOpen, - closeUserProfileModalOnClickAway = false + closeUserProfileModalOnClickAway = false, }) => { const { user } = useChatData(); const [userProfile, setUserProfile] = useState(); @@ -157,7 +157,7 @@ export const UserProfile: React.FC = ({ }; //styles -const Conatiner = styled(Section) ` +const Conatiner = styled(Section)` border: ${(props) => props.theme.border?.userProfile}; box-sizing: border-box; `; diff --git a/packages/uiweb/src/lib/components/chat/helpers/tokenHelpers/chain.ts b/packages/uiweb/src/lib/components/chat/helpers/tokenHelpers/chain.ts index e53db5b32..377d48247 100644 --- a/packages/uiweb/src/lib/components/chat/helpers/tokenHelpers/chain.ts +++ b/packages/uiweb/src/lib/components/chat/helpers/tokenHelpers/chain.ts @@ -1,14 +1,13 @@ -import { InfuraAPIKey } from '../../../../config'; +import { infuraAPIKey } from '../../../../config'; -const getInfuraUrlFor = (network: string, key: string) => - `https://${network}.infura.io/v3/${key}`; +const getInfuraUrlFor = (network: string, key: string) => `https://${network}.infura.io/v3/${key}`; const getRpcURL = (network: string, key: string) => { return getInfuraUrlFor(network, key); }; export const getChainRPC = (chainId: number): string => { - const key = InfuraAPIKey; + const key = infuraAPIKey; switch (chainId) { case 1: diff --git a/packages/uiweb/src/lib/components/supportChat/AddressInfo.tsx b/packages/uiweb/src/lib/components/supportChat/AddressInfo.tsx index 628d5bb8d..86dc2fb26 100644 --- a/packages/uiweb/src/lib/components/supportChat/AddressInfo.tsx +++ b/packages/uiweb/src/lib/components/supportChat/AddressInfo.tsx @@ -6,7 +6,7 @@ import { ethers } from 'ethers'; import { ChatProps } from './Chat'; import { SupportChatPropsContext } from '../../context'; -import { Constants, ENV, InfuraAPIKey, allowedNetworks } from '../../config'; +import { Constants, infuraAPIKey, allowedNetworks } from '../../config'; import { copyToClipboard, pCAIP10ToWallet, resolveWeb3Name } from '../../helpers'; import { CopySvg } from '../../icons/CopySvg'; @@ -19,7 +19,7 @@ export const AddressInfo: React.FC = () => { const [isCopied, setIsCopied] = useState(false); const walletAddress = pCAIP10ToWallet(supportAddress!); const l1ChainId = allowedNetworks[env!]?.includes(1) ? 1 : 5; - const provider = new ethers.providers.InfuraProvider(l1ChainId, InfuraAPIKey); + const provider = new ethers.providers.InfuraProvider(l1ChainId, infuraAPIKey); useEffect(() => { const getUser = async () => { diff --git a/packages/uiweb/src/lib/config/constants.ts b/packages/uiweb/src/lib/config/constants.ts index 882a855c3..b532fb878 100644 --- a/packages/uiweb/src/lib/config/constants.ts +++ b/packages/uiweb/src/lib/config/constants.ts @@ -143,8 +143,6 @@ export const allowedNetworks = { export const BLOCKNATIVE_PROJECT_ID = '64a44a0fb537407bfe97d24330e4109c'; -export const InfuraAPIKey = '150f25623ae64d08ab7ec7dd0c6b6ee9'; - export const PUBLIC_GOOGLE_TOKEN = 'AIzaSyBhUBnCia6zpxY7KcqjghRS1IphinAvKXs'; export const ProfilePicture = `data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAvklEQVR4AcXBsW2FMBiF0Y8r3GQb6jeBxRauYRpo4yGQkMd4A7kg7Z/GUfSKe8703fKDkTATZsJsrr0RlZSJ9r4RLayMvLmJjnQS1d6IhJkwE2bT13U/DBzp5BN73xgRZsJMmM1HOolqb/yWiWpvjJSUiRZWopIykTATZsJs5g+1N6KSMiO1N/5DmAkzYTa9Lh6MhJkwE2ZzSZlo7xvRwson3txERzqJhJkwE2bT6+JhoKTMJ2pvjAgzYSbMfgDlXixqjH6gRgAAAABJRU5ErkJggg==`; diff --git a/packages/uiweb/src/lib/dataProviders/Web3OnboardDataProvider.tsx b/packages/uiweb/src/lib/dataProviders/Web3OnboardDataProvider.tsx index 0e1997857..b57892736 100644 --- a/packages/uiweb/src/lib/dataProviders/Web3OnboardDataProvider.tsx +++ b/packages/uiweb/src/lib/dataProviders/Web3OnboardDataProvider.tsx @@ -1,6 +1,6 @@ import coinbaseWalletModule from '@web3-onboard/coinbase'; -import { BLOCKNATIVE_PROJECT_ID, InfuraAPIKey } from '../config'; +import { BLOCKNATIVE_PROJECT_ID, infuraAPIKey } from '../config'; import { Web3OnboardProvider } from '@web3-onboard/react'; import injectedModule, { ProviderLabel } from '@web3-onboard/injected-wallets'; import walletConnectModule from '@web3-onboard/walletconnect'; @@ -30,13 +30,13 @@ const CHAINS: ChainType[] = [ id: '0x1', token: 'ETH', label: 'Ethereum Mainnet', - rpcUrl: `https://mainnet.infura.io/v3/${InfuraAPIKey}`, + rpcUrl: `https://mainnet.infura.io/v3/${infuraAPIKey}`, }, { id: '0xAA36A7', token: 'ETH', label: 'Sepolia', - rpcUrl: `https://sepolia.infura.io/v3/${InfuraAPIKey}`, + rpcUrl: `https://sepolia.infura.io/v3/${infuraAPIKey}`, }, { id: '0x13882', diff --git a/packages/uiweb/src/lib/helpers/udResolver.ts b/packages/uiweb/src/lib/helpers/udResolver.ts index cc54d1d57..dda897b1b 100644 --- a/packages/uiweb/src/lib/helpers/udResolver.ts +++ b/packages/uiweb/src/lib/helpers/udResolver.ts @@ -1,7 +1,7 @@ import type { Env } from '@pushprotocol/restapi'; import Resolution from '@unstoppabledomains/resolution'; import { ethers } from 'ethers'; -import { allowedNetworks, InfuraAPIKey, NETWORK_DETAILS } from '../config'; +import { allowedNetworks, infuraAPIKey, NETWORK_DETAILS } from '../config'; export const getUdResolverClient = (env: Env): Resolution | undefined => { try { @@ -14,11 +14,11 @@ export const getUdResolverClient = (env: Env): Resolution | undefined => { locations: { Layer1: { network: 'mainnet', // add config for sepolia once it's supported by UD - provider: new ethers.providers.InfuraProvider(l1ChainId, InfuraAPIKey), + provider: new ethers.providers.InfuraProvider(l1ChainId, infuraAPIKey), }, Layer2: { network: NETWORK_DETAILS[l2ChainId].network, - provider: new ethers.providers.InfuraProvider(l2ChainId, InfuraAPIKey), + provider: new ethers.providers.InfuraProvider(l2ChainId, infuraAPIKey), }, }, },