merged from main and readded blur

push-protocol · May 9, 2024 · df42c30 · df42c30
2 parents c7a8bc3 + 1c504a8
commit df42c30
Show file tree

Hide file tree

Showing 13 changed files with 219 additions and 222 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
@@ -29,7 +29,7 @@ const ChatViewComponentTest = () => {
         {/* <CreateGroupModal onClose={()=>{console.log('in close')}}  modalBackground={MODAL_BACKGROUND_TYPE.OVERLAY} modalPositionType={MODAL_POSITION_TYPE.RELATIVE}/> */}
         <ChatView
           onVerificationFail={() => console.log('Verification Failed')}
-          chatId="4ac5ab85c9c3d57adbdf2dba79357e56b2f9ef0256befe750d9f93af78d2ca68"
+          chatId="34c44214589cecc176a136ee1daf0f0231ecc6d6574b920b5ae39eb971fa3cb4"
           chatProfileLeftHelperComponent={
             <img src={Img} onClick={() => console.debug('clicked')} />
           }

diff --git a/packages/restapi/src/lib/channels/subscribe.ts b/packages/restapi/src/lib/channels/subscribe.ts
@@ -4,14 +4,15 @@ import {
   getDomainInformation,
   getSubscriptionMessage,
 } from './signature.helpers';
-import Constants, {ENV} from '../constants';
-import { SignerType } from "../types";
-import { axiosPost } from "../utils/axiosUtil";
+import Constants, { ENV } from '../constants';
+import { SignerType } from '../types';
+import { axiosPost } from '../utils/axiosUtil';
 export type SubscribeOptionsType = {
   signer: SignerType;
   channelAddress: string;
   userAddress: string;
   verifyingContractAddress?: string;
+  origin?: string;
   env?: ENV;
   onSuccess?: () => void;
   onError?: (err: Error) => void;
@@ -23,6 +24,7 @@ export const subscribe = async (options: SubscribeOptionsType) => {
     channelAddress,
     userAddress,
     verifyingContractAddress,
+    origin,
     env = Constants.ENV.PROD,
     onSuccess,
     onError,
@@ -86,6 +88,7 @@ export const subscribe = async (options: SubscribeOptionsType) => {
         channel: _channelAddress,
         subscriber: _userAddress,
       },
+      origin: origin
     };
 
     await axiosPost(requestUrl, body);

diff --git a/packages/restapi/src/lib/channels/subscribeV2.ts b/packages/restapi/src/lib/channels/subscribeV2.ts
@@ -15,6 +15,7 @@ export type SubscribeOptionsV2Type = {
   settings?: string | null;
   verifyingContractAddress?: string;
   env?: ENV;
+  origin?: string;
   onSuccess?: () => void;
   onError?: (err: Error) => void;
 };
@@ -27,6 +28,7 @@ export const subscribeV2 = async (options: SubscribeOptionsV2Type) => {
     settings = undefined,
     verifyingContractAddress,
     env = Constants.ENV.PROD,
+    origin,
     onSuccess,
     onError,
   } = options || {};
@@ -85,6 +87,7 @@ export const subscribeV2 = async (options: SubscribeOptionsV2Type) => {
     const body = {
       verificationProof: `eip712v2:${verificationProof}`,
       message: messageInformation.data,
+      origin: origin
     };
 
     const res = await axiosPost(requestUrl, body);

diff --git a/packages/restapi/src/lib/pushapi/PushAPI.ts b/packages/restapi/src/lib/pushapi/PushAPI.ts
@@ -28,6 +28,7 @@ export class PushAPI {
   private readMode: boolean;
   private alpha: { feature: string[] };
   public account: string;
+  public chainWiseAccount: string;
   public decryptedPgpPvtKey?: string;
   public pgpPublicKey?: string;
   public env: ENV;
@@ -65,6 +66,7 @@ export class PushAPI {
     this.alpha = alpha;
     this.env = env;
     this.account = account;
+    this.chainWiseAccount = walletToPCAIP10(account);
     this.decryptedPgpPvtKey = decryptedPgpPvtKey;
     this.pgpPublicKey = pgpPublicKey;
     this.progressHook = progressHook;
@@ -274,7 +276,6 @@ export class PushAPI {
           readMode = true;
         }
       }
-      derivedAccount = walletToPCAIP10(derivedAccount);
       // Initialize PushAPI instance
       const api = new PushAPI(
         settings.env as ENV,

diff --git a/packages/restapi/tests/lib/channel/subscribeV2.test.ts b/packages/restapi/tests/lib/channel/subscribeV2.test.ts
@@ -30,6 +30,7 @@ describe('PUSH_CHANNEL.subscribeV2 functionality', () => {
       channelAddress: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681',
       userAddress: `eip155:11155111:${account1}`,
       env: _env,
+      origin: 'test'
     });
     expect(res.status).to.be.equal(204);
   });

diff --git a/packages/uiweb/package-lock.json b/packages/uiweb/package-lock.json
diff --git a/packages/uiweb/package.json b/packages/uiweb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pushprotocol/uiweb",
-  "version": "0.0.1-alpha.46",
+  "version": "1.4.0-alpha.4",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
@@ -37,7 +37,7 @@
     "uuid": "^9.0.1"
   },
   "peerDependencies": {
-    "@pushprotocol/restapi": "0.0.1-alpha.80",
+    "@pushprotocol/restapi": "1.7.13",
     "@pushprotocol/socket": "^0.5.0",
     "react": ">=16.8.0",
     "styled-components": "^6.0.8"

diff --git a/packages/uiweb/src/lib/components/chat/ChatViewBubble/ChatViewBubble.tsx b/packages/uiweb/src/lib/components/chat/ChatViewBubble/ChatViewBubble.tsx
@@ -33,7 +33,7 @@ import { TwitterCard } from './cards/twitter/TwitterCard';
 const SenderMessageAddress = ({ chat }: { chat: IMessagePayload }) => {
   const { user } = useContext(ChatDataContext);
   const theme = useContext(ThemeContext);
-  return chat.fromCAIP10?.split(':')[1] !== user?.account ? (
+  return chat.fromCAIP10 !== user?.account ? (
     <Span
       theme={theme}
       alignSelf="start"
@@ -144,6 +144,7 @@ const MessageWrapper = ({
   children: ReactNode;
   isGroup: boolean;
 }) => {
+  const { user } = useChatData();
   const theme = useContext(ThemeContext);
   return (
     <MessageSection
@@ -153,12 +154,12 @@ const MessageWrapper = ({
       gap="6px"
       width="auto"
     >
-      {isGroup && <SenderMessageProfilePicture chat={chat} />}
+      {isGroup && chat?.fromCAIP10 !== user?.account && <SenderMessageProfilePicture chat={chat} />}
       <Section
         justifyContent="start"
         flexDirection="column"
       >
-        {isGroup && <SenderMessageAddress chat={chat} />}
+        {isGroup && chat?.fromCAIP10 !== user?.account && <SenderMessageAddress chat={chat} />}
         {children}
       </Section>
     </MessageSection>
@@ -174,12 +175,12 @@ export const ChatViewBubble = ({
 }) => {
   const { user } = useChatData();
   const position =
-    pCAIP10ToWallet(decryptedMessagePayload.fromDID).toLowerCase() !== user?.account?.toLowerCase() ? 0 : 1;
-
+    pCAIP10ToWallet(decryptedMessagePayload.fromDID).toLowerCase() !== pCAIP10ToWallet(user?.account!)?.toLowerCase()
+      ? 0
+      : 1;
   const { tweetId, messageType }: TwitterFeedReturnType = checkTwitterUrl({
     message: decryptedMessagePayload?.messageContent,
   });
-
   if (messageType === 'TwitterFeedLink') {
     decryptedMessagePayload.messageType = 'TwitterFeedLink';
   }

diff --git a/packages/uiweb/src/lib/components/chat/ChatViewList/ChatViewList.tsx b/packages/uiweb/src/lib/components/chat/ChatViewList/ChatViewList.tsx
@@ -70,13 +70,9 @@ export const ChatViewList: React.FC<IChatViewListProps> = (options: IChatViewLis
     invalidChat: false,
   });
 
-  const [loading, setLoading] = useState<boolean>(true);
-
   const { chatId, limit = chatLimit, chatFilterList = [] } = options || {};
   const { user, toast } = useChatData();
-  const [chatInfo, setChatInfo] = useState<ChatInfoResponse | null>(null);
   const [groupInfo, setGroupInfo] = useState<Group | null>(null);
-  const [userInfo, setUserInfo] = useState<IUser | null>(null);
 
   // const [chatStatusText, setChatStatusText] = useState<string>('');
   const [messages, setMessages] = useState<IMessageIPFSWithCID[]>([]);
@@ -172,9 +168,9 @@ export const ChatViewList: React.FC<IChatViewListProps> = (options: IChatViewLis
   //moniters stream changes
   useEffect(() => {
     if (Object.keys(chatAcceptStream || {}).length > 0 && chatAcceptStream.constructor === Object) {
-      const updatedChatInfo = { ...(chatInfo as ChatInfoResponse) };
+      const updatedChatInfo = { ...(initialized.chatInfo as ChatInfoResponse) };
       if (updatedChatInfo) updatedChatInfo.list = 'CHATS';
-      setChatInfo(updatedChatInfo);
+      setInitialized({ ...initialized, chatInfo: updatedChatInfo });
     }
   }, [chatAcceptStream]);
 
@@ -394,7 +390,9 @@ export const ChatViewList: React.FC<IChatViewListProps> = (options: IChatViewLis
                   const dateNum = moment(chat.timestamp).format('L');
                   // TODO: This is a hack as chat.fromDID is converted with eip to match with user.account creating a bug for omnichain
                   const position =
-                    pCAIP10ToWallet(chat.fromDID)?.toLowerCase() !== user?.account?.toLowerCase() ? 0 : 1;
+                    pCAIP10ToWallet(chat.fromDID)?.toLowerCase() !== pCAIP10ToWallet(user?.account!)?.toLowerCase()
+                      ? 0
+                      : 1;
                   return (
                     <>
                       {dates.has(dateNum) ? null : renderDate({ chat, dateNum })}

diff --git a/packages/uiweb/src/lib/components/chat/CreateGroup/AddCriteria.tsx b/packages/uiweb/src/lib/components/chat/CreateGroup/AddCriteria.tsx
@@ -241,7 +241,7 @@ const AddCriteria = ({ handlePrevious, onClose, criteriaStateManager }: ModalHea
       function: () => setSelectedChainValue(6),
     } as DropdownValueType);
   }
-
+  console.debug(dropdownChainsValues);
   const onQuantityChange = (e: any) => {
     setQuantity({ ...quantity, value: e.target.value });
   };
@@ -263,6 +263,7 @@ const AddCriteria = ({ handlePrevious, onClose, criteriaStateManager }: ModalHea
       }
     }
 
+    console.debug(selectedChainValue);
     const rule: Rule = {
       type: _type,
       category: category,

diff --git a/packages/uiweb/src/lib/components/chat/MessageInput/MessageInput.tsx b/packages/uiweb/src/lib/components/chat/MessageInput/MessageInput.tsx
@@ -291,7 +291,7 @@ export const MessageInput: React.FC<MessageInputProps> = ({
       }
     } else {
       const sendTextMessage = await sendMessage({
-        message: `Hello, please let me join this group, my wallet address is ${user?.account}`,
+        message: `Hello, please let me join this group, my wallet address is ${pCAIP10ToWallet(user?.account || '')}`,
         chatId: groupInfo?.groupCreator || '',
         messageType: 'Text',
       });

diff --git a/packages/uiweb/src/lib/components/chat/UserProfile/UserProfile.tsx b/packages/uiweb/src/lib/components/chat/UserProfile/UserProfile.tsx
@@ -5,7 +5,7 @@ import { IUser } from '@pushprotocol/restapi';
 import { ethers } from 'ethers';
 import styled from 'styled-components';
 
-import { resolveWeb3Name, shortenText } from '../../../helpers';
+import { pCAIP10ToWallet, resolveWeb3Name, shortenText } from '../../../helpers';
 import { useClickAway } from '../../../hooks';
 import { useChatData } from '../../../hooks/chat/useChatData';
 import useChatProfile from '../../../hooks/chat/useChatProfile';
@@ -81,76 +81,76 @@ export const UserProfile: React.FC<UserProfileProps> = ({
 
   return (
     <Conatiner
-        height="inherit"
-        justifyContent="space-between"
-        overflow="hidden"
-        width="100%"
-        padding="14px 10px"
-        borderRadius={theme?.borderRadius?.userProfile}
-        background={theme?.backgroundColor?.userProfileBackground}
+      height="inherit"
+      justifyContent="space-between"
+      overflow="hidden"
+      width="100%"
+      padding="14px 10px"
+      borderRadius={theme?.borderRadius?.userProfile}
+      background={theme?.backgroundColor?.userProfileBackground}
+      theme={theme}
+    >
+      <ProfileContainer
         theme={theme}
-      >
-        <ProfileContainer
+        member={{
+          web3Name: web3Name,
+          abbrRecipient: shortenText(pCAIP10ToWallet(user?.account || ''), 8, true) as string,
+          recipient: user!.account,
+          icon: userProfile?.profile?.picture || null,
+        }}
+        copy={true}
+        customStyle={{
+          fontSize: theme?.fontSize?.userProfileText,
+          fontWeight: theme?.fontWeight?.userProfileText,
+          textColor: theme?.textColor?.userProfileText,
+        }}
+        loading={!userProfile ? true : false}
+      />
+      {userProfile && (
+        <Section>
+          <Image
+            src={VerticalEllipsisIcon}
+            height="21px"
+            maxHeight="21px"
+            color={theme?.iconColor?.userProfileSettings}
+            width={'auto'}
+            cursor="pointer"
+            onClick={() => setOptions(true)}
+          />
+        </Section>
+      )}
+      {options && (
+        <DropDownBar
           theme={theme}
-          member={{
-            web3Name: web3Name,
-            abbrRecipient: shortenText(user?.account || '', 8, true) as string,
-            recipient: user!.account,
-            icon: userProfile?.profile?.picture || null,
-          }}
-          copy={true}
-          customStyle={{
-            fontSize: theme?.fontSize?.userProfileText,
-            fontWeight: theme?.fontWeight?.userProfileText,
-            textColor: theme?.textColor?.userProfileText,
-          }}
-          loading={!userProfile ? true : false}
-        />
-        {userProfile && (
-          <Section>
+          ref={DropdownRef}
+          onClick={() => setShowUpdateUserProfileModal(true)}
+        >
+          <DropDownItem cursor="pointer">
             <Image
-              src={VerticalEllipsisIcon}
-              height="21px"
-              maxHeight="21px"
-              color={theme?.iconColor?.userProfileSettings}
+              src={UserProfileIcon}
+              height="32px"
+              maxHeight="32px"
               width={'auto'}
               cursor="pointer"
-              onClick={() => setOptions(true)}
             />
-          </Section>
-        )}
-        {options && (
-          <DropDownBar
-            theme={theme}
-            ref={DropdownRef}
-            onClick={() => setShowUpdateUserProfileModal(true)}
-          >
-            <DropDownItem cursor="pointer">
-              <Image
-                src={UserProfileIcon}
-                height="32px"
-                maxHeight="32px"
-                width={'auto'}
-                cursor="pointer"
-              />
 
-              <TextItem cursor="pointer">Edit Profile</TextItem>
-            </DropDownItem>
-          </DropDownBar>
+            <TextItem cursor="pointer">Edit Profile</TextItem>
+          </DropDownItem>
+        </DropDownBar>
+      )}
+      {showUpdateUserProfileModal &&
+        createPortal(
+          <UpdateUserProfileModal
+            theme={theme}
+            setModal={setShowUpdateUserProfileModal}
+            userProfile={userProfile!}
+            setUserProfile={setUserProfile}
+            updateUserProfileModalBackground={updateUserProfileModalBackground}
+            updateUserProfileModalPositionType={updateUserProfileModalPositionType}
+          />,
+          document.body
         )}
-        {showUpdateUserProfileModal &&
-          createPortal(
-            <UpdateUserProfileModal
-              theme={theme}
-              setModal={setShowUpdateUserProfileModal}
-              userProfile={userProfile!}
-              setUserProfile={setUserProfile}
-              updateUserProfileModalBackground={updateUserProfileModalBackground}
-              updateUserProfileModalPositionType={updateUserProfileModalPositionType}
-            />,
-            document.body
-          )}
-      </Conatiner>
+    </Conatiner>
   );
 };