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.

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

Group details screen 3.2 #14631

Closed
wants to merge 34 commits into from
Closed

Group details screen 3.2 #14631

wants to merge 34 commits into from

Conversation

OmarBasem
Copy link
Contributor

Reverting some files from that PR: #14494

@status-im-auto
Copy link
Member

status-im-auto commented Dec 23, 2022

Jenkins Builds

Click to see older builds (8)
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 99e163f #1 2022-12-23 14:53:45 ~2 min tests 📄log
✔️ 99e163f #1 2022-12-23 14:59:18 ~7 min android-e2e 🤖apk 📲
✔️ 99e163f #1 2022-12-23 14:59:56 ~8 min android 🤖apk 📲
✔️ 99e163f #1 2022-12-23 15:07:32 ~16 min ios 📱ipa 📲
✔️ 68080de #2 2022-12-23 15:20:29 ~2 min tests 📄log
✔️ 68080de #2 2022-12-23 15:26:42 ~8 min android-e2e 🤖apk 📲
✔️ 68080de #2 2022-12-23 15:27:22 ~9 min android 🤖apk 📲
✔️ 68080de #2 2022-12-23 15:33:30 ~15 min ios 📱ipa 📲
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 66c1de7 #3 2022-12-24 03:40:41 ~2 min tests 📄log
✔️ 66c1de7 #3 2022-12-24 03:45:55 ~7 min android-e2e 🤖apk 📲
✔️ 66c1de7 #3 2022-12-24 03:46:09 ~7 min android 🤖apk 📲
✔️ 66c1de7 #3 2022-12-24 03:52:12 ~13 min ios 📱ipa 📲
fc5e7f5 #4 2022-12-27 08:39:39 ~13 sec android 📄log
fc5e7f5 #4 2022-12-27 08:39:40 ~13 sec ios 📄log
fc5e7f5 #4 2022-12-27 08:39:41 ~14 sec android-e2e 📄log
fc5e7f5 #4 2022-12-27 08:39:43 ~11 sec tests 📄log

Copy link
Member

@flexsurfer flexsurfer left a comment

Choose a reason for hiding this comment

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

could you please run zprint for all files, still lots of formating

@@ -1,27 +1,27 @@
(ns status-im2.contexts.chat.messages.view
Copy link
Member

Choose a reason for hiding this comment

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

this namespace still reverted

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@flexsurfer reverted this file. As for the formatting, I keep running make lint-fix but I am not sure if it formatting the files correctly

Copy link
Member

Choose a reason for hiding this comment

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

yeah i think it doesn't work, it didn't work for me as well you should run zprint for each file manually, what IDE do you use ?

Copy link
Member

Choose a reason for hiding this comment

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

@yqrashawn is off today

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@flexsurfer I use IntelliJ

Copy link
Contributor

Choose a reason for hiding this comment

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

develop...45231b1
This one is better, but still some, I guess, unrelated diff. Which one is last commit before trying to rebase against upstream, with that commit, I can get to the minimum diff

Copy link
Contributor Author

@OmarBasem OmarBasem Dec 27, 2022

Choose a reason for hiding this comment

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

@yqrashawn this is the last one before so many files got reformatted 68080de

But why is clojure-lsp clean-ns messing up the formatting. If it was already formatted correctly then it shouldn't change anything right?

Also currently when running make lint-fix is doesn't really fix all the formatting of the changed files as shown in this other PR: #14635

Copy link
Contributor

Choose a reason for hiding this comment

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

clojure-lsp clean-ns and zprint currently conflict with each other when formatting ns form, so it's required to run zprint after clojure-lsp
I'll create a pr to tweak zprint's rule for ns forms

make lint-fix only applies to file staged (git add) in git git diff --diff-filter=d --cached --name-only

Copy link
Member

Choose a reason for hiding this comment

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

make lint-fix only applies to file staged (git add) in git git diff --diff-filter=d --cached --name-only

oh that's good to know

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh, I just found that this is not the old way. The old make lint-fix will fix everything in src. I'll fix this soon.

@OmarBasem OmarBasem closed this Dec 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants