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

fix: Adding Beta user agreement #11100

Conversation

alexjba
Copy link
Contributor

@alexjba alexjba commented Jun 14, 2023

What does the PR do

Closing: #11044

Changes:

  1. Hide AppMain while the fake loading screen is active
  2. Create new UserAgreementPopup.qml implementing this design: https://www.figma.com/file/17fc13UBFvInrLgNUKJJg5/Kuba⎜Desktop?type=design&node-id=31450-560694&t=Q4MOViPCoHsTjhs6-0
  3. Add UserAgreementPopup to storybook
  4. Show UserAgreementPopup whenever AppMain becomes visible on a production build. I've excluded dev env, not to loose time with this popup on each login and also e2e test environment. Please let me know if you think we should enable it on any of these environments.

Affected areas

AppMain

Screenshot of functionality (including design for comparison)

Screenshot 2023-06-14 at 23 50 21 Screenshot 2023-06-14 at 23 59 27
  • I've checked the design and this PR matches it

@status-im-auto
Copy link
Member

status-im-auto commented Jun 14, 2023

Jenkins Builds

Click to see older builds (19)
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 66997aa #1 2023-06-14 21:07:01 ~4 min tests/imports 📄log
✔️ 66997aa #1 2023-06-14 21:07:50 ~5 min tests/nim 📄log
✔️ 66997aa #1 2023-06-14 21:11:00 ~8 min macos/aarch64 🍎dmg
✔️ 66997aa #1 2023-06-14 21:12:25 ~10 min macos/x86_64 🍎dmg
✔️ 66997aa #1 2023-06-14 21:34:56 ~32 min windows/x86_64 💿exe
✖️ 66997aa #1 2023-06-14 21:58:05 ~56 min tests/e2e 📄log
✔️ d208584 #2 2023-06-15 08:52:25 ~5 min macos/aarch64 🍎dmg
✔️ d208584 #2 2023-06-15 08:54:57 ~8 min macos/x86_64 🍎dmg
✔️ d208584 #2 2023-06-15 08:55:29 ~8 min tests/imports 📄log
✔️ d208584 #2 2023-06-15 08:55:49 ~8 min tests/nim 📄log
✖️ d208584 #2 2023-06-15 08:56:08 ~9 min tests/e2e 📄log
✔️ d208584 #2 2023-06-15 09:15:19 ~28 min windows/x86_64 💿exe
✔️ d208584 #3 2023-06-15 11:24:25 ~43 min tests/e2e 📄log
a5fc1c0 #3 2023-06-16 06:57:07 ~2 min macos/x86_64 📄log
✔️ a5fc1c0 #3 2023-06-16 06:59:08 ~4 min tests/imports 📄log
✔️ a5fc1c0 #3 2023-06-16 06:59:17 ~4 min macos/aarch64 🍎dmg
✔️ a5fc1c0 #3 2023-06-16 07:01:00 ~6 min tests/nim 📄log
✔️ a5fc1c0 #3 2023-06-16 07:22:16 ~27 min windows/x86_64 💿exe
✔️ a5fc1c0 #4 2023-06-16 07:45:29 ~50 min tests/e2e 📄log
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 822c85d #4 2023-06-16 20:43:43 ~4 min tests/imports 📄log
✔️ 822c85d #4 2023-06-16 20:43:51 ~4 min macos/aarch64 🍎dmg
✔️ 822c85d #4 2023-06-16 20:44:56 ~5 min tests/nim 📄log
✔️ 822c85d #4 2023-06-16 20:49:47 ~10 min macos/x86_64 🍎dmg
✔️ 822c85d #4 2023-06-16 21:04:25 ~25 min windows/x86_64 💿exe
✔️ 822c85d #5 2023-06-16 21:29:18 ~50 min tests/e2e 📄log
✔️ dfc9f7e #5 2023-06-18 05:14:00 ~4 min tests/imports 📄log
✔️ dfc9f7e #5 2023-06-18 05:14:47 ~5 min macos/aarch64 🍎dmg
✔️ dfc9f7e #5 2023-06-18 05:15:25 ~6 min tests/nim 📄log
✔️ dfc9f7e #5 2023-06-18 05:18:38 ~9 min macos/x86_64 🍎dmg
✔️ dfc9f7e #5 2023-06-18 05:36:50 ~27 min windows/x86_64 💿exe
✔️ dfc9f7e #6 2023-06-18 05:58:13 ~48 min tests/e2e 📄log

Copy link
Member

@caybro caybro left a comment

Choose a reason for hiding this comment

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

Nice :)

ui/main.qml Outdated Show resolved Hide resolved
@alexjba alexjba force-pushed the 11044-new-beta-dialog-design-to-be-presented-every-time-user-launches-status-in-beta branch from 66997aa to d208584 Compare June 15, 2023 08:46
Copy link
Member

@micieslak micieslak left a comment

Choose a reason for hiding this comment

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

Please add proper sizing to text component (like Layout.fillWidth: true) to have proper layout no matter how long text we have.

image

Here the text is extended on purpose, similar situation may happen for translations.

Btw. things like that can be easily check with the inspection tool (but it's temporarily broken for popups - #11111)


UserAgreementPopup {
id: popup
visible: true
Copy link
Member

Choose a reason for hiding this comment

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

please add for convenience:

        anchors.centerIn: parent
        modal: false

@alexjba alexjba force-pushed the 11044-new-beta-dialog-design-to-be-presented-every-time-user-launches-status-in-beta branch from d208584 to a5fc1c0 Compare June 16, 2023 06:54
@alexjba
Copy link
Contributor Author

alexjba commented Jun 16, 2023

Please add proper sizing to text component (like Layout.fillWidth: true) to have proper layout no matter how long text we have.

image

Here the text is extended on purpose, similar situation may happen for translations.

Btw. things like that can be easily check with the inspection tool (but it's temporarily broken for popups - #11111)

Fixed. I've added wordWrap to the text paragraph and Layout.fillWidth to the checkboxes. Looks good now with large text.

@alexjba alexjba requested a review from micieslak June 16, 2023 06:56
Copy link
Member

@micieslak micieslak left a comment

Choose a reason for hiding this comment

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

Nice work! Some minor comments left, but nothing serious.

Layout.preferredWidth: 64
Layout.preferredHeight: 64
Layout.alignment: Qt.AlignHCenter
image.source: Style.png("status-logo")
Copy link
Member

Choose a reason for hiding this comment

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

adding image.mipmap: true here improves quality a bit bc the original image is much bigger than 64x64

Layout.fillWidth: true
Layout.topMargin: -10 //reduced margin by design
Layout.bottomMargin: layout.spacing
contentItem: Paragraph {
Copy link
Member

Choose a reason for hiding this comment

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

maybe

        Layout.fillWidth: true
        Layout.fillHeight: true

could be moved from Paragraph to AgreementSection bc in this context those attached properties make no sense.

@@ -212,5 +212,8 @@
"https://www.figma.com/file/17fc13UBFvInrLgNUKJJg5/Kuba%E2%8E%9CDesktop?type=design&node-id=29528%3A588403&t=GUxMZEWcfRO7pXJb-1",
"https://www.figma.com/file/17fc13UBFvInrLgNUKJJg5/Kuba%E2%8E%9CDesktop?type=design&node-id=29528%3A588563&t=GUxMZEWcfRO7pXJb-1",
"https://www.figma.com/file/17fc13UBFvInrLgNUKJJg5/Kuba%E2%8E%9CDesktop?type=design&node-id=29528%3A587660&t=GUxMZEWcfRO7pXJb-1"
],
"UserAgreementPopup": [
"https://www.figma.com/file/17fc13UBFvInrLgNUKJJg5/Kuba⎜Desktop?type=design&node-id=1023-298171&t=Q4MOViPCoHsTjhs6-0"
Copy link
Member

Choose a reason for hiding this comment

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

the link seems to be wrong/outdated

Screenshot from 2023-06-16 14-30-31

@alexjba alexjba force-pushed the 11044-new-beta-dialog-design-to-be-presented-every-time-user-launches-status-in-beta branch from a5fc1c0 to 822c85d Compare June 16, 2023 20:38
@alexjba alexjba force-pushed the 11044-new-beta-dialog-design-to-be-presented-every-time-user-launches-status-in-beta branch from 822c85d to dfc9f7e Compare June 18, 2023 05:08
@alexjba alexjba merged commit c4e9f8d into master Jun 19, 2023
7 checks passed
@alexjba alexjba deleted the 11044-new-beta-dialog-design-to-be-presented-every-time-user-launches-status-in-beta branch June 19, 2023 07:58
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.

New Beta dialog design - to be presented every time user launches Status in Beta
4 participants