fix: merge main

push-protocol · Nov 11, 2023 · 33f6723 · 33f6723
2 parents 7e48ede + 00ff9a5
commit 33f6723
Show file tree

Hide file tree

Showing 3 changed files with 4,799 additions and 5,805 deletions.
diff --git a/packages/examples/sdk-frontend-react/src/app/app.tsx b/packages/examples/sdk-frontend-react/src/app/app.tsx
@@ -88,10 +88,11 @@ import SearchSpaceTest from './SpaceTest/SearchSpaceTest';
 import SearchGroupTest from './ChatTest/SearchGroupTest';
 import RejectRequestTest from './ChatTest/RejectRequestTest';
 import GetGroupMemberStatusTest from './ChatTest/GetGroupMemberStatusTest';
+import { ChatSupportTest } from './ChatSupportTest';
 import GetChatMemberCountTest from './ChatTest/GetChatMemberCountTest';
 import GetGroupInfoTest from './ChatTest/GetGroupInfoTest';
 import GetGroupMembersTest from './ChatTest/GetGroupMembersTest';
-import { ChatSupportTest } from './ChatSupportTest';
+
 
 window.Buffer = window.Buffer || Buffer;
 
@@ -316,7 +317,7 @@ export function App() {
           <Web3Context.Provider value={{ account, active, library, chainId }}>
             <SocketContext.Provider value={socketData}>
               <AccountContext.Provider value={{ pgpPrivateKey, setSpaceId }}>
-                <ChatUIProvider env={env} theme={lightChatTheme}>
+                <ChatUIProvider  env={env} theme={lightChatTheme} >
                   <SpacesUIProvider spaceUI={spaceUI} theme={customDarkTheme}>
                     <Routes>
                       <Route

diff --git a/packages/restapi/CHANGELOG.md b/packages/restapi/CHANGELOG.md
@@ -2,16 +2,6 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
-## [0.0.1-alpha.51](https://github.com/ethereum-push-notification-service/push-sdk/compare/restapi-0.0.1-alpha.50...restapi-0.0.1-alpha.51) (2023-11-10)
-
-
-### Bug Fixes
-
-* fix: merge issues ([#786](https://github.com/ethereum-push-notification-service/push-sdk/issues/786)) ([2462993](https://github.com/ethereum-push-notification-service/push-sdk/commit/24629931388042ddb9c54cb2b3542d5a5e2173cc))
-* fixed merge conflicts with main ([040cd67](https://github.com/ethereum-push-notification-service/push-sdk/commit/040cd6798da69ed6bf5c8de2e068788606b4a385))
-
-
-
 ## [0.0.1-alpha.50](https://github.com/ethereum-push-notification-service/push-sdk/compare/restapi-0.0.1-alpha.49...restapi-0.0.1-alpha.50) (2023-10-16)