From f1ff64343f35128db6638700cdc2e405da81a5e0 Mon Sep 17 00:00:00 2001
From: teodorus-nathaniel <nathankurnia26@gmail.com>
Date: Thu, 11 Jul 2024 19:02:14 +0700
Subject: [PATCH] Change evm to ethereum

---
 src/components/EvmAddress.tsx                               | 2 +-
 src/components/auth/LoginModal/ConnectEvmModal.tsx          | 4 ++--
 src/components/auth/LoginModal/LoginModal.tsx               | 2 +-
 .../auth/LoginModal/contents/ConnectWalletContent.tsx       | 2 +-
 src/components/auth/ProfileModal/ProfileModal.tsx           | 2 +-
 .../auth/ProfileModal/contents/LinkedIdentitiesContent.tsx  | 6 +++---
 src/components/auth/common/evm/CommonEvmModalContent.tsx    | 2 +-
 src/components/auth/common/evm/CustomConnectButton.tsx      | 2 +-
 src/components/modals/LinkEvmAddressModal.tsx               | 6 +++---
 src/modules/points/PointsWidget.tsx                         | 2 +-
 src/modules/telegram/AirdropPage/index.tsx                  | 2 +-
 src/server/datahub-queue/post.ts                            | 1 -
 12 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/components/EvmAddress.tsx b/src/components/EvmAddress.tsx
index 520cc3c6a..1bc41cf32 100644
--- a/src/components/EvmAddress.tsx
+++ b/src/components/EvmAddress.tsx
@@ -13,7 +13,7 @@ export default function EvmAddress({ evmAddress, ...props }: EvmAddressProps) {
     <Card {...props} className={cx('flex justify-between', props.className)}>
       <CopyTextInline
         text={truncateAddress(evmAddress)}
-        tooltip='Copy my EVM address'
+        tooltip='Copy my Ethereum address'
         tooltipPlacement='top'
         textToCopy={evmAddress}
         textClassName='font-mono'
diff --git a/src/components/auth/LoginModal/ConnectEvmModal.tsx b/src/components/auth/LoginModal/ConnectEvmModal.tsx
index ecd7d4169..8547a0549 100644
--- a/src/components/auth/LoginModal/ConnectEvmModal.tsx
+++ b/src/components/auth/LoginModal/ConnectEvmModal.tsx
@@ -12,8 +12,8 @@ export default function ConnectEvmModal(props: ModalFunctionalityProps) {
     <Modal
       {...props}
       withCloseButton
-      title='Connect Your EVM to Get Rewards'
-      description='Only users with a connected EVM will be able to receive and manage their rewards on the platform. It also allows you to use features such as donations and NFTs, display your identity, and much more.'
+      title='Connect Your Ethereum address to Get Rewards'
+      description='Only users with a connected Ethereum address will be able to receive and manage their rewards on the platform. It also allows you to use features such as donations and NFTs, display your identity, and much more.'
     >
       <div className='flex flex-col gap-8'>
         <Image src={EvmConnectionImage} alt='' className='w-full' />
diff --git a/src/components/auth/LoginModal/LoginModal.tsx b/src/components/auth/LoginModal/LoginModal.tsx
index 21982c8bc..51c7e04da 100644
--- a/src/components/auth/LoginModal/LoginModal.tsx
+++ b/src/components/auth/LoginModal/LoginModal.tsx
@@ -75,7 +75,7 @@ export default function LoginModal({
       desc: 'We have created an account linked to your X for you. You can now use Epic!',
     },
     'evm-address-link': {
-      title: '🔑 Connect EVM',
+      title: '🔑 Connect Ethereum address',
       desc: 'Create an on-chain proof to link your Epic account.',
       withBackButton: true,
     },
diff --git a/src/components/auth/LoginModal/contents/ConnectWalletContent.tsx b/src/components/auth/LoginModal/contents/ConnectWalletContent.tsx
index 9576d8ddb..f810a458c 100644
--- a/src/components/auth/LoginModal/contents/ConnectWalletContent.tsx
+++ b/src/components/auth/LoginModal/contents/ConnectWalletContent.tsx
@@ -14,7 +14,7 @@ export const ConnectWalletContent = ({
       className='pt-0'
       menus={[
         {
-          text: 'EVM',
+          text: 'Ethereum',
           icon: EthIcon,
           onClick: () => {
             sendEvent('start_link_evm_address')
diff --git a/src/components/auth/ProfileModal/ProfileModal.tsx b/src/components/auth/ProfileModal/ProfileModal.tsx
index 5df55fe88..6e3501174 100644
--- a/src/components/auth/ProfileModal/ProfileModal.tsx
+++ b/src/components/auth/ProfileModal/ProfileModal.tsx
@@ -157,7 +157,7 @@ export default function ProfileModal({
       withBackButton: true,
     },
     'add-evm-provider': {
-      title: '🔑 Connect EVM',
+      title: '🔑 Connect Ethereum address',
       desc: 'Create an on-chain proof to link your Epic account.',
       withBackButton: true,
     },
diff --git a/src/components/auth/ProfileModal/contents/LinkedIdentitiesContent.tsx b/src/components/auth/ProfileModal/contents/LinkedIdentitiesContent.tsx
index 8824b92dc..983ea6891 100644
--- a/src/components/auth/ProfileModal/contents/LinkedIdentitiesContent.tsx
+++ b/src/components/auth/ProfileModal/contents/LinkedIdentitiesContent.tsx
@@ -46,8 +46,8 @@ export default function LinkedIdentitiesContent() {
 
   const externalProviders: ProviderData[] = [
     {
-      name: 'EVM',
-      title: 'EVM Address for Rewards',
+      name: 'Ethereum Address',
+      title: 'Ethereum Address for Rewards',
       points: 0,
       icon: SiEthereum,
       provider: IdentityProvider.Evm,
@@ -170,7 +170,7 @@ function EvmConnectButton() {
       reset()
     },
   })
-  useToastError(error, 'Failed to link EVM address')
+  useToastError(error, 'Failed to link Ethereum address')
 
   const hasTriedSigning = useRef(false)
   const signAndLinkEvmAddress = async (evmAddress: string) => {
diff --git a/src/components/auth/common/evm/CommonEvmModalContent.tsx b/src/components/auth/common/evm/CommonEvmModalContent.tsx
index 6d7e98eec..d49192f00 100644
--- a/src/components/auth/common/evm/CommonEvmModalContent.tsx
+++ b/src/components/auth/common/evm/CommonEvmModalContent.tsx
@@ -165,7 +165,7 @@ export const CommonEvmAddressLinked = () => {
         onClick={() => {
           const twitterUrl = twitterShareUrl(
             getCurrentUrlOrigin(),
-            `I just linked my #EVM wallet to Epic 🥳!`,
+            `I just linked my #Ethereum address to Epic 🥳!`,
             { tags: ['Ethereum', 'Epic', 'Base', 'Meme2Earn'] }
           )
           openNewWindow(twitterUrl)
diff --git a/src/components/auth/common/evm/CustomConnectButton.tsx b/src/components/auth/common/evm/CustomConnectButton.tsx
index 0698f6f65..ef2405516 100644
--- a/src/components/auth/common/evm/CustomConnectButton.tsx
+++ b/src/components/auth/common/evm/CustomConnectButton.tsx
@@ -20,7 +20,7 @@ type CustomConnectButtonProps = ButtonProps & {
 export const CustomConnectButton = ({
   className,
   onSuccessConnect,
-  label = 'Connect EVM Wallet',
+  label = 'Connect Ethereum Address',
   withWalletActionImage = true,
   secondLabel,
   isLoading,
diff --git a/src/components/modals/LinkEvmAddressModal.tsx b/src/components/modals/LinkEvmAddressModal.tsx
index b19088ba2..6dd0d1a85 100644
--- a/src/components/modals/LinkEvmAddressModal.tsx
+++ b/src/components/modals/LinkEvmAddressModal.tsx
@@ -48,7 +48,7 @@ export default function LinkEvmAddressModal(
   return (
     <Modal
       {...props}
-      title={props.title || 'Your EVM address for rewards'}
+      title={props.title || 'Your Ethereum address for rewards'}
       description={
         props.description ??
         'We will send your token rewards to this address if you win this contest.'
@@ -59,12 +59,12 @@ export default function LinkEvmAddressModal(
         <Input
           error={evmAddressError}
           value={evmAddress}
-          placeholder='Your EVM address'
+          placeholder='Your Ethereum address'
           onChange={(e) => {
             const address = e.target.value
             setEvmAddress(address)
             if (!isAddress(address)) {
-              setEvmAddressError('Invalid EVM Address')
+              setEvmAddressError('Invalid Ethereum Address')
             } else {
               setEvmAddressError('')
             }
diff --git a/src/modules/points/PointsWidget.tsx b/src/modules/points/PointsWidget.tsx
index 203d431f7..8481168c7 100644
--- a/src/modules/points/PointsWidget.tsx
+++ b/src/modules/points/PointsWidget.tsx
@@ -357,7 +357,7 @@ const UserStatsSection = ({
       <LinkEvmAddressModal
         isOpen={openEvmLinkModal}
         closeModal={() => setOpenEvmLinkModal(false)}
-        title='Edit your EVM address for rewards'
+        title='Edit your Ethereum address for rewards'
         description='We will send your token rewards to this address if you win in contest.'
       />
     </>
diff --git a/src/modules/telegram/AirdropPage/index.tsx b/src/modules/telegram/AirdropPage/index.tsx
index 3c1f8d257..cb1237b36 100644
--- a/src/modules/telegram/AirdropPage/index.tsx
+++ b/src/modules/telegram/AirdropPage/index.tsx
@@ -158,7 +158,7 @@ export function AddEvmProviderModal(props: ModalFunctionalityProps) {
   return (
     <Modal
       {...props}
-      title='🔑 Connect EVM'
+      title='🔑 Connect Ethereum address'
       description='Create an on-chain proof to link your Epic account.'
       withCloseButton
     >
diff --git a/src/server/datahub-queue/post.ts b/src/server/datahub-queue/post.ts
index d80e7f1ae..9680b9799 100644
--- a/src/server/datahub-queue/post.ts
+++ b/src/server/datahub-queue/post.ts
@@ -86,7 +86,6 @@ export async function updatePostData(input: UpdatePostOptimisticInput) {
   return res.updatePostOptimistic.callId
 }
 
-// TODO: change this if the new mutation is created
 const APPROVE_USER_MUTATION = gql`
   mutation ApproveUser($input: UpdatePostOptimisticInput!) {
     updatePostOptimistic(updatePostOptimisticInput: $input) {