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

feat: group details screen (3.3) #14654

Merged
merged 9 commits into from
Dec 30, 2022
Merged

feat: group details screen (3.3) #14654

merged 9 commits into from
Dec 30, 2022

Conversation

OmarBasem
Copy link
Contributor

Reverting some files from that PR: #14494

@OmarBasem OmarBasem self-assigned this Dec 28, 2022
@OmarBasem OmarBasem changed the title feat: group details screen feat: group details screen (3.3) Dec 28, 2022
@status-im-auto
Copy link
Member

status-im-auto commented Dec 28, 2022

Jenkins Builds

Click to see older builds (20)
Commit #️⃣ Finished (UTC) Duration Platform Result
13b5fcc #1 2022-12-28 10:29:04 ~47 sec android-e2e 📄log
13b5fcc #1 2022-12-28 10:29:04 ~42 sec android 📄log
13b5fcc #1 2022-12-28 10:29:37 ~1 min tests 📄log
13b5fcc #1 2022-12-28 10:31:00 ~2 min ios 📄log
fb145f4 #2 2022-12-28 10:43:36 ~28 sec android 📄log
fb145f4 #2 2022-12-28 10:43:36 ~29 sec android-e2e 📄log
fb145f4 #2 2022-12-28 10:44:12 ~1 min tests 📄log
fb145f4 #2 2022-12-28 10:44:28 ~1 min ios 📄log
ac540a0 #3 2022-12-28 11:05:37 ~2 min tests 📄log
✔️ 312210e #4 2022-12-28 11:11:25 ~2 min tests 📄log
✔️ 312210e #4 2022-12-28 11:17:46 ~8 min android-e2e 🤖apk 📲
✔️ 312210e #4 2022-12-28 11:17:52 ~8 min android 🤖apk 📲
✔️ 312210e #4 2022-12-28 11:26:37 ~17 min ios 📱ipa 📲
✔️ 5419212 #5 2022-12-28 12:58:58 ~2 min tests 📄log
✔️ 5419212 #5 2022-12-28 13:04:21 ~7 min android-e2e 🤖apk 📲
✔️ 5419212 #5 2022-12-28 13:04:24 ~7 min android 🤖apk 📲
✔️ 5419212 #5 2022-12-28 13:12:27 ~15 min ios 📱ipa 📲
d7a8d5e #6 2022-12-30 12:31:17 ~1 min tests 📄log
d7a8d5e #6 2022-12-30 12:35:25 ~5 min android-e2e 📄log
d7a8d5e #6 2022-12-30 12:35:28 ~5 min android 📄log
Commit #️⃣ Finished (UTC) Duration Platform Result
ca4bb5f #7 2022-12-30 12:38:11 ~1 min tests 📄log
ca4bb5f #7 2022-12-30 12:42:12 ~5 min android 📄log
ca4bb5f #7 2022-12-30 12:42:18 ~5 min android-e2e 📄log
ca4bb5f #7 2022-12-30 12:50:23 ~13 min ios 📄log
✔️ 3691aef #9 2022-12-30 14:13:45 ~2 min tests 📄log
✔️ 3691aef #9 2022-12-30 14:19:16 ~7 min android 🤖apk 📲
✔️ 3691aef #9 2022-12-30 14:19:25 ~7 min android-e2e 🤖apk 📲
✔️ 3691aef #9 2022-12-30 14:25:25 ~13 min ios 📱ipa 📲

@OmarBasem
Copy link
Contributor Author

@flexsurfer I have created another PR. I think it's all fixed now.

:padding-vertical 12
:padding-bottom 33
:padding-bottom (+ 33 (if platform/ios? (:bottom safe-area) 0))
Copy link
Member

Choose a reason for hiding this comment

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

why only ios ?

safe-area (safe-area/use-safe-area)
selected-participants (rf/sub [:group-chat/selected-participants])
deselected-members (rf/sub [:group-chat/deselected-members])]
[rn/view {:style {:height (- window-height (:top safe-area))}}
Copy link
Member

Choose a reason for hiding this comment

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

something wrong is here ,we shouldn't use height , and safe area is applied to all screens by default , so we shouldn't care about them in the screen itself

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's a bottom sheet not a screen

Copy link
Member

Choose a reason for hiding this comment

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

mhm

@@ -1,11 +1,9 @@
(ns status-im.ui2.screens.chat.group-details.view
Copy link
Member

Choose a reason for hiding this comment

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

just wondering why we still make changes in ui2 namespace, can we move to status-im2 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Moved to status-im2

@OmarBasem OmarBasem requested review from flexsurfer and removed request for flexsurfer December 28, 2022 13:01
@OmarBasem
Copy link
Contributor Author

@flexsurfer why keep the PR hanging? It keeps getting conflicts..

@flexsurfer
Copy link
Member

@flexsurfer why keep the PR hanging? It keeps getting conflicts..

what do you mean by keep the PR hanging?

@OmarBasem
Copy link
Contributor Author

OmarBasem commented Dec 30, 2022

@flexsurfer why keep the PR hanging? It keeps getting conflicts..

what do you mean by keep the PR hanging?

I mean not allowing the PR to move forward when it is complete
Anyways no problem

@OmarBasem OmarBasem merged commit b85eb41 into develop Dec 30, 2022
@OmarBasem OmarBasem deleted the group-details-screen-3.3 branch December 30, 2022 14:14
mattgle pushed a commit to mattgle/status-mobile that referenced this pull request Dec 30, 2022
mattgle pushed a commit to mattgle/status-mobile that referenced this pull request Dec 30, 2022
mattgle pushed a commit to mattgle/status-mobile that referenced this pull request Dec 31, 2022
mattgle pushed a commit to mattgle/status-mobile that referenced this pull request Dec 31, 2022
mattgle pushed a commit to mattgle/status-mobile that referenced this pull request Jan 2, 2023
mattgle pushed a commit to mattgle/status-mobile that referenced this pull request Jan 2, 2023
mattgle added a commit to mattgle/status-mobile that referenced this pull request Jan 2, 2023
Fix issue with preview text filed, now the text is white in the text-filed when the theme is dark

Add necessary assets and edit icon.clj to accept 48x48 images

Fix button issue, pressed background missing height

Fix corrections, delete TODOs, use new assets

run make lint-fix after updating branch

Delete useless style

Requested changes from PR: change colors, extract profile_card component, small css changes, added new option to remove emoji-hash

New chat flow (status-im#14607)

Delete useless icons, use i:/options instead of more

Change keycard image, change user-avatar to make it work with resources images, improve styles, tested on android

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Add show-emoji-hash to fix keys issues and better preview

Add eof and delete useless file

New chat flow (status-im#14607)

fix conflict at rebasing

New chat flow (status-im#14607)

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Delete useless change, probably error while rebasing

Delete ring implementation for 48px
mattgle added a commit to mattgle/status-mobile that referenced this pull request Jan 2, 2023
Fix issue with preview text filed, now the text is white in the text-filed when the theme is dark

Add necessary assets and edit icon.clj to accept 48x48 images

Fix button issue, pressed background missing height

Fix corrections, delete TODOs, use new assets

run make lint-fix after updating branch

Delete useless style

Requested changes from PR: change colors, extract profile_card component, small css changes, added new option to remove emoji-hash

New chat flow (status-im#14607)

Delete useless icons, use i:/options instead of more

Change keycard image, change user-avatar to make it work with resources images, improve styles, tested on android

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Add show-emoji-hash to fix keys issues and better preview

Add eof and delete useless file

New chat flow (status-im#14607)

fix conflict at rebasing

New chat flow (status-im#14607)

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Delete useless change, probably error while rebasing

Delete ring implementation for 48px

Change files location to the correct place

delete empty space and change imports

Fix building problem because of imports
mattgle added a commit to mattgle/status-mobile that referenced this pull request Jan 2, 2023
Fix issue with preview text filed, now the text is white in the text-filed when the theme is dark

Add necessary assets and edit icon.clj to accept 48x48 images

Fix button issue, pressed background missing height

Fix corrections, delete TODOs, use new assets

run make lint-fix after updating branch

Delete useless style

Requested changes from PR: change colors, extract profile_card component, small css changes, added new option to remove emoji-hash

New chat flow (status-im#14607)

Delete useless icons, use i:/options instead of more

Change keycard image, change user-avatar to make it work with resources images, improve styles, tested on android

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Add show-emoji-hash to fix keys issues and better preview

Add eof and delete useless file

New chat flow (status-im#14607)

fix conflict at rebasing

New chat flow (status-im#14607)

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Delete useless change, probably error while rebasing

Delete ring implementation for 48px

Change files location to the correct place

delete empty space and change imports

Fix building problem because of imports

Removed a modified file from pull request
mattgle added a commit to mattgle/status-mobile that referenced this pull request Jan 2, 2023
Fix issue with preview text filed, now the text is white in the text-filed when the theme is dark

Add necessary assets and edit icon.clj to accept 48x48 images

Fix button issue, pressed background missing height

Fix corrections, delete TODOs, use new assets

run make lint-fix after updating branch

Delete useless style

Requested changes from PR: change colors, extract profile_card component, small css changes, added new option to remove emoji-hash

New chat flow (status-im#14607)

Delete useless icons, use i:/options instead of more

Change keycard image, change user-avatar to make it work with resources images, improve styles, tested on android

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Add show-emoji-hash to fix keys issues and better preview

Add eof and delete useless file

New chat flow (status-im#14607)

fix conflict at rebasing

New chat flow (status-im#14607)

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Delete useless change, probably error while rebasing

Delete ring implementation for 48px

Change files location to the correct place

delete empty space and change imports

Fix building problem because of imports

Removed a modified file from pull request

Reply showing unknown (status-im#14682)
mattgle added a commit to mattgle/status-mobile that referenced this pull request Jan 2, 2023
Fix issue with preview text filed, now the text is white in the text-filed when the theme is dark

Add necessary assets and edit icon.clj to accept 48x48 images

Fix button issue, pressed background missing height

Fix corrections, delete TODOs, use new assets

run make lint-fix after updating branch

Delete useless style

Requested changes from PR: change colors, extract profile_card component, small css changes, added new option to remove emoji-hash

New chat flow (status-im#14607)

Delete useless icons, use i:/options instead of more

Change keycard image, change user-avatar to make it work with resources images, improve styles, tested on android

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Add show-emoji-hash to fix keys issues and better preview

Add eof and delete useless file

New chat flow (status-im#14607)

fix conflict at rebasing

New chat flow (status-im#14607)

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Delete useless change, probably error while rebasing

Delete ring implementation for 48px

Change files location to the correct place

delete empty space and change imports

Fix building problem because of imports

Removed a modified file from pull request

Reply showing unknown (status-im#14682)

Reply showing unknown (status-im#14682)
mattgle added a commit to mattgle/status-mobile that referenced this pull request Jan 2, 2023
Fix issue with preview text filed, now the text is white in the text-filed when the theme is dark

Add necessary assets and edit icon.clj to accept 48x48 images

Fix button issue, pressed background missing height

Fix corrections, delete TODOs, use new assets

run make lint-fix after updating branch

Delete useless style

Requested changes from PR: change colors, extract profile_card component, small css changes, added new option to remove emoji-hash

New chat flow (status-im#14607)

Delete useless icons, use i:/options instead of more

Change keycard image, change user-avatar to make it work with resources images, improve styles, tested on android

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Add show-emoji-hash to fix keys issues and better preview

Add eof and delete useless file

New chat flow (status-im#14607)

fix conflict at rebasing

New chat flow (status-im#14607)

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Delete useless change, probably error while rebasing

Delete ring implementation for 48px

Change files location to the correct place

delete empty space and change imports

Fix building problem because of imports

Removed a modified file from pull request

Reply showing unknown (status-im#14682)

Reply showing unknown (status-im#14682)
mattgle added a commit to mattgle/status-mobile that referenced this pull request Jan 3, 2023
Fix issue with preview text filed, now the text is white in the text-filed when the theme is dark

Add necessary assets and edit icon.clj to accept 48x48 images

Fix button issue, pressed background missing height

Fix corrections, delete TODOs, use new assets

run make lint-fix after updating branch

Delete useless style

Requested changes from PR: change colors, extract profile_card component, small css changes, added new option to remove emoji-hash

New chat flow (status-im#14607)

Delete useless icons, use i:/options instead of more

Change keycard image, change user-avatar to make it work with resources images, improve styles, tested on android

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Add show-emoji-hash to fix keys issues and better preview

Add eof and delete useless file

New chat flow (status-im#14607)

fix conflict at rebasing

New chat flow (status-im#14607)

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Delete useless change, probably error while rebasing

Delete ring implementation for 48px

Change files location to the correct place

delete empty space and change imports

Fix building problem because of imports

Removed a modified file from pull request

Reply showing unknown (status-im#14682)

Reply showing unknown (status-im#14682)
mattgle added a commit to mattgle/status-mobile that referenced this pull request Jan 3, 2023
Fix issue with preview text filed, now the text is white in the text-filed when the theme is dark

Add necessary assets and edit icon.clj to accept 48x48 images

Fix button issue, pressed background missing height

Fix corrections, delete TODOs, use new assets

run make lint-fix after updating branch

Delete useless style

Requested changes from PR: change colors, extract profile_card component, small css changes, added new option to remove emoji-hash

New chat flow (status-im#14607)

Delete useless icons, use i:/options instead of more

Change keycard image, change user-avatar to make it work with resources images, improve styles, tested on android

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Add show-emoji-hash to fix keys issues and better preview

Add eof and delete useless file

New chat flow (status-im#14607)

fix conflict at rebasing

New chat flow (status-im#14607)

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Delete useless change, probably error while rebasing

Delete ring implementation for 48px

Change files location to the correct place

delete empty space and change imports

Fix building problem because of imports

Removed a modified file from pull request

Reply showing unknown (status-im#14682)

Reply showing unknown (status-im#14682)

Replace icons for the ones in iconset, make profile_card color customizable, fix button background
mattgle added a commit to mattgle/status-mobile that referenced this pull request Jan 3, 2023
Fix issue with preview text filed, now the text is white in the text-filed when the theme is dark

Add necessary assets and edit icon.clj to accept 48x48 images

Fix button issue, pressed background missing height

Fix corrections, delete TODOs, use new assets

run make lint-fix after updating branch

Delete useless style

Requested changes from PR: change colors, extract profile_card component, small css changes, added new option to remove emoji-hash

New chat flow (status-im#14607)

Delete useless icons, use i:/options instead of more

Change keycard image, change user-avatar to make it work with resources images, improve styles, tested on android

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Add show-emoji-hash to fix keys issues and better preview

Add eof and delete useless file

New chat flow (status-im#14607)

fix conflict at rebasing

New chat flow (status-im#14607)

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Delete useless change, probably error while rebasing

Delete ring implementation for 48px

Change files location to the correct place

delete empty space and change imports

Fix building problem because of imports

Removed a modified file from pull request

Reply showing unknown (status-im#14682)

Reply showing unknown (status-im#14682)

Replace icons for the ones in iconset, make profile_card color customizable, fix button background

run lint-fix
mattgle added a commit to mattgle/status-mobile that referenced this pull request Jan 3, 2023
Fix issue with preview text filed, now the text is white in the text-filed when the theme is dark

Add necessary assets and edit icon.clj to accept 48x48 images

Fix button issue, pressed background missing height

Fix corrections, delete TODOs, use new assets

run make lint-fix after updating branch

Delete useless style

Requested changes from PR: change colors, extract profile_card component, small css changes, added new option to remove emoji-hash

New chat flow (status-im#14607)

Delete useless icons, use i:/options instead of more

Change keycard image, change user-avatar to make it work with resources images, improve styles, tested on android

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Add show-emoji-hash to fix keys issues and better preview

Add eof and delete useless file

New chat flow (status-im#14607)

fix conflict at rebasing

New chat flow (status-im#14607)

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Delete useless change, probably error while rebasing

Delete ring implementation for 48px

Change files location to the correct place

delete empty space and change imports

Fix building problem because of imports

Removed a modified file from pull request

Reply showing unknown (status-im#14682)

Reply showing unknown (status-im#14682)

Replace icons for the ones in iconset, make profile_card color customizable, fix button background

run lint-fix
mattgle added a commit to mattgle/status-mobile that referenced this pull request Jan 3, 2023
Fix issue with preview text filed, now the text is white in the text-filed when the theme is dark

Add necessary assets and edit icon.clj to accept 48x48 images

Fix button issue, pressed background missing height

Fix corrections, delete TODOs, use new assets

run make lint-fix after updating branch

Delete useless style

Requested changes from PR: change colors, extract profile_card component, small css changes, added new option to remove emoji-hash

New chat flow (status-im#14607)

Delete useless icons, use i:/options instead of more

Change keycard image, change user-avatar to make it work with resources images, improve styles, tested on android

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Add show-emoji-hash to fix keys issues and better preview

Add eof and delete useless file

New chat flow (status-im#14607)

fix conflict at rebasing

New chat flow (status-im#14607)

feat: group details screen (3.3) (status-im#14654)

* feat: group details screen (3)

Delete useless change, probably error while rebasing

Delete ring implementation for 48px

Change files location to the correct place

delete empty space and change imports

Fix building problem because of imports

Removed a modified file from pull request

Reply showing unknown (status-im#14682)

Reply showing unknown (status-im#14682)

Replace icons for the ones in iconset, make profile_card color customizable, fix button background

run lint-fix

Add sign button label
@@ -93,21 +93,20 @@
vals)))

(re-frame/reg-sub
:contacts/sorted-and-grouped-by-first-letter
Copy link
Contributor

Choose a reason for hiding this comment

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

This is still used in some parts of the codebase in develop, and it's currently throwing an error, why has it been removed? is there a replacement to be used or is just a mistake?

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 think you shared with me the implementation of this method? Did you rename it by mistake?

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