From a76f334447df57a33346d15408eb3f3e7112b145 Mon Sep 17 00:00:00 2001 From: Finnian Jacobson-Schulte <140328381+finnian0826@users.noreply.github.com> Date: Fri, 17 May 2024 05:27:32 +1200 Subject: [PATCH] feat: Change button color to black (#5401) ### Description - Change primary button color to black - Set opacity at 25% when disabled - Set opacity of GRAY_WITH_BORDER to 50% when disabled ### Test plan Updated unit tests, manual tests: ![token-details](https://github.com/valora-inc/wallet/assets/140328381/52e0bb80-1011-45ef-b7e7-361c0de161f6) https://github.com/valora-inc/wallet/assets/140328381/5fdf0e9c-fef7-4c9b-8608-48354a2ca6c2 https://github.com/valora-inc/wallet/assets/140328381/6afe33f8-7751-42c0-8fce-e13192324e3a https://github.com/valora-inc/wallet/assets/140328381/2dd9d319-cf81-40c4-b104-bbe1544788cc ### Related issues - N/A ### Backwards compatibility Yes ### Network scalability If a new NetworkId and/or Network are added in the future, the changes in this PR will: - [X] Continue to work without code changes, OR trigger a compilation error (guaranteeing we find it when a new network is added) --- .../AccountKeyEducation.test.tsx.snap | 2 +- .../__snapshots__/Education.test.tsx.snap | 6 ++--- .../__snapshots__/GoldEducation.test.tsx.snap | 2 +- .../__snapshots__/Persona.test.tsx.snap | 6 ++--- .../__snapshots__/Profile.test.tsx.snap | 6 ++--- src/app/MultichainBeta.tsx | 2 -- src/app/__snapshots__/Debug.test.tsx.snap | 6 ++--- .../__snapshots__/ErrorScreen.test.tsx.snap | 12 +++++----- .../__snapshots__/BackupPhrase.test.tsx.snap | 2 +- src/components/Button.tsx | 23 ++++++++----------- .../__snapshots__/Button.test.tsx.snap | 8 +++---- .../__snapshots__/FullscreenCTA.test.tsx.snap | 6 ++--- .../__snapshots__/CashInSuccess.test.tsx.snap | 12 +++++----- .../FiatExchangeAmount.test.tsx.snap | 12 +++++----- .../__snapshots__/SimplexScreen.test.tsx.snap | 10 ++++---- src/points/PointsHome.tsx | 1 - src/send/EnterAmount.tsx | 4 ---- .../SendConfirmation.test.tsx.snap | 6 ++--- .../ValidateRecipientAccount.test.tsx.snap | 12 +++++----- src/tokens/TokenDetails.tsx | 1 - 20 files changed, 63 insertions(+), 76 deletions(-) diff --git a/src/account/__snapshots__/AccountKeyEducation.test.tsx.snap b/src/account/__snapshots__/AccountKeyEducation.test.tsx.snap index 3de91fee2a4..e53e3d6d0e3 100644 --- a/src/account/__snapshots__/AccountKeyEducation.test.tsx.snap +++ b/src/account/__snapshots__/AccountKeyEducation.test.tsx.snap @@ -555,7 +555,7 @@ exports[`AccountKeyEducation renders correctly 1`] = ` "color": "#2E3338", "fontFamily": "Inter-SemiBold", "fontSize": 16, - "lineHeight": 22, + "lineHeight": 24, "marginLeft": 0, "marginRight": 0, } diff --git a/src/account/__snapshots__/Education.test.tsx.snap b/src/account/__snapshots__/Education.test.tsx.snap index 52986d918b5..3f6445701de 100644 --- a/src/account/__snapshots__/Education.test.tsx.snap +++ b/src/account/__snapshots__/Education.test.tsx.snap @@ -241,12 +241,12 @@ exports[`Education renders correctly 1`] = ` [ { "alignItems": "center", - "backgroundColor": "#1AB775", + "backgroundColor": "#2E3338", "flexDirection": "row", "height": 48, "justifyContent": "center", "minWidth": 120, - "opacity": undefined, + "opacity": 1, "paddingHorizontal": 24, "paddingVertical": 5, }, @@ -264,7 +264,7 @@ exports[`Education renders correctly 1`] = ` "color": "#FFFFFF", "fontFamily": "Inter-SemiBold", "fontSize": 16, - "lineHeight": 22, + "lineHeight": 24, "marginLeft": 0, "marginRight": 0, } diff --git a/src/account/__snapshots__/GoldEducation.test.tsx.snap b/src/account/__snapshots__/GoldEducation.test.tsx.snap index 2562a85c553..3635d1b2f20 100644 --- a/src/account/__snapshots__/GoldEducation.test.tsx.snap +++ b/src/account/__snapshots__/GoldEducation.test.tsx.snap @@ -555,7 +555,7 @@ exports[`renders correctly 1`] = ` "color": "#2E3338", "fontFamily": "Inter-SemiBold", "fontSize": 16, - "lineHeight": 22, + "lineHeight": 24, "marginLeft": 0, "marginRight": 0, } diff --git a/src/account/__snapshots__/Persona.test.tsx.snap b/src/account/__snapshots__/Persona.test.tsx.snap index 0f14a961ec8..c421090c726 100644 --- a/src/account/__snapshots__/Persona.test.tsx.snap +++ b/src/account/__snapshots__/Persona.test.tsx.snap @@ -61,12 +61,12 @@ exports[`Persona renders correctly 1`] = ` [ { "alignItems": "center", - "backgroundColor": "#1AB77580", + "backgroundColor": "#2E3338", "flexDirection": "row", "height": 48, "justifyContent": "center", "minWidth": 120, - "opacity": undefined, + "opacity": 0.25, "paddingHorizontal": 24, "paddingVertical": 5, }, @@ -82,7 +82,7 @@ exports[`Persona renders correctly 1`] = ` "color": "#FFFFFF", "fontFamily": "Inter-SemiBold", "fontSize": 16, - "lineHeight": 22, + "lineHeight": 24, "marginLeft": 0, "marginRight": 0, } diff --git a/src/account/__snapshots__/Profile.test.tsx.snap b/src/account/__snapshots__/Profile.test.tsx.snap index 4ef7e703efa..83ea07df97e 100644 --- a/src/account/__snapshots__/Profile.test.tsx.snap +++ b/src/account/__snapshots__/Profile.test.tsx.snap @@ -308,12 +308,12 @@ exports[`Profile renders correctly 1`] = ` [ { "alignItems": "center", - "backgroundColor": "#1AB775", + "backgroundColor": "#2E3338", "flexDirection": "row", "height": 48, "justifyContent": "center", "minWidth": 120, - "opacity": undefined, + "opacity": 1, "paddingHorizontal": 24, "paddingVertical": 5, }, @@ -329,7 +329,7 @@ exports[`Profile renders correctly 1`] = ` "color": "#FFFFFF", "fontFamily": "Inter-SemiBold", "fontSize": 16, - "lineHeight": 22, + "lineHeight": 24, "marginLeft": 0, "marginRight": 0, } diff --git a/src/app/MultichainBeta.tsx b/src/app/MultichainBeta.tsx index 2f76e466cf5..c016a017fbd 100644 --- a/src/app/MultichainBeta.tsx +++ b/src/app/MultichainBeta.tsx @@ -53,7 +53,6 @@ function MultichainBeta() {