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.

Sign up for GitHub

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

Jump to bottom

Update main with alpha changes #1375

Merged
merged 44 commits into from
Jul 4, 2024
Merged

Update main with alpha changes #1375

merged 44 commits into from
Jul 4, 2024

Conversation

mishramonalisha76
Copy link
Collaborator

Fixes Issue #1370

Changes proposed

  • Updated main with alpha changed for deletion of old alpha branch

Check List (Check all the applicable boxes)

  • My code follows the code style of this project.
  • My change requires changes to the documentation.
  • I have updated the documentation accordingly.
  • This PR does not contain plagiarized content.
  • The title of my pull request is a short description of the requested changes.

Screenshots

Note to reviewers

HarshRajat and others added 30 commits May 15, 2024 20:50
@HarshRajat
fixed chat responsiveness
360083d
@HarshRajat
fixed preview link alignment to right
d864378
@HarshRajat
added relative imports for better management
3115854
@HarshRajat
Merge pull request #1289 from push-protocol/uiweb-absolute-imports
9e7432e 
added relative imports for better management
@HarshRajat
Merge pull request #1287 from push-protocol/responsiveness-mobile-uiw…
e0f7bae 
…eb-chat

Fixed ChatUI Components responsiveness
@mishramonalisha76
Search issue (#1270)
f5070a2 
* fix: fixed lint issues

* fix: added test for chat preview search list

* fix: fixed review comment

* Update ChatPreviewSearchList.tsx
@mohammeds1992
fix: Merge branch 'main' into alpha
8d360bc
@mishramonalisha76
fix: fixed support chat init issue (#1292)
1cfec21 
* fix: fixed support chat init issue

* fix: fixed lint errors
@corlard3y
fix(chatviewlist): increase hidden/encrypted chat blur
c244626 
fix #1307
@HarshRajat
Added Reaction support, (#1303)
c52e517 
* Fixed responsiveness in mobile for UIWeb:Chat

* fixes text alignment on frames preview link to come on right

* scroll bar fixes

* fixed reaction picker position, tweaked group type text, removed add button from define conditions in gated group

* removed unnecessary console.debug

* removed unnecessary console.debug

* Resolved comments, fixed curved edges go away, fixed correct time placement in ChatBubble

* Resolved comments
@corlard3y
fix: add selected option
4d56d45
@corlard3y
fix: add return fn
b0ac6c5
@corlard3y
fix: add comment to fn
2f37ba6
@corlard3y
fix: add push bot address
89975b4
@corlard3y
fix: export const
e5bd9fa
@corlard3y
fix: reset chat_id
7c60e1b
@corlard3y
fix: remove console
74be11e
@corlard3y
fix: update dark mode theme
d8241be
@corlard3y
fix: code review comments
122fb44
@corlard3y
fix: add null check
ed630b5
@corlard3y
fix: update conditions
19f3f6b
@abhishek-01k
fix: pending wallet address copy issue fixed
4a161c8 
When copying pending wallet address in the group info, only half of the wallet address was getting
copied

#1297
@corlard3y
fix: update chatprevie badge conditions
8c45b54
@abhishek-01k
fix: tooltip was not properly aligned
bbf6778 
Tooltip was not properly aigned in the group Info in UIWeb

#1299
@abhishek-01k
fix: scrollbar in member list in group info was not visible
2f3ade1 
Fixed the scrollbar issue in the member list in group info in uiweb

#1298
@corlard3y
Merge pull request #1312 from push-protocol/1307-bug-increase-bg-blur…
d8b026f 
…-when-groupchat-is-encrypted

🐛 [BUG] - <Increase bg blur when group/chat is encrypted>
@corlard3y
Merge pull request #1324 from push-protocol/skeleton-loading-dark-mode
8512e41 
🐛 [BUG] - <Skeleton loading in dark mode appears like light mode in chat>
@corlard3y
Merge pull request #1323 from push-protocol/1320-bug-chat-badge
06254e6 
🐛 [BUG] - Chat  badge getting updated for active/opened conversation>
@mishramonalisha76 @KlausMikhaelson
Space - id integration (#1322)
794666e 
* feat: integrating spaceid in uiweb

* fix: fixed project id setting error

* fix: removed unnecessary code

* fix: added space id

* Update AddWallets.tsx

* fix: made some optimisations

* fix: fixed lint issues

---------

Co-authored-by: KlausMikhaelson <satyamsingh5076@gmail.com>
@mishramonalisha76
fix: fixed the blurr issue in chat on join and accept group (#1305)
b295043
mishramonalisha76 and others added 14 commits May 29, 2024 23:19
@mishramonalisha76
fix: fixed lint issue
738383d
@rohitmalhotra1420
Merge branch 'main' of github.com:push-protocol/push-sdk into alpha
952f06d
@rohitmalhotra1420
fixed build error for incorrect naming
82087a9
@abhishek-01k
Merge branch 'alpha' into SDK-#1298-scrollbar-not-visible-on-member-info
5f57d4a
@abhishek-01k
Merge pull request #1326 from push-protocol/SDK-1297-copying-pendingW…
58636d0 
…allet-address-issue

fix: pending wallet address copy issue fixed
@abhishek-01k
Merge pull request #1328 from push-protocol/SDK-1299-Tooltip-not-prop…
cc8dc28 
…erly-aligned

fix: tooltip was not properly aligned
@abhishek-01k
Merge pull request #1329 from push-protocol/SDK-#1298-scrollbar-not-v…
7877b61 
…isible-on-member-info

fix: scrollbar in member list in group info was not visible
@mishramonalisha76 @rohitmalhotra1420
@HarshRajat @mohammeds1992 @corlard3y @KlausMikhaelson
fixes ui representation for domain resolution (#1336)
2c43806 
* Main Release 1.3.7 (#1334)

* fixed chat responsiveness

* fixed preview link alignment to right

* added relative imports for better management

* Search issue (#1270)

* fix: fixed lint issues

* fix: added test for chat preview search list

* fix: fixed review comment

* Update ChatPreviewSearchList.tsx

* fix: fixed support chat init issue (#1292)

* fix: fixed support chat init issue

* fix: fixed lint errors

* fix(chatviewlist): increase hidden/encrypted chat blur

fix #1307

* Added Reaction support,  (#1303)

* Fixed responsiveness in mobile for UIWeb:Chat

* fixes text alignment on frames preview link to come on right

* scroll bar fixes

* fixed reaction picker position, tweaked group type text, removed add button from define conditions in gated group

* removed unnecessary console.debug

* removed unnecessary console.debug

* Resolved comments, fixed curved edges go away, fixed correct time placement in ChatBubble

* Resolved comments

* fix: add selected option

* fix: add return fn

* fix: add comment to fn

* fix: add push bot address

* fix: export const

* fix: reset chat_id

* fix: remove console

* fix: update dark mode theme

* fix: code review comments

* fix: add null check

* fix: update conditions

* fix: update chatprevie badge conditions

* Space - id integration (#1322)

* feat: integrating spaceid in uiweb

* fix: fixed project id setting error

* fix: removed unnecessary code

* fix: added space id

* Update AddWallets.tsx

* fix: made some optimisations

* fix: fixed lint issues

---------

Co-authored-by: KlausMikhaelson <satyamsingh5076@gmail.com>

* fix: fixed the blurr issue in chat on join and accept group (#1305)

* fix: fixed lint issue

---------

Co-authored-by: harshrajat <harsh@epns.io>
Co-authored-by: Harsh | Push <harsh@push.org>
Co-authored-by: Monalisha Mishra <42746736+mishramonalisha76@users.noreply.github.com>
Co-authored-by: Mohammed S <shoaibmohammed92@gmail.com>
Co-authored-by: corlard3y <corlardey@gmail.com>
Co-authored-by: KlausMikhaelson <satyamsingh5076@gmail.com>
Co-authored-by: Monalisha Mishra <mishramonalisha76@gmail.com>

* Main Release 1.3.7 - Build error fixed (#1335)

* fix: fixed the ui representation of the domain name

* fix: fixed the domain representation in chatProfile

* fix: added utility func to fetch display name

* fix: added new function to check includes

---------

Co-authored-by: Rohit Malhotra <rohit.malhotra1420@gmail.com>
Co-authored-by: harshrajat <harsh@epns.io>
Co-authored-by: Harsh | Push <harsh@push.org>
Co-authored-by: Mohammed S <shoaibmohammed92@gmail.com>
Co-authored-by: corlard3y <corlardey@gmail.com>
Co-authored-by: KlausMikhaelson <satyamsingh5076@gmail.com>
@mishramonalisha76
fix: updated guild validation url (#1363)
957e093 
* fix: updated guild validation url

* Update tokenGatedGroup.ts
@rohitmalhotra1420
Merged main into alpha
b0c77c2
@mishramonalisha76
fix: fixed group creation (#1365)
0afda4d 
* fix: fixed group creation

* fix: fixed the example file

* fix: fixed build

* fix: reverted restapi change
@rohitmalhotra1420
Merge branch 'main' of github.com:push-protocol/push-sdk into alpha
5333500
@Aman035
fix: fix lint issues
484f95d
@abhishek-01k
fix: made Group Chat Modal More Persistent (#1339)
7866a3d 
* fix: made Group Chat Modal More Persistent

Modal in the group chat has been modified and now it doesn't close on the clickaway triggered. Also,
added a boolean prop to make it go away when the clickaway is triggered

#1338

* fix: prop issue fixed for UpdateUserProfileModal file as well

* fix: added closeModalOnClickAway to ChatView and UserProfile component

* fix: changed the name of the Modal ClickAway in Group Info and User Profile

* fix: changed the name of modal clickaway prop for user profile and chat profile
@github-actions GitHub Actions
Copy link

github-actions bot commented Jul 4, 2024

In send.ts:

  1. Missing comma after pgpHelper: IPGPHelper.
  2. Typo in try statement before Compute Input Options comments. It should be try {.
  3. Typo in * Validate Input Options comments, remove extra asterisk.
  4. Typo in messageSentTo variable, change participants.find to participants.findIndex.
  5. In ChatProfile.tsx:
    • Typo in ImageItem component, change it to AddonComponentSection.
    • Typo in TextItem component, change it to Span.
    • Some indentation issues in the component structure.

In ChatProfileInfoModal.tsx:

  1. In GroupSectionProps type, MembersType should be imported or defined.
  2. Typo in handlePrevious function, missing closing curly brace at the end of the function.
  3. Typo in onClose function, missing closing curly brace at the end of the function.

Overall, there are some typos and minor errors in the code. Kindly rectify them as mentioned above.

@rohitmalhotra1420 rohitmalhotra1420 merged commit 5792e84 into main Jul 4, 2024
1 check passed
@mishramonalisha76 mishramonalisha76 deleted the alpha branch July 4, 2024 11:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rohitmalhotra1420 rohitmalhotra1420 rohitmalhotra1420 approved these changes

Assignees

@mishramonalisha76 mishramonalisha76

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@mishramonalisha76 @rohitmalhotra1420 @HarshRajat @mohammeds1992 @corlard3y @abhishek-01k @Aman035