Conversation
ogazboiz
left a comment
There was a problem hiding this comment.
hey, thanks for the Streams screen! OutgoingStreams.tsx looks like a solid addition.
two things before this can be merged: first, there are merge conflicts with main — please do git fetch origin && git rebase origin/main. second, this PR bundles CI workflow changes (.github/workflows/test.yml) together with the UI work, which makes it harder to review and merge cleanly. could you split those into a separate PR? the UI changes alone look great.
I have rebased to Origin main and the branch is Currently up to date. for the CI action in my other PR Please Kindly look into it., it may be a little fix i am nt identifying yet |
ogazboiz
left a comment
There was a problem hiding this comment.
hey, thanks for rebasing!
i took a look at the branch, and the unrelated CI files are still in this PR. to make this mergeable, you just need to drop them from your branch so only the UI code is left. here are the exact commands you can run in your terminal to fix it:
git rm bun.lockb
git checkout origin/main -- .github/workflows/test.yml backend/package.json backend/tsconfig.json frontend/package.json package-lock.json
git commit -m "drop unrelated CI files"
git pushonce that's done, this branch will only contain your Streams_Screen work, and it'll be ready to merge!
Okay. I'm doing this right now. |
ogazboiz
left a comment
There was a problem hiding this comment.
hey! thanks for following up on this.
looks like the scope creep in .github/workflows/test.yml is still there — we really want to keep this PR focused only on the Streams screen UI.
could you please rebase on main and drop those unrelated CI workflow changes? also, the tests are currently failing, so fixing the rebase should help identify the real issue.
this resolves Issue Closes #71