Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Alpha merge #1204

Merged
merged 64 commits into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
11a0801
add: ethers support (#952)
Aman035 Jan 2, 2024
40e5941
fix: fix ethers provider issue
Aman035 Jan 3, 2024
4bccf07
fix: fix channel.update
Aman035 Jan 3, 2024
98e8e86
fix: merge main
mohammeds1992 Jan 9, 2024
d5ef9ce
fix: Merge branch 'main' into alpha
mohammeds1992 Jan 15, 2024
aacfea3
feat(video-v2): add video v2 class and stream (#930)
madhur-push Jan 15, 2024
2979e5a
fix: merge main
mohammeds1992 Jan 18, 2024
35039b5
Chat Preview List workable PoC (#987)
HarshRajat Jan 18, 2024
fe2a3c5
fix: changed stream type to any
mishramonalisha76 Jan 18, 2024
15c8488
fix: fixed issues on chatpreviewlist (#1044)
mishramonalisha76 Jan 19, 2024
85d862f
fix: added a dynamic component for no chatId (#1042)
mishramonalisha76 Jan 23, 2024
8046688
fix: changed pushUser to user (#1058)
mishramonalisha76 Jan 23, 2024
e57f0ee
Chatpreview bug (#1063)
mishramonalisha76 Jan 25, 2024
d1cbafb
fix: fixed minor limit bug (#1065)
mishramonalisha76 Jan 25, 2024
bbd583c
Bug fix (#1068)
mishramonalisha76 Jan 29, 2024
64b8d97
Chatprofile (#1040)
mishramonalisha76 Jan 31, 2024
9961ab7
fix: fixed preview bugs (#1078)
mishramonalisha76 Feb 1, 2024
e051b80
Userprofile (#1084)
mishramonalisha76 Feb 1, 2024
78483d6
fix: removed console
mishramonalisha76 Feb 1, 2024
7be33d9
fix: fixed length issue in test
mishramonalisha76 Feb 1, 2024
fdf8e13
fix: fixed pagination bug
mishramonalisha76 Feb 2, 2024
a8332fc
fix: the messages disappearing on scroll (#1077)
pritipsingh Feb 2, 2024
abbc6ad
fix: fixed chat preview stream issues (#1085)
mishramonalisha76 Feb 2, 2024
c9ddf4d
897 improvement proposal spaces high level functions (#898)
mohammeds1992 Feb 7, 2024
638b5d7
fix(restapi): build errors from spaces (#1098)
madhur-push Feb 8, 2024
d832ae3
feat(spaces v2): update space.initialize() param name, rename media()…
madhur-push Feb 8, 2024
a193560
fix: media emoji added
pritipsingh Feb 8, 2024
1d4622c
fix: sending first message now shows in the inbox
pritipsingh Feb 8, 2024
49d6bfc
fix: for requests for receivers
pritipsingh Feb 9, 2024
2b4fbce
Merge pull request #1106 from ethereum-push-notification-service/medi…
HarshRajat Feb 9, 2024
c695c18
fix: added notification widget layout (#1076)
mishramonalisha76 Feb 13, 2024
658db3c
Alpha deployment (#1112)
mishramonalisha76 Feb 13, 2024
ae6934f
fix: merge main to alpha
mohammeds1992 Feb 13, 2024
bc1ade0
Alpha deployment (#1114)
mishramonalisha76 Feb 13, 2024
ca38a40
Alpha deployment (#1116)
mishramonalisha76 Feb 19, 2024
b7305b3
1119 read only mode bug fix (#1120)
mohammeds1992 Feb 21, 2024
9c6383c
Alpha deployment (#1121)
mishramonalisha76 Feb 21, 2024
e5f598e
fix: merged main
Aman035 Feb 22, 2024
523bfb8
Mark ethers optional (#1124)
Aman035 Feb 26, 2024
8b00609
fix: added prefillChatList (#1122)
mishramonalisha76 Feb 28, 2024
841a2b7
fix: fixed minor issue
mishramonalisha76 Feb 29, 2024
3bf3bf0
Alpha deployment (#1132)
mishramonalisha76 Feb 29, 2024
3111be5
Minor changes in spaces v2 SDK (#1136)
madhur-push Mar 2, 2024
370e2f2
fix: Merge branch 'main' into alpha
mohammeds1992 Mar 2, 2024
ebbfc9c
Alpha deployment (#1134)
mishramonalisha76 Mar 5, 2024
0ea4e02
fix: stream connection support chat + pushUser to user fix (#1066)
pritipsingh Mar 5, 2024
44b0253
Alpha deployment (#1146)
mishramonalisha76 Mar 5, 2024
4e40221
fix: z-index modal (#1152)
pritipsingh Mar 6, 2024
ad47344
Revert "fix: z-index modal (#1152)" (#1153)
mishramonalisha76 Mar 6, 2024
71c5b0d
Fix role change stream event (#1157)
Aman035 Mar 7, 2024
dd88465
fix: Merge branch 'main' into alpha
mohammeds1992 Mar 7, 2024
d902ded
fix: pulled main
mishramonalisha76 Mar 8, 2024
b4305dc
Added channel.list API (#1160)
HarshRajat Mar 11, 2024
8fb3301
fix: horizontal scroll (#1156)
pritipsingh Mar 14, 2024
b7391b6
fix: pulled main
mishramonalisha76 Mar 21, 2024
53a795d
fix: Merge branch 'main' into alpha
mohammeds1992 Mar 21, 2024
5f18cff
Alpha deployment (#1178)
mishramonalisha76 Mar 22, 2024
85cf829
fix: support chat scroll (#1184)
pritipsingh Mar 27, 2024
a68929c
Group fixes (#1182)
mishramonalisha76 Apr 1, 2024
5e6dcc5
fix: fixed user giving undefined for info (#1194)
mishramonalisha76 Apr 1, 2024
1e6caa2
Chatviewlist migration (#1164)
mishramonalisha76 Apr 2, 2024
029e34d
Alpha deployment (#1200)
mishramonalisha76 Apr 2, 2024
b7f4856
Revert "Alpha deployment (#1200)" (#1201)
mishramonalisha76 Apr 2, 2024
9543bd5
fix: Merge branch 'main' into alpha
mohammeds1992 Apr 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const ChatSupportTest = () => {
<SupportChat

signer={librarySigner}
supportAddress="harshr.eth"
supportAddress="4ac5ab85c9c3d57adbdf2dba79357e56b2f9ef0256befe750d9f93af78d2ca68"
env={env}
greetingMsg="How can i help you?"
theme={lightTheme}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,16 +151,16 @@ const ChatPreviewListTest = () => {

<div style={{background: "#ffeded", border: "1px solid rgb(226,8,128)", height: "28.5vh"}}>
<ChatPreviewList
listType={chatRequests ? "REQUESTS" : "CHATS"}
listType={"REQUESTS"}
overrideAccount={address ? address : undefined}
onChatSelected={(chatid,chatParticipant) => { console.log("Chat id: ", chatid,chatParticipant) }}
onUnreadCountChange={(count) => { console.log("Count is: ", count) }}
onLoading={(loadingData) => { console.log("loading data: ", loadingData) }}
onPaging={(chats) => { console.log("paging chats are: ", chats) }}
onPreload={(chats) => { console.log("preload chats are: ", chats) }}
prefillChatPreviewList={prefill}
// prefillChatPreviewList={prefill}
// listType='SEARCH'
// searchParamter='0x56A734ba4C7c7b117774C9aAcCEf521eBE66d65b'
// searchParamter='c2d544ad9d1efd5c5a593b143bf8232875c926cf28015564e70ad078b95f807e'
/>
</div>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ export const ChatProfileTest = () => {
<ChatProfile
chatProfileLeftHelperComponent={<div>left component</div>}
chatProfileRightHelperComponent={<div>right component</div>}
chatId='4ac5ab85c9c3d57adbdf2dba79357e56b2f9ef0256befe750d9f93af78d2ca68'
// chatId='36baf37e441fdd94e23406c6c716fc4e91a93a9ee68e070cd5b054534dbe09a6'
chatId='monalisha.wallet'
// chatId='d9c2d6fa7132d49ea6d1b570f0ebd2bcc45c1ecac726eab993ad91c574fbe3c6'
/>
</div>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ const ChatViewComponentTest = () => {
<div>
<h2>Chat View 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}/> */}
<ChatView
onVerificationFail={() => console.log("Verification Failed")}

chatId='0x56A734ba4C7c7b117774C9aAcCEf521eBE66d65b'
chatId='0xf8250D363BD1F25f52F10C21188fe82c68C049c4'
chatProfileLeftHelperComponent={<img src={Img} onClick={()=>console.debug('clicked')}/>}
chatProfileRightHelperComponent={<div>right component</div>}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const ChatViewListTest = () => {
{/* <Loader show={isLoading} /> */}

<ChatViewListCard>
<ChatViewList chatId='0x5fca4523728576d6DD418137D5C8F38de5e6A1A8' limit={10} />
<ChatViewList chatId='0x7a76FD2749d12f66F9e4d9A3a80bdeD5291425cF' limit={10} />

</ChatViewListCard>
{/* <MessageInput chatId='196f58cbe07c7eb5716d939e0a3be1f15b22b2334d5179c601566600016860ac' isConnected={true} /> */}
Expand Down
2 changes: 1 addition & 1 deletion packages/restapi/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pushprotocol/restapi",
"version": "1.7.2",
"version": "0.0.1-alpha.74",
"type": "commonjs",
"publishConfig": {
"registry": "https://registry.npmjs.org/"
Expand Down
22 changes: 15 additions & 7 deletions packages/restapi/src/lib/pushNotification/PushNotificationTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,7 @@ export type ChannelOptions = {
raw: boolean;
};

export type ChannelListOptions = {
page?: number;
limit?: number;
sort?: ChannelListSortType;
order?: ChannelListOrderType;
};


export enum ChannelListType {
ALL = 'all',
Expand All @@ -144,7 +139,20 @@ export enum ChannelListSortType {
SUBSCRIBER = 'subscribers',
}



export type ChannelListOptions = {
page?: number;
limit?: number;
sort?: ChannelListSortType;
order?: ChannelListOrderType;
};





export enum ChannelListOrderType {
ASCENDING = 'asc',
DESCENDING = 'desc',
}
};
59 changes: 59 additions & 0 deletions packages/uiweb/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,65 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

## [1.1.15](https://github.com/push-protocol/push-sdk/compare/uiweb-0.0.1-alpha.44...uiweb-1.1.15) (2024-03-27)


### Bug Fixes

* add doman in user profile and chat profile and copy ([#1171](https://github.com/push-protocol/push-sdk/issues/1171)) ([e981565](https://github.com/push-protocol/push-sdk/commit/e9815656f76f99d841e0895ec4fc283abd04db16))
* added fetch chT ([c995efb](https://github.com/push-protocol/push-sdk/commit/c995efbac23cd5f20ca92c99763371345e54da95))
* added fetching chat ([684f4e0](https://github.com/push-protocol/push-sdk/commit/684f4e0d6de96fb583cb8f0650f802e784c7871b))
* added modify stream ([#1159](https://github.com/push-protocol/push-sdk/issues/1159)) ([15a3771](https://github.com/push-protocol/push-sdk/commit/15a3771e44c1abd923aee221422e943d1dae421e))
* added settings name ([#1168](https://github.com/push-protocol/push-sdk/issues/1168)) ([62620ae](https://github.com/push-protocol/push-sdk/commit/62620ae7bc75f966b72f3058a8b4a08f40d6aa14))
* class based done for chat viewlist messageInput ([b8e7b79](https://github.com/push-protocol/push-sdk/commit/b8e7b798ba955977635edda4311c9b484463d5f7))
* converted messageInput to class based ([fbcf296](https://github.com/push-protocol/push-sdk/commit/fbcf2969779a993baabf21bc9c3079bf6d4e09c2))
* converted send to class based ([b3daeaa](https://github.com/push-protocol/push-sdk/commit/b3daeaa0932826bad241cff4936ada82915f0b6d))
* debugging stream issue ([0cf2092](https://github.com/push-protocol/push-sdk/commit/0cf2092f2745c0eb776d3d4be2d003866a31cc2b))
* debugging stream issue ([5ea8fc4](https://github.com/push-protocol/push-sdk/commit/5ea8fc491d4f7259e1eb19b75c5d6b84ecf77704))
* fix ([28f9a11](https://github.com/push-protocol/push-sdk/commit/28f9a11e4638134a582ea1c7a8b69d780cf4c3cf))
* fixed ([862ab33](https://github.com/push-protocol/push-sdk/commit/862ab332c99d268d0318247486b7f7790707c56a))
* fixed ([61a81db](https://github.com/push-protocol/push-sdk/commit/61a81db4d064736ca7f7302ea6e1d9059f378af1))
* fixed chat bugs ([f4cdbda](https://github.com/push-protocol/push-sdk/commit/f4cdbdac6088cfc31b2b555038838bd5bb795f0c))
* fixed chatpreview and widget issues ([ff6b576](https://github.com/push-protocol/push-sdk/commit/ff6b576ed969b328c29806966daee57b397f83a2))
* fixed lint issues ([c13c171](https://github.com/push-protocol/push-sdk/commit/c13c171886970860de15ed0d4179949a436ef225))
* fixed merge conflicts ([db2fd58](https://github.com/push-protocol/push-sdk/commit/db2fd5860ced139b5d5cc269e1cd518e52e4e180))
* fixed minor bugs ([2b02a65](https://github.com/push-protocol/push-sdk/commit/2b02a65907659cecfbcdbf03e78b20b60a9021c1))
* fixed search for chatId in chatpreview ([6e3cbc7](https://github.com/push-protocol/push-sdk/commit/6e3cbc7b924083fd71238c48029dbb291b56f29a))
* fixed signer bug ([#1073](https://github.com/push-protocol/push-sdk/issues/1073)) ([0d3fd91](https://github.com/push-protocol/push-sdk/commit/0d3fd9124ce94d77efee86783f90de6aadbaea68))
* fixed stream and pulled alpha ([06effe2](https://github.com/push-protocol/push-sdk/commit/06effe2a66845019cbe7390b799ecfe2cd0af341))
* hack for stream fix ([7d89449](https://github.com/push-protocol/push-sdk/commit/7d89449b91870fc205aae66377103b86ab0a64b4))
* horizontal scroll ([#1156](https://github.com/push-protocol/push-sdk/issues/1156)) ([8fb3301](https://github.com/push-protocol/push-sdk/commit/8fb3301146469df60eb32bef5703e3acb474101d))
* Merge branch 'main' into alpha ([53a795d](https://github.com/push-protocol/push-sdk/commit/53a795db5ec82d44597410dca670dfadd9199277))
* merged alpha ([fb0d5fa](https://github.com/push-protocol/push-sdk/commit/fb0d5fac604aafe2f2da7d8db32eaf8ee8823f38))
* **migrate goerli to sepolia:** migrate goerli to sepolia ([#1149](https://github.com/push-protocol/push-sdk/issues/1149)) ([490b104](https://github.com/push-protocol/push-sdk/commit/490b104902b9a509c6a8c68d5c5f33446e91e113))
* pulled main ([b7391b6](https://github.com/push-protocol/push-sdk/commit/b7391b6318b40117d61b86ea8163b116f757c94a))
* removed event listeners ([3363fee](https://github.com/push-protocol/push-sdk/commit/3363fee687ad8fe894c8f851e723afa00c339578))



## [0.0.1-alpha.45](https://github.com/ethereum-push-notification-service/push-sdk/compare/uiweb-0.0.1-alpha.44...uiweb-0.0.1-alpha.45) (2024-03-07)


### Bug Fixes

* added prefillChatList ([#1122](https://github.com/ethereum-push-notification-service/push-sdk/issues/1122)) ([8b00609](https://github.com/ethereum-push-notification-service/push-sdk/commit/8b006090d414c19f75a13ca782cde5dab0569b91))
* fixed build issues ([f68a1ed](https://github.com/ethereum-push-notification-service/push-sdk/commit/f68a1edad6aa0b4c43511cd3f25cb08888f2a235))
* fixed chat bugs ([f4cdbda](https://github.com/ethereum-push-notification-service/push-sdk/commit/f4cdbdac6088cfc31b2b555038838bd5bb795f0c))
* fixed chatpreview ([25184de](https://github.com/ethereum-push-notification-service/push-sdk/commit/25184de7d505d72b1603e37b630d9ed205d479f5))
* fixed chatpreview and widget issues ([ff6b576](https://github.com/ethereum-push-notification-service/push-sdk/commit/ff6b576ed969b328c29806966daee57b397f83a2))
* fixed gues mode user profile ([f08725e](https://github.com/ethereum-push-notification-service/push-sdk/commit/f08725e27e5e6257cdaccd0634d706d4ce4de8b2))
* fixed merge conflicts ([db2fd58](https://github.com/ethereum-push-notification-service/push-sdk/commit/db2fd5860ced139b5d5cc269e1cd518e52e4e180))
* fixed minor bugs ([2b02a65](https://github.com/ethereum-push-notification-service/push-sdk/commit/2b02a65907659cecfbcdbf03e78b20b60a9021c1))
* fixed minor issue ([841a2b7](https://github.com/ethereum-push-notification-service/push-sdk/commit/841a2b79e504af904aa99fc07b1d73c9e4f56b22))
* fixed subscription error ([5431ff8](https://github.com/ethereum-push-notification-service/push-sdk/commit/5431ff849d7c01cbbb2511ebc9473d3d8548b2b3))
* fixed support chat issues ([c63cbb8](https://github.com/ethereum-push-notification-service/push-sdk/commit/c63cbb8b64c20c2b84046beae7e3b6135ca9332e))
* pulled alpha ([8d33691](https://github.com/ethereum-push-notification-service/push-sdk/commit/8d336911012e39bb0c4360820754230fa9b28a55))
* stream connection support chat + pushUser to user fix ([#1066](https://github.com/ethereum-push-notification-service/push-sdk/issues/1066)) ([0ea4e02](https://github.com/ethereum-push-notification-service/push-sdk/commit/0ea4e026bceb38d3b37267b43709614cb1740472))
* troubleshoot ([815c59a](https://github.com/ethereum-push-notification-service/push-sdk/commit/815c59a87deba30c8323a4d7d68f48bcedbbe730))



## [0.0.1-alpha.44](https://github.com/ethereum-push-notification-service/push-sdk/compare/uiweb-0.0.1-alpha.36...uiweb-0.0.1-alpha.44) (2024-02-13)
## [1.2.7](https://github.com/ethereum-push-notification-service/push-sdk/compare/uiweb-1.2.6...uiweb-1.2.7) (2024-03-11)


Expand Down
2 changes: 1 addition & 1 deletion packages/uiweb/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pushprotocol/uiweb",
"version": "1.2.7",
"version": "1.1.15",
"publishConfig": {
"registry": "https://registry.npmjs.org/"
},
Expand Down
Loading
Loading