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

[BUMP SDK IN DAPP] - Fix the the modal close behaviour on click outside modal #1611

Merged
merged 5 commits into from
Jul 2, 2024
Merged

[BUMP SDK IN DAPP] - Fix the the modal close behaviour on click outside modal #1611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ef7d08
Create group Modal Persistent Issue fix
abhishek-01k Jun 7, 2024
b57036e
Updated the dapp to the new exp release
abhishek-01k Jun 24, 2024
4279d6a
Pulled main to resolve conflicts
abhishek-01k Jul 1, 2024
9eea2f5
Changed the name in the sdk and updated this uiweb version
abhishek-01k Jul 1, 2024
f2f4d1e
Changed the version of uiweb to alpha version
abhishek-01k Jul 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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@mui/material": "^5.5.0",
"@pushprotocol/restapi": "1.7.20",
"@pushprotocol/socket": "0.5.3",
"@pushprotocol/uiweb": "1.4.1",
"@pushprotocol/uiweb": "1.6.0-alpha.6",
"@radix-ui/react-tooltip": "^1.1.1",
"@reach/tabs": "^0.18.0",
"@reduxjs/toolkit": "^1.7.1",
Expand Down
4 changes: 2 additions & 2 deletions src/sections/chat/ChatSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const ChatSection = ({ chatId, setChatId, loggedIn }) => {

{/* Render unlock profile here if user is not logged in and chat instance is loaded */}
{userPushSDKInstance && userPushSDKInstance?.readmode() && chatId && (
<UnlockProfileWrapper type={UNLOCK_PROFILE_TYPE.BOTTOM_BAR} />
<UnlockProfileWrapper type={UNLOCK_PROFILE_TYPE.MODAL} />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i still see it in the bottom bar, what does this change mean

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, when you have chat Id in the url and then you reload when you have not saved PGP keys in storage. You will see a modal instead of Bottom Bar.

)}
</ChatViewContainer>
)}
Expand Down Expand Up @@ -127,7 +127,7 @@ const ChatViewContainer = styled(ItemVV2)`
overflow: hidden;
`;

const IntroContainer = styled(ItemVV2)<IntroContainerProps>`
const IntroContainer = styled(ItemVV2) <IntroContainerProps>`
flex: 1;
height: inherit;
background: ${(props) => props.bg || 'transparent'};
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3875,9 +3875,9 @@ __metadata:
languageName: node
linkType: hard

"@pushprotocol/uiweb@npm:1.4.1":
version: 1.4.1
resolution: "@pushprotocol/uiweb@npm:1.4.1"
"@pushprotocol/uiweb@npm:1.6.0-alpha.6":
version: 1.6.0-alpha.6
resolution: "@pushprotocol/uiweb@npm:1.6.0-alpha.6"
dependencies:
"@livekit/components-react": "npm:^1.2.2"
"@livekit/components-styles": "npm:^1.0.6"
Expand Down Expand Up @@ -3919,7 +3919,7 @@ __metadata:
react-dom: 17.0.2
styled-components: ^6.0.8
viem: ^1.3.0
checksum: 10/687962cf6ddac1a175576b5df600e54a327de63cd4cd10c6c840de794ce47d20e5d0b9088effa74d55b046106335243031331f89344883e0ed189be046eb314f
checksum: 10/b8354fb552da2727ee5846af154d785f80e00060a9f5be243c508452b63fe56119e83830d73fd41f8ecb098eed3812f6edcbf9b06899deb7b522c92e25ad22e0
languageName: node
linkType: hard

Expand Down Expand Up @@ -17769,7 +17769,7 @@ __metadata:
"@mui/material": "npm:^5.5.0"
"@pushprotocol/restapi": "npm:1.7.20"
"@pushprotocol/socket": "npm:0.5.3"
"@pushprotocol/uiweb": "npm:1.4.1"
"@pushprotocol/uiweb": "npm:1.6.0-alpha.6"
"@radix-ui/react-tooltip": "npm:^1.1.1"
"@reach/tabs": "npm:^0.18.0"
"@reduxjs/toolkit": "npm:^1.7.1"
Expand Down
Loading