fix: merged main

push-protocol · Nov 15, 2023 · 3b06ae1 · 3b06ae1
2 parents 03b1685 + 5c83514
commit 3b06ae1
Show file tree

Hide file tree

Showing 77 changed files with 8,806 additions and 7,564 deletions.
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.7",
     "socket.io-client": "^4.5.2",
-    "styled-components": "^5.3.5",
+    "styled-components": "^6.0.8",
     "tiny-invariant": "^1.2.0",
     "ts-mocha": "^10.0.0",
     "tslib": "^2.3.0",

diff --git a/packages/examples/sdk-frontend-react/src/app/ChatSupportTest.tsx b/packages/examples/sdk-frontend-react/src/app/ChatSupportTest.tsx
@@ -1,6 +1,6 @@
 import React, { useContext } from 'react';
 import { Web3Provider } from '@ethersproject/providers';
-import { Chat, ITheme } from '@pushprotocol/uiweb';
+import { SupportChat, ITheme } from '@pushprotocol/uiweb';
 import { lightTheme } from '@pushprotocol/uiweb';
 import { EnvContext, Web3Context } from './context';
 
@@ -31,10 +31,11 @@ export const ChatSupportTest = () => {
   };
 
   return (
-    <Chat
-      account={account}
+    //works as Chat as well as Support Chat
+    <SupportChat
+
       signer={librarySigner}
-      supportAddress="0xD2A371cAFBE09333F6668229E4BD33196583c325"
+      supportAddress="0x6F7919412318E65109c5698bd0E640fc33DE2337"
       apiKey="tAWEnggQ9Z.UaDBNjrvlJZx3giBTIQDcT8bKQo1O1518uF1Tea7rPwfzXv2ouV5rX9ViwgJUrXm"
       env={env}
       greetingMsg="How can i help you?"

diff --git a/packages/examples/sdk-frontend-react/src/app/ChatUITest/ChatViewComponent.tsx b/packages/examples/sdk-frontend-react/src/app/ChatUITest/ChatViewComponent.tsx
@@ -1,8 +1,8 @@
 import styled from 'styled-components';
 
 import { Section } from '../components/StyledComponents';
-import { CreateGroupModal } from "@pushprotocol/uiweb";
-import { ChatViewComponent } from '@pushprotocol/uiweb';
+import { CreateGroupModal, MODAL_BACKGROUND_TYPE, MODAL_POSITION_TYPE } from "@pushprotocol/uiweb";
+import { ChatView } from '@pushprotocol/uiweb';
 
 const ChatViewComponentTest = () => {
   const chatFilterList = [
@@ -15,7 +15,17 @@ const ChatViewComponentTest = () => {
       <h2>Chat UI Test page</h2>
       <CreateGroupModal onClose={()=>{console.log('in close')}} />
       <ChatViewComponentCard>
-        <ChatViewComponent onGetTokenClick={() => console.log("BOIIII RETURNNNSSSSS")} chatId='4ac5ab85c9c3d57adbdf2dba79357e56b2f9ef0256befe750d9f93af78d2ca68' limit={10} isConnected={true} />
+      <CreateGroupModal onClose={()=>{console.log('in close')}}  modalBackground={MODAL_BACKGROUND_TYPE.OVERLAY} modalPositionType={MODAL_POSITION_TYPE.RELATIVE}/>
+
+        <ChatView 
+        onVerificationFail={() => console.log("BOIIII RETURNNNSSSSS")} 
+        chatId='4ac5ab85c9c3d57adbdf2dba79357e56b2f9ef0256befe750d9f93af78d2ca68' 
+        limit={10}
+         isConnected={true} 
+         groupInfoModalBackground={MODAL_BACKGROUND_TYPE.OVERLAY}
+         groupInfoModalPositionType={MODAL_POSITION_TYPE.RELATIVE}
+         verificationFailModalPosition={MODAL_POSITION_TYPE.RELATIVE}
+         />
       </ChatViewComponentCard>
     </div>
   );
@@ -24,7 +34,8 @@ const ChatViewComponentTest = () => {
 export default ChatViewComponentTest;
 
 const ChatViewComponentCard = styled(Section)`
-  height: 60vh;
+  height: 80vh;
+  position:relative;
 `;
 //c2d544ad9d1efd5c5a593b143bf8232875c926cf28015564e70ad078b95f807e
 //4ac5ab85c9c3d57adbdf2dba79357e56b2f9ef0256befe750d9f93af78d2ca68
diff --git a/packages/examples/sdk-frontend-react/src/app/app.tsx b/packages/examples/sdk-frontend-react/src/app/app.tsx
@@ -88,6 +88,7 @@ import SearchSpaceTest from './SpaceTest/SearchSpaceTest';
 import SearchGroupTest from './ChatTest/SearchGroupTest';
 import RejectRequestTest from './ChatTest/RejectRequestTest';
 import GetGroupMemberStatusTest from './ChatTest/GetGroupMemberStatusTest';
+import { ChatSupportTest } from './ChatSupportTest';
 
 
 window.Buffer = window.Buffer || Buffer;
@@ -313,7 +314,7 @@ export function App() {
           <Web3Context.Provider value={{ account, active, library, chainId }}>
             <SocketContext.Provider value={socketData}>
               <AccountContext.Provider value={{ pgpPrivateKey, setSpaceId }}>
-                <ChatUIProvider  env={env} theme={darkChatTheme} account={account} pgpPrivateKey={pgpPrivateKey} signer={signer}>
+                <ChatUIProvider  env={env} theme={lightChatTheme} >
                   <SpacesUIProvider spaceUI={spaceUI} theme={customDarkTheme}>
                     <Routes>
                       <Route
@@ -559,7 +560,10 @@ export function App() {
                       <Route
                         path="ChatProfile"
                         element={<ChatProfileTest />}
-                      />
+                      /> <Route
+                      path="ChatSupport"
+                      element={<ChatSupportTest />}
+                    />
                   </Routes>
                   {/* <ChatWidgetTest/> */}
                   {/* <ChatWidgetTest /> */}

diff --git a/packages/restapi/CHANGELOG.md b/packages/restapi/CHANGELOG.md