Skip to content

Streams screen#148

Closed
ekumamatthew wants to merge 10 commits intoLabsCrypt:mainfrom
ekumamatthew:Streams_Screen
Closed

Streams screen#148
ekumamatthew wants to merge 10 commits intoLabsCrypt:mainfrom
ekumamatthew:Streams_Screen

Conversation

@ekumamatthew
Copy link
Copy Markdown

this resolves Issue Closes #71

Copy link
Copy Markdown
Contributor

@ogazboiz ogazboiz left a comment

Choose a reason for hiding this comment

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

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.

@ekumamatthew
Copy link
Copy Markdown
Author

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

Copy link
Copy Markdown
Contributor

@ogazboiz ogazboiz left a comment

Choose a reason for hiding this comment

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

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 push

once that's done, this branch will only contain your Streams_Screen work, and it'll be ready to merge!

@ekumamatthew
Copy link
Copy Markdown
Author

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 push

once 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.

Copy link
Copy Markdown
Contributor

@ogazboiz ogazboiz left a comment

Choose a reason for hiding this comment

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

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Frontend: Outgoing Streams Screen

2 participants