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

[#21571] ask user to update their profile #21862

Merged
merged 24 commits into from
Jan 30, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
9122719
Add `buttons-style` prop to bottom actions to allow same button dimen…
ulisesmac Dec 19, 2024
40bdd54
Make events to update a profile more generic
ulisesmac Dec 20, 2024
41826fb
Fix tests
ulisesmac Dec 20, 2024
4696283
Add modal screen to update the profile
ulisesmac Dec 20, 2024
850b773
Add introduce yourself modal
ulisesmac Dec 20, 2024
875d102
squash with modal
ulisesmac Dec 20, 2024
0c93edd
Ask user to update their profile before sending a message or contact …
ulisesmac Dec 20, 2024
8044521
Fix color picker selected styles
ulisesmac Dec 20, 2024
6071478
Fix test 1
ulisesmac Dec 20, 2024
160ab06
Fix subscription inside `ref-event-fx`
ulisesmac Jan 10, 2025
94e2431
Remove some `:f>` now unnecessary
ulisesmac Jan 10, 2025
bb1a7fd
Remove comment
ulisesmac Jan 10, 2025
d72ee2e
Move texts to i18n
ulisesmac Jan 10, 2025
fac0609
Fix tests
ulisesmac Jan 10, 2025
cfce7f6
Lint fix
ulisesmac Jan 10, 2025
ac4e5fd
Fix iOS modal presentation
ulisesmac Jan 11, 2025
4c94787
Fix different keys for different users
ulisesmac Jan 11, 2025
822b510
Lint fix
ulisesmac Jan 11, 2025
2153817
Add maps to pass params
ulisesmac Jan 21, 2025
2eb884d
Improvement: remove `dispatch-n`
ulisesmac Jan 21, 2025
e12482e
No longer shows the modal if the user manually updates their profile
ulisesmac Jan 24, 2025
01c6108
Add missing `:dispatch` keyword
ulisesmac Jan 27, 2025
9b60711
Merge branch 'develop' into 21571-ask-user-to-update-their-profile
ulisesmac Jan 28, 2025
0997a3f
Merge branch 'develop' into 21571-ask-user-to-update-their-profile
ulisesmac Jan 29, 2025
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
Prev Previous commit
Next Next commit
Fix iOS modal presentation
  • Loading branch information
ulisesmac committed Jan 27, 2025
commit ac4e5fdb91de7058287edae4e2e386a03f6acbc4
7 changes: 1 addition & 6 deletions src/status_im/contexts/profile/edit/modal/style.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,7 @@
(when platform/android? {:padding-bottom 12})))

(def page-container
{:position :absolute
:top 0
:bottom 0
:left 0
:right 0
:z-index 100})
{:flex 1})

(def info-message
{:margin-top 8})
Expand Down
51 changes: 26 additions & 25 deletions src/status_im/contexts/profile/edit/modal/view.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -238,28 +238,29 @@
:new-name? (and (not= initial-display-name @display-name)
(seq @display-name))
:valid-name? valid-name?}))]
[rn/view {:style style/page-container}
[quo/page-nav
{:margin-top top
:background :blur
:icon-name :i/close
:on-press on-close}]
[content
{:profile-image @profile-image
:custom-color @custom-color
:display-name @display-name
:validation-msg @validation-msg
:valid-name? valid-name?
:name-too-short? name-too-short?
:picture-picker picture-picker
:initial-display-name initial-display-name
:set-scroll set-scroll
:set-scroll-height set-scroll-height
:set-custom-color set-custom-color
:set-display-name set-display-name
:set-validation-msg set-validation-msg}]
[floating-button
{:custom-color @custom-color
:scroll-y @scroll-y
:on-submit update-profile
:disabled? disabled?}]]))))
[quo/overlay {:type :shell}
[rn/view {:style style/page-container}
[quo/page-nav
{:margin-top top
:background :blur
:icon-name :i/close
:on-press on-close}]
[content
{:profile-image @profile-image
:custom-color @custom-color
:display-name @display-name
:validation-msg @validation-msg
:valid-name? valid-name?
:name-too-short? name-too-short?
:picture-picker picture-picker
:initial-display-name initial-display-name
:set-scroll set-scroll
:set-scroll-height set-scroll-height
:set-custom-color set-custom-color
:set-display-name set-display-name
:set-validation-msg set-validation-msg}]
[floating-button
{:custom-color @custom-color
:scroll-y @scroll-y
:on-submit update-profile
:disabled? disabled?}]]]))))
4 changes: 2 additions & 2 deletions src/status_im/navigation/screens.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -1131,8 +1131,8 @@
:component profiles/view}

{:name :screen/profile.edit-profile-modal
:options {:theme :dark
:layout options/onboarding-layout}
:metrics {:track? true}
:options options/transparent-screen-options
:component edit-profile-modal/view}]

[{:name :shell
Expand Down