Skip to content

Commit

Permalink
Main Release @uiweb 1.7.2 (#1421)
Browse files Browse the repository at this point in the history
* 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: pending wallet address copy issue fixed

When copying pending wallet address in the group info, only half of the wallet address was getting
copied

#1297

* fix: update chatprevie badge conditions

* fix: tooltip was not properly aligned

Tooltip was not properly aigned in the group Info in UIWeb

#1299

* fix: scrollbar in member list in group info was not visible

Fixed the scrollbar issue in the member list in group info in uiweb

#1298

* 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 <[email protected]>

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

* fix: fixed lint issue

* fixed build error for incorrect naming

* fixes ui representation for domain resolution (#1336)

* 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 <[email protected]>

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

* fix: fixed lint issue

---------

Co-authored-by: harshrajat <[email protected]>
Co-authored-by: Harsh | Push <[email protected]>
Co-authored-by: Monalisha Mishra <[email protected]>
Co-authored-by: Mohammed S <[email protected]>
Co-authored-by: corlard3y <[email protected]>
Co-authored-by: KlausMikhaelson <[email protected]>
Co-authored-by: Monalisha Mishra <[email protected]>

* 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 <[email protected]>
Co-authored-by: harshrajat <[email protected]>
Co-authored-by: Harsh | Push <[email protected]>
Co-authored-by: Mohammed S <[email protected]>
Co-authored-by: corlard3y <[email protected]>
Co-authored-by: KlausMikhaelson <[email protected]>

* fix: updated guild validation url (#1363)

* fix: updated guild validation url

* Update tokenGatedGroup.ts

* fix: fixed group creation (#1365)

* fix: fixed group creation

* fix: fixed the example file

* fix: fixed build

* fix: reverted restapi change

* fix: fix lint issues

* fix: made Group Chat Modal More Persistent (#1339)

* 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

* fix: fixed font sizes and dark theme (#1376)

* fix: fixed font sizes and dark theme

* fix: fixed line height

* Add erc1155 to token gating group conditions (#1382)

* feat: add erc1155 to token gating group conditions

* fix: add tokenId to fetchContractInfo function

* lock file updated

---------

Co-authored-by: rohitmalhotra1420 <[email protected]>

* Replaced useResolveWeb3Name hook with resolveWeb3Name helper function (#1390)

* fix: added common resolveweb3 for domain name

* fix: fixed review comments

* Notification Ui change (#1396)

* feat: new notification ui

* fix: fixed review comments

* lock file changed

* fix: fixed color and cta hover

* fix: fixed the review comments

* fix: fixed link icon

---------

Co-authored-by: rohitmalhotra1420 <[email protected]>

* Push Chat Reply Feature (#1399)

* Functioning reply in ChatPreviewList, ChatList and Input

* Reply cancel and replying to in UIWeb:MessageInput

* Reply Feature with styles

* fix: modified some parts in helper func

* fix: added the replied to text and also fixed the emoji picker position

added the replied to text in the chat bubble and fixed the emoji picker position also fixed the
breaking of the chat due to the messagetype issue

* fix: fixed the UI for the reply feature

changed the replying to to reply and also fixed the image positioning

* fix: fixed the issues

moved the funcs to helpers and also removed the commented code

* fix: fixed image in notification

* fix: added the commented code that was removed

---------

Co-authored-by: abhishek-01k <[email protected]>
Co-authored-by: Monalisha Mishra <[email protected]>

* uiweb lock file updated

* Add support for new chains in the chat criteria modal (#1404)

* fix: add cyber, linea and base

* fix: update cyber

* fix: fixed the theme for chat reply feature

fixed the UI of the chat reply

* Added new infura key (#1408)

* fix: fixed infura key

* fix: fixed build issue

* fix: changed infura key

* fix: fixed review comments

* fix: fixed review comment

* lock files  fixed

* fix: fixed the twitter preview Size issue

* fix: modified the address for the reply preview

* Release 1.7.0 (#1411) (#1413)

* fix: fixed font sizes and dark theme (#1376)

* fix: fixed font sizes and dark theme

* fix: fixed line height

* Add erc1155 to token gating group conditions (#1382)

* feat: add erc1155 to token gating group conditions

* fix: add tokenId to fetchContractInfo function

* lock file updated

---------



* Replaced useResolveWeb3Name hook with resolveWeb3Name helper function (#1390)

* fix: added common resolveweb3 for domain name

* fix: fixed review comments

* Notification Ui change (#1396)

* feat: new notification ui

* fix: fixed review comments

* lock file changed

* fix: fixed color and cta hover

* fix: fixed the review comments

* fix: fixed link icon

---------



* Push Chat Reply Feature (#1399)

* Functioning reply in ChatPreviewList, ChatList and Input

* Reply cancel and replying to in UIWeb:MessageInput

* Reply Feature with styles

* fix: modified some parts in helper func

* fix: added the replied to text and also fixed the emoji picker position

added the replied to text in the chat bubble and fixed the emoji picker position also fixed the
breaking of the chat due to the messagetype issue

* fix: fixed the UI for the reply feature

changed the replying to to reply and also fixed the image positioning

* fix: fixed the issues

moved the funcs to helpers and also removed the commented code

* fix: fixed image in notification

* fix: added the commented code that was removed

---------




* uiweb lock file updated

* Add support for new chains in the chat criteria modal (#1404)

* fix: add cyber, linea and base

* fix: update cyber

* Added new infura key (#1408)

* fix: fixed infura key

* fix: fixed build issue

* fix: changed infura key

* fix: fixed review comments

* fix: fixed review comment

* lock files  fixed

---------

Co-authored-by: Rohit Malhotra <[email protected]>
Co-authored-by: Kalash Shah <[email protected]>
Co-authored-by: Harsh | Push <[email protected]>
Co-authored-by: abhishek-01k <[email protected]>
Co-authored-by: Kolade <[email protected]>

* Revert "Release 1.7.0 (#1411) (#1413)" (#1414)

This reverts commit f96f451.

* Stream fixes (#1417)

* Release 1.7.0 (#1411)

* fix: fixed font sizes and dark theme (#1376)

* fix: fixed font sizes and dark theme

* fix: fixed line height

* Add erc1155 to token gating group conditions (#1382)

* feat: add erc1155 to token gating group conditions

* fix: add tokenId to fetchContractInfo function

* lock file updated

---------

Co-authored-by: rohitmalhotra1420 <[email protected]>

* Replaced useResolveWeb3Name hook with resolveWeb3Name helper function (#1390)

* fix: added common resolveweb3 for domain name

* fix: fixed review comments

* Notification Ui change (#1396)

* feat: new notification ui

* fix: fixed review comments

* lock file changed

* fix: fixed color and cta hover

* fix: fixed the review comments

* fix: fixed link icon

---------

Co-authored-by: rohitmalhotra1420 <[email protected]>

* Push Chat Reply Feature (#1399)

* Functioning reply in ChatPreviewList, ChatList and Input

* Reply cancel and replying to in UIWeb:MessageInput

* Reply Feature with styles

* fix: modified some parts in helper func

* fix: added the replied to text and also fixed the emoji picker position

added the replied to text in the chat bubble and fixed the emoji picker position also fixed the
breaking of the chat due to the messagetype issue

* fix: fixed the UI for the reply feature

changed the replying to to reply and also fixed the image positioning

* fix: fixed the issues

moved the funcs to helpers and also removed the commented code

* fix: fixed image in notification

* fix: added the commented code that was removed

---------

Co-authored-by: abhishek-01k <[email protected]>
Co-authored-by: Monalisha Mishra <[email protected]>

* uiweb lock file updated

* Add support for new chains in the chat criteria modal (#1404)

* fix: add cyber, linea and base

* fix: update cyber

* Added new infura key (#1408)

* fix: fixed infura key

* fix: fixed build issue

* fix: changed infura key

* fix: fixed review comments

* fix: fixed review comment

* lock files  fixed

---------

Co-authored-by: Monalisha Mishra <[email protected]>
Co-authored-by: Kalash Shah <[email protected]>
Co-authored-by: Harsh | Push <[email protected]>
Co-authored-by: abhishek-01k <[email protected]>
Co-authored-by: Monalisha Mishra <[email protected]>
Co-authored-by: Kolade <[email protected]>

* Release 1.7.1 (#1412)

* fix: fixed font sizes and dark theme (#1376)

* fix: fixed font sizes and dark theme

* fix: fixed line height

* Add erc1155 to token gating group conditions (#1382)

* feat: add erc1155 to token gating group conditions

* fix: add tokenId to fetchContractInfo function

* lock file updated

---------

Co-authored-by: rohitmalhotra1420 <[email protected]>

* Replaced useResolveWeb3Name hook with resolveWeb3Name helper function (#1390)

* fix: added common resolveweb3 for domain name

* fix: fixed review comments

* Notification Ui change (#1396)

* feat: new notification ui

* fix: fixed review comments

* lock file changed

* fix: fixed color and cta hover

* fix: fixed the review comments

* fix: fixed link icon

---------

Co-authored-by: rohitmalhotra1420 <[email protected]>

* Push Chat Reply Feature (#1399)

* Functioning reply in ChatPreviewList, ChatList and Input

* Reply cancel and replying to in UIWeb:MessageInput

* Reply Feature with styles

* fix: modified some parts in helper func

* fix: added the replied to text and also fixed the emoji picker position

added the replied to text in the chat bubble and fixed the emoji picker position also fixed the
breaking of the chat due to the messagetype issue

* fix: fixed the UI for the reply feature

changed the replying to to reply and also fixed the image positioning

* fix: fixed the issues

moved the funcs to helpers and also removed the commented code

* fix: fixed image in notification

* fix: added the commented code that was removed

---------

Co-authored-by: abhishek-01k <[email protected]>
Co-authored-by: Monalisha Mishra <[email protected]>

* uiweb lock file updated

* Add support for new chains in the chat criteria modal (#1404)

* fix: add cyber, linea and base

* fix: update cyber

* fix: fixed the theme for chat reply feature

fixed the UI of the chat reply

* Added new infura key (#1408)

* fix: fixed infura key

* fix: fixed build issue

* fix: changed infura key

* fix: fixed review comments

* fix: fixed review comment

* lock files  fixed

* fix: fixed the twitter preview Size issue

* fix: modified the address for the reply preview

* Release 1.7.0 (#1411) (#1413)

* fix: fixed font sizes and dark theme (#1376)

* fix: fixed font sizes and dark theme

* fix: fixed line height

* Add erc1155 to token gating group conditions (#1382)

* feat: add erc1155 to token gating group conditions

* fix: add tokenId to fetchContractInfo function

* lock file updated

---------



* Replaced useResolveWeb3Name hook with resolveWeb3Name helper function (#1390)

* fix: added common resolveweb3 for domain name

* fix: fixed review comments

* Notification Ui change (#1396)

* feat: new notification ui

* fix: fixed review comments

* lock file changed

* fix: fixed color and cta hover

* fix: fixed the review comments

* fix: fixed link icon

---------



* Push Chat Reply Feature (#1399)

* Functioning reply in ChatPreviewList, ChatList and Input

* Reply cancel and replying to in UIWeb:MessageInput

* Reply Feature with styles

* fix: modified some parts in helper func

* fix: added the replied to text and also fixed the emoji picker position

added the replied to text in the chat bubble and fixed the emoji picker position also fixed the
breaking of the chat due to the messagetype issue

* fix: fixed the UI for the reply feature

changed the replying to to reply and also fixed the image positioning

* fix: fixed the issues

moved the funcs to helpers and also removed the commented code

* fix: fixed image in notification

* fix: added the commented code that was removed

---------




* uiweb lock file updated

* Add support for new chains in the chat criteria modal (#1404)

* fix: add cyber, linea and base

* fix: update cyber

* Added new infura key (#1408)

* fix: fixed infura key

* fix: fixed build issue

* fix: changed infura key

* fix: fixed review comments

* fix: fixed review comment

* lock files  fixed

---------

Co-authored-by: Rohit Malhotra <[email protected]>
Co-authored-by: Kalash Shah <[email protected]>
Co-authored-by: Harsh | Push <[email protected]>
Co-authored-by: abhishek-01k <[email protected]>
Co-authored-by: Kolade <[email protected]>

* Revert "Release 1.7.0 (#1411) (#1413)" (#1414)

This reverts commit f96f451.

---------

Co-authored-by: Kalash Shah <[email protected]>
Co-authored-by: rohitmalhotra1420 <[email protected]>
Co-authored-by: Harsh | Push <[email protected]>
Co-authored-by: abhishek-01k <[email protected]>
Co-authored-by: Kolade <[email protected]>
Co-authored-by: Abhishek <[email protected]>

* fix: stream handling multiplier listeners

* fix: build issue

* fix: added logs

* fix: added type

* fix: stream fix

* fix: logs removal

* Update package.json

* Update UserProfile.tsx

* Update ChatDataProvider.tsx

* Update ChatDataProvider.tsx

* fix: fix log

---------

Co-authored-by: Rohit Malhotra <[email protected]>
Co-authored-by: Monalisha Mishra <[email protected]>
Co-authored-by: Kalash Shah <[email protected]>
Co-authored-by: Harsh | Push <[email protected]>
Co-authored-by: abhishek-01k <[email protected]>
Co-authored-by: Monalisha Mishra <[email protected]>
Co-authored-by: Kolade <[email protected]>
Co-authored-by: Abhishek <[email protected]>

* Stream and UserProfile Fix (#1419)

* fix: fixed stream issue

* fix: added new restapi version

---------

Co-authored-by: harshrajat <[email protected]>
Co-authored-by: Harsh | Push <[email protected]>
Co-authored-by: Monalisha Mishra <[email protected]>
Co-authored-by: Mohammed S <[email protected]>
Co-authored-by: corlard3y <[email protected]>
Co-authored-by: abhishek-01k <[email protected]>
Co-authored-by: KlausMikhaelson <[email protected]>
Co-authored-by: Monalisha Mishra <[email protected]>
Co-authored-by: Abhishek <[email protected]>
Co-authored-by: aman035 <[email protected]>
Co-authored-by: Kalash Shah <[email protected]>
Co-authored-by: Mohammed S <[email protected]>
  • Loading branch information
13 people authored Nov 7, 2024
1 parent 2334e18 commit 3db8802
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion packages/uiweb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"uuid": "^9.0.1"
},
"peerDependencies": {
"@pushprotocol/restapi": "1.7.25",
"@pushprotocol/restapi": "1.7.29",
"@pushprotocol/socket": "^0.5.0",
"react": ">=16.8.0",
"styled-components": "^6.0.8"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { ProfileContainer } from '../reusables';
import { ThemeContext } from '../theme/ThemeProvider';
import { UpdateUserProfileModal } from './UpdateUserProfileModal';

import { device } from '../../../config';
import { GUEST_MODE_ACCOUNT, device } from '../../../config';
import VerticalEllipsisIcon from '../../../icons/VerticalEllipsis.svg';
import UserProfileIcon from '../../../icons/userCircleGear.svg';
import { MODAL_BACKGROUND_TYPE, MODAL_POSITION_TYPE } from '../../../types';
Expand Down Expand Up @@ -96,7 +96,7 @@ export const UserProfile: React.FC<UserProfileProps> = ({
member={{
web3Name: web3Name,
abbrRecipient: shortenText(pCAIP10ToWallet(user?.account || ''), 8, true) as string,
recipient: user!.account,
recipient: user?.account || GUEST_MODE_ACCOUNT,
icon: userProfile?.profile?.picture || null,
}}
copy={true}
Expand Down
9 changes: 5 additions & 4 deletions packages/uiweb/src/lib/dataProviders/ChatDataProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,10 @@ export const ChatUIProvider = ({

// check and filter out the streams which are not connected
const streamsToConnect = streams.filter((stream) => !connectedStreams.listen?.includes(stream));

const uniqueStreams = [...new Set([...connectedStreams.listen, ...streams])];

if (streamsToConnect.length) {
await userInstance.stream?.reinit(streams, {
await userInstance.stream?.reinit(uniqueStreams, {
connection: {
retries: 3, // number of retries in case of error
},
Expand Down Expand Up @@ -415,10 +416,10 @@ export const ChatUIProvider = ({

// setTimeout(async () => {
// console.debug('UIWeb::ChatDataProvider::attachListenersAndConnect::Timeout Connect', userInstance?.stream?.uid);
if (!userInstance.stream?.connected()) {
if (!userInstance?.stream?.connected()) {
console.debug('UIWeb::ChatDataProvider::attachListenersAndConnect::Stream not connected', userInstance);

await userInstance.stream?.connect();
await userInstance?.stream?.connect();
console.debug(
'UIWeb::ChatDataProvider::attachListenersAndConnect::Stream listeners attached and stream connected',
userInstance?.stream?.uid
Expand Down

0 comments on commit 3db8802

Please sign in to comment.