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

Added support for frames and video playback using uiweb alpha #1509

Merged
merged 7 commits into from
May 13, 2024
Merged

Added support for frames and video playback using uiweb alpha #1509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3a795ef
Added support for frames and video playback using uiweb alpha
HarshRajat May 9, 2024
797ab43
Updated restapi version
HarshRajat May 9, 2024
12668c7
sdk debug flag should be false in prod
HarshRajat May 9, 2024
d882a58
Added changes for UIWeb v1.3.0, updated chat sidebar styling
HarshRajat May 13, 2024
68e1135
bumped up the package
HarshRajat May 13, 2024
afe4df8
Resolved comments
HarshRajat May 13, 2024
d3d4b0a
Merge branch 'main' into localsdk
HarshRajat May 13, 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: 2 additions & 0 deletions dev-mode-link-local-sdk.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ const packageJSONWatcher = {
'animejs@^2.2.0',
'classnames@^2.2.5',
'raf@^3.4.0',
'protobufjs@^7.2.6',
'react-code-blocks@^0.1.6',
'@livepeer/react@^2.9.2',
'@livekit/components-react@^1.5.3',
'livekit-client@^1.15.13',
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
"@mui/icons-material": "^5.8.4",
"@mui/lab": "^5.0.0-alpha.72",
"@mui/material": "^5.5.0",
"@pushprotocol/restapi": "1.6.12-alpha.5",
"@pushprotocol/restapi": "1.7.15",
"@pushprotocol/socket": "0.5.3",
"@pushprotocol/uiweb": "1.2.11",
"@pushprotocol/uiweb": "1.3.1",
Copy link
Collaborator

Choose a reason for hiding this comment

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

The pull request heading says using uiweb alpha and the version is changed here. What's the correct expected version here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Was publishing alpha but changes are made to stable release as well so switched to the latest version

"@reduxjs/toolkit": "^1.7.1",
"@testing-library/dom": "^9.0.1",
"@testing-library/jest-dom": "^4.2.4",
Expand Down Expand Up @@ -113,7 +113,7 @@
"react-joyride": "^2.4.0",
"react-loader-spinner": "^5.3.4",
"react-multi-select-component": "^4.2.3",
"react-player": "2.9.0",
"react-player": "^2.16.0",
"react-query": "^3.39.1",
"react-redux": "^7.2.6",
"react-router-dom": "^6.9.0",
Expand Down
2 changes: 1 addition & 1 deletion src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ export default function App() {
<ChatUIProvider
user={userPushSDKInstance}
theme={darkMode && darkChatTheme}
debug={true}
debug={false}
uiConfig={{
suppressToast: false,
}}
Expand Down
3 changes: 2 additions & 1 deletion src/modules/chat/ChatModule.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ function Chat({ chatid }) {
const [intents, setIntents] = useState<Feeds[]>([]);
const [inbox, setInbox] = useState<Feeds[]>([]);
const [hasUserBeenSearched, setHasUserBeenSearched] = useState<boolean>(false);
// TODO: Add proper types and lean the logic
const [activeTab, setCurrentTab] = useState<number>(0);
const [userShouldBeSearched, setUserShouldBeSearched] = useState<boolean>(false);
const [filteredUserData, setFilteredUserData] = useState<User[]>([]);
Expand Down Expand Up @@ -305,7 +306,7 @@ function Chat({ chatid }) {
flex="1"
maxWidth="310px"
minWidth="280px"
padding="10px 10px 10px 20px"
padding="0px"
boxSizing="border-box"
background={theme.default.bg}
chatActive={isUserChatting && userPushSDKInstance && !userPushSDKInstance?.readmode()}
Expand Down
Loading
Loading