Merge pull request #1303 from ethereum-push-notification-service/dev-…

…deployment Sepolia migration changes
push-protocol · Nov 16, 2023 · af57e82 · af57e82
2 parents 61cb272 + 48d5bcf
commit af57e82
Show file tree

Hide file tree

Showing 17 changed files with 595 additions and 912 deletions.
diff --git a/package.json b/package.json
@@ -34,16 +34,16 @@
     "@mui/lab": "^5.0.0-alpha.72",
     "@mui/material": "^5.5.0",
     "@pushprotocol/ledgerlive": "latest",
-    "@pushprotocol/restapi": "1.4.32",
-    "@pushprotocol/socket": "latest",
-    "@pushprotocol/uiweb": "0.0.1-alpha.28",
+    "@pushprotocol/restapi": "1.4.37",
+    "@pushprotocol/socket": "0.5.3",
+    "@pushprotocol/uiweb": "1.1.17",
     "@reduxjs/toolkit": "^1.7.1",
     "@testing-library/dom": "^9.0.1",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.3.2",
     "@testing-library/user-event": "^7.1.2",
     "@uniswap/widgets": "^2.47.3",
-    "@unstoppabledomains/resolution": "^8.5.0",
+    "@unstoppabledomains/resolution": "9.2.2",
     "@web3-onboard/coinbase": "^2.2.5",
     "@web3-onboard/core": "^2.20.4",
     "@web3-onboard/injected-wallets": "^2.9.0",

diff --git a/src/components/FaucetInfo.tsx b/src/components/FaucetInfo.tsx
@@ -75,11 +75,11 @@ const FaucetInfo = ({ onMintPushToken, noOfPushTokensToCheck, containerProps }:
             ) : (
               <ItemBody>
                 <AnchorLink
-                  href="https://chaindrop.org/?chainid=5&token=0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"
+                  href="https://chaindrop.org/?chainid=11155111&token=0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"
                   target="_blank"
                 >
                   <NumberIcon>1</NumberIcon>
-                  <PoolShare>Goerli ETH Faucet</PoolShare>
+                  <PoolShare>Sepolia ETH Faucet</PoolShare>
                 </AnchorLink>
                 <Minter
                   onClick={async () => {

diff --git a/src/components/Faucets.js b/src/components/Faucets.js
@@ -23,11 +23,11 @@ const Faucets = () => {
 
   const dropdownValues = [
     {
-      id: "5",
-      value: "Goerli",
-      title: "Goerli Faucet",
+      id: "11155111",
+      value: "Sepolia",
+      title: "Sepolia Faucet",
       function: () => {},
-      link: "https://goerlifaucet.com/",
+      link: "https://sepoliafaucet.com/",
     },
     {
       id: "80001",

diff --git a/src/components/YieldFarmChainError.tsx b/src/components/YieldFarmChainError.tsx
@@ -14,7 +14,7 @@ const YieldFarmChainError = () => {
 
         const chainIdToPass = appConfig.allowedNetworks[0];
 
-        if (currentChainId !== 1 && currentChainId !== 5) {
+        if (currentChainId !== 1 && currentChainId !== 11155111) {
             console.log("Current Chain ID ", currentChainId);
             console.log("Chain Id to pass", chainIdToPass);
             switchChain(appConfig.coreContractChain);

diff --git a/src/components/chat/w2wChat/groupChat/groupInfo/groupInfoModalContent.tsx b/src/components/chat/w2wChat/groupChat/groupInfo/groupInfoModalContent.tsx
@@ -1,4 +1,4 @@
-import React, { useContext, useEffect } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { ethers } from 'ethers';
 
 // External Packages
@@ -37,10 +37,12 @@ import useToast from 'hooks/useToast';
 import { MdCheckCircle, MdError } from 'react-icons/md';
 import { AddWalletContent } from '../createGroup/AddWalletContent';
 import GroupModalHeader from '../createGroup/GroupModalHeader';
+import { copyToClipboard, shortenText } from 'helpers/UtilityHelper';
 
 export const GroupInfoModalContent = ({ onClose }: ModalInnerComponentType) => {
   const { currentChat, setChat, inbox, receivedIntents }: AppContext = useContext<AppContext>(Context);
   const { connectedUser } = useContext(ChatUserContext);
+  const [copyText, setCopyText] = useState<string>('');
   const { account } = useAccount();
   const groupInfoToast = useToast();
   const [selectedMemeberAddress, setSelectedMemeberAddress] = React.useState<string | null>(null);
@@ -50,7 +52,9 @@ export const GroupInfoModalContent = ({ onClose }: ModalInnerComponentType) => {
   const [memberList, setMemberList] = React.useState<any>([]);
   const [isLoading, setIsLoading] = React.useState<boolean>(false);
   const groupCreator = currentChat?.groupInformation?.groupCreator;
-  const membersExceptGroupCreator = currentChat?.groupInformation?.members.filter((x) => x.wallet?.toLowerCase() !== groupCreator?.toLowerCase());
+  const membersExceptGroupCreator = currentChat?.groupInformation?.members.filter(
+    (x) => x.wallet?.toLowerCase() !== groupCreator?.toLowerCase()
+  );
   const groupMembers = [...membersExceptGroupCreator, ...currentChat?.groupInformation?.pendingMembers];
 
   const isAccountOwnerAdmin = currentChat?.groupInformation?.members?.some(
@@ -388,7 +392,57 @@ export const GroupInfoModalContent = ({ onClose }: ModalInnerComponentType) => {
                   </SpanV2>
                 </ItemVV2>
               </InfoContainer>
-
+              <DescriptionContainer
+                alignItems="flex-start"
+                margin="0px 0px 18px 0px"
+              >
+                <SpanV2
+                  fontSize="18px"
+                  fontWeight={500}
+                  margin="0px 0px 5px 0px"
+                  color={theme.modalProfileTextColor}
+                >
+                  Chat ID
+                </SpanV2>
+                <ItemHV2
+
+                  alignSelf="start"
+                  onClick={() => {
+                    copyToClipboard(currentChat?.groupInformation?.chatId);
+                    setCopyText('copied');
+                  }}
+                  onMouseEnter={() => {
+                    setCopyText('click to copy');
+                  }}
+                  onMouseLeave={() => {
+                    setCopyText('');
+                  }}
+                >
+                  <SpanV2
+
+                   textAlign="start"
+                    fontSize="18px"
+                    fontWeight="400"
+                    style={{ color: `${theme.modalDescriptionTextColor}` }}
+                  >
+                    {shortenText(currentChat?.groupInformation?.chatId,8,8)}
+                  </SpanV2>
+                  {!!copyText && (
+                    <SpanV2
+                      cursor="pointer"
+                      position="relative"
+                      padding="2px 10px"
+                      style={{ color: `${theme.modalDescriptionTextColor}` }}
+                      fontSize="16px"
+                      fontWeight="400"
+                      // background={theme.backgroundColor?.modalHoverBackground}
+                      borderRadius="16px"
+                    >
+                      {copyText}
+                    </SpanV2>
+                  )}
+                </ItemHV2>
+              </DescriptionContainer>
               <DescriptionContainer
                 alignItems="flex-start"
                 margin="0px 0px 18px 0px"
@@ -568,7 +622,7 @@ const AddWalletContainer = styled(ItemHV2)`
   padding: 15px 24px;
   margin-bottom: 15px;
   cursor: pointer;
-  @media(max-width:480px){
+  @media (max-width: 480px) {
     min-width: 300px;
     max-width: 300px;
   }

diff --git a/src/components/reusables/SharedStylingV2.js b/src/components/reusables/SharedStylingV2.js
@@ -163,6 +163,7 @@ export const ButtonV2 = styled.button`
 export const SpanV2 = styled.span`
   align-self: ${(props) => props.alignSelf || 'auto'};
   background: ${(props) => props.background || 'transparent'};
+  cursor: ${(props) => props.cursor || 'default'};
   border-radius: ${(props) => props.borderRadius || 'initial'};
   bottom: ${(props) => props.bottom || 'auto'};
   color: ${(props) => props.color || 'inherit'};