fix: fixed sepolia for gated group condition (#855)

push-protocol · Nov 17, 2023 · 33e0ca9 · 33e0ca9
1 parent 7e28d59
commit 33e0ca9
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 19 deletions.
diff --git a/packages/examples/sdk-frontend-react/src/app/ChatUITest/ChatViewComponent.tsx b/packages/examples/sdk-frontend-react/src/app/ChatUITest/ChatViewComponent.tsx
@@ -13,7 +13,7 @@ const ChatViewComponentTest = () => {
   return (
     <div>
       <h2>Chat UI Test page</h2>
-      <CreateGroupModal onClose={()=>{console.log('in close')}} />
+      {/* <CreateGroupModal onClose={()=>{console.log('in close')}} /> */}
       <ChatViewComponentCard>
       {/* <CreateGroupModal onClose={()=>{console.log('in close')}}  modalBackground={MODAL_BACKGROUND_TYPE.OVERLAY} modalPositionType={MODAL_POSITION_TYPE.RELATIVE}/> */}
 

diff --git a/packages/examples/sdk-frontend-react/src/app/app.tsx b/packages/examples/sdk-frontend-react/src/app/app.tsx
@@ -220,7 +220,7 @@ const checkForWeb3Data = ({
 
 export function App() {
   const { account, library, active, chainId } = useWeb3React();
-  const [env, setEnv] = useState<ENV>(ENV.PROD);
+  const [env, setEnv] = useState<ENV>(ENV.DEV);
   const [isCAIP, setIsCAIP] = useState(false);
   const [signer, setSigner] = useState();
 

diff --git a/packages/uiweb/src/lib/components/chat/CreateGroup/ConditionsComponent.tsx b/packages/uiweb/src/lib/components/chat/CreateGroup/ConditionsComponent.tsx
@@ -106,7 +106,7 @@ const CriteriaSection = ({ criteria }: { criteria: ConditionData }) => {
 
   const [tokenSymbol] = useTokenSymbolLoader(criteria);
   return (
-    <Section gap="8px" width="100%">
+    <Section gap="8px" width="100%" justifyContent='start'>
       <Span
         alignSelf="center"
         background={theme.backgroundColor?.criteriaLabelBackground}
@@ -129,7 +129,7 @@ const CriteriaSection = ({ criteria }: { criteria: ConditionData }) => {
             </Span>
             {criteria?.data?.['amount']} {tokenSymbol}
           </Span>
-          <ChainIconSVG padding="0 6px 0 0" >
+          <ChainIconSVG padding="3px 6px 0 0" >
             {
               NETWORK_ICON_DETAILS[
                 criteria?.data?.['contract'].split(

diff --git a/packages/uiweb/src/lib/components/chat/MessageInput/MessageInput.tsx b/packages/uiweb/src/lib/components/chat/MessageInput/MessageInput.tsx
@@ -228,16 +228,13 @@ export const MessageInput: React.FC<MessageInputProps> = ({
   }, [chatId, pgpPrivateKey, account, env]);
 
   useEffect(() => {
-    console.log('in useEffect')
-    console.log(chatFeed)
     if (!account && !env && !chatId) return;
     if (account && env && chatId && chatFeed && chatFeed?.groupInformation) {
       setIsMember(checkIfMember(chatFeed, account));
       setIsRules(checkIfAccessVerifiedGroup(chatFeed));
     }
   }, [chatId, chatFeed, account, env]);
-console.log(isMember)
-console.log(checkIfMember(chatFeed, account!))
+
   const addEmoji = (emojiData: EmojiClickData, event: MouseEvent): void => {
     setTypedMessage(typedMessage + emojiData.emoji);
     setShowEmojis(false);

diff --git a/packages/uiweb/src/lib/components/chat/constants/chainDetails.tsx b/packages/uiweb/src/lib/components/chat/constants/chainDetails.tsx
@@ -18,9 +18,9 @@ const createSVGIcon = (element:any, chainName: string) => {
 };
 
 export const NETWORK_ICON_DETAILS =  {
-  5: {
-    label: 'ETHEREUM GOERLI',
-    icon: createSVGIcon(<EthereumSvg/>, 'Ethereum Goerli'),
+  11155111: {
+    label: 'ETHEREUM SEPOLIA',
+    icon: createSVGIcon(<EthereumSvg/>, 'Ethereum Sepolia'),
   },
   1: {
     label: 'ETHEREUM MAINNET',

diff --git a/packages/uiweb/src/lib/components/chat/helpers/tokenGatedGroup.ts b/packages/uiweb/src/lib/components/chat/helpers/tokenGatedGroup.ts
@@ -132,13 +132,11 @@ const validateTokenData = async (condition:Rule):Promise<CriteriaValidationError
   if(_eip155Format.length !==3){
     return {tokenError:"Invalid contract address"}
   }
-
   const [chainId, address] = [parseInt(_eip155Format[1]), _eip155Format[2]]
 
   if(!ethers.utils.isAddress(address)){
     return {tokenError:`Invalid contract address`}
   }
-
   const [err] = condition.category === CATEGORY.ERC721 ? 
     await fetchERC721nfo(address, chainId) : await fetchERC20Info(address, chainId);
 

diff --git a/packages/uiweb/src/lib/components/chat/helpers/tokenHelpers/chain.ts b/packages/uiweb/src/lib/components/chat/helpers/tokenHelpers/chain.ts
@@ -19,8 +19,8 @@ export const getChainRPC = (chainId: number): string => {
       return getRpcURL("optimism-mainnet", key);
     case 56:
       return "https://bsc-dataseed.binance.org/";
-    case 5:
-      return getRpcURL("goerli", key);
+    case 11155111:
+      return getRpcURL("sepolia", key);
     case 420:
       return getRpcURL("optimism-goerli", key);
     case 80001:

diff --git a/packages/uiweb/src/lib/components/chat/reusables/Button.tsx b/packages/uiweb/src/lib/components/chat/reusables/Button.tsx
@@ -45,7 +45,6 @@ export const Button: React.FC<IButtonProps> = (props) => {
   const theme = useContext(ThemeContext);
 
   const { onClick, width, height, customStyle } = props;
-  console.log(customStyle)
 
   return (
     <ThemeProvider theme={theme}>

diff --git a/packages/uiweb/src/lib/components/chat/reusables/Checkbox.tsx b/packages/uiweb/src/lib/components/chat/reusables/Checkbox.tsx
@@ -12,7 +12,6 @@ export interface ICheckboxProps {
 
 export const Checkbox = (props: ICheckboxProps) => {
   const theme = useContext(ThemeContext);
-console.log(props)
   return (
     <ThemeProvider theme={theme}>
       <CheckboxContainer>

diff --git a/packages/uiweb/src/lib/components/chat/reusables/DropDown.tsx b/packages/uiweb/src/lib/components/chat/reusables/DropDown.tsx
@@ -56,7 +56,6 @@ function Dropdown({
       document.body.removeChild(el);
     }
   };
-  console.log(dropdownValues)
   return (
     <>
       {dropdownValues.map((dropdownValue) =>

diff --git a/packages/uiweb/src/lib/config/constants.ts b/packages/uiweb/src/lib/config/constants.ts
@@ -35,6 +35,7 @@ export const NETWORK_DETAILS = {
   420: {},
 };
 
+//todo: need to change o sepolia
 export const CoreContractChainId = {
   prod: 1,
   dev: 5,

diff --git a/packages/uiweb/src/lib/hooks/chat/useVerifyAccessControl.ts b/packages/uiweb/src/lib/hooks/chat/useVerifyAccessControl.ts
@@ -30,7 +30,6 @@ const useVerifyAccessControl = () => {
         });
         setLoading(false);
         if (response.chat === false) {
-          console.log('in hereeeee response false')
           setVerificationSuccessfull(false);
         } else if (response.chat === true) {
           setVerified(true);
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,6 +35,7 @@ export const NETWORK_DETAILS = { @@
 : {},
     };
+    //todo: need to change o sepolia
     export const CoreContractChainId = {
       prod: 1,
       dev: 5,
@@ Expand Down @@