From 773055f4abeb54ceadd7af5ab84717beced64cb5 Mon Sep 17 00:00:00 2001 From: Dharit Tantiviramanond Date: Tue, 10 Sep 2024 15:34:04 -0500 Subject: [PATCH 1/4] [QA-1487] Fix camera icon in avatar --- .../sign-up-page/components/AccountHeader.tsx | 18 +++++++++++------- packages/web/src/utils/zIndex.ts | 1 + 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx b/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx index 6a27b2a9bc3..de23f617d9e 100644 --- a/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx +++ b/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx @@ -25,6 +25,7 @@ import { import { useMedia } from 'hooks/useMedia' import { useProfilePicture } from 'hooks/useUserProfilePicture' import { useSelector } from 'utils/reducer' +import zIndex from 'utils/zIndex' import { CoverPhotoBanner } from './CoverPhotoBanner' import { ImageField, ImageFieldValue } from './ImageField' @@ -66,13 +67,16 @@ const ProfileImageAvatar = ({ }} > {isEditing && !imageUrl ? ( - + <> + + ) : null} ) diff --git a/packages/web/src/utils/zIndex.ts b/packages/web/src/utils/zIndex.ts index a7bb03045f2..98435b38d36 100644 --- a/packages/web/src/utils/zIndex.ts +++ b/packages/web/src/utils/zIndex.ts @@ -10,6 +10,7 @@ export enum zIndex { // These are still set in css, added here for reference // TODO: use these enums + UTIL_ONE = 1, GATED_TRACK_TILE_CORNER_TAG = 3, // FROSTED_HEADER_BACKGROUND = 10, From 022ba06a708578ae6cea35f557fe035a48a18521 Mon Sep 17 00:00:00 2001 From: Dharit Tantiviramanond Date: Tue, 10 Sep 2024 15:36:22 -0500 Subject: [PATCH 2/4] cleanup --- .../sign-up-page/components/AccountHeader.tsx | 18 ++++++++---------- packages/web/src/utils/zIndex.ts | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx b/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx index de23f617d9e..0081b602c88 100644 --- a/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx +++ b/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx @@ -67,16 +67,14 @@ const ProfileImageAvatar = ({ }} > {isEditing && !imageUrl ? ( - <> - - + ) : null} ) diff --git a/packages/web/src/utils/zIndex.ts b/packages/web/src/utils/zIndex.ts index 98435b38d36..9c643b7477f 100644 --- a/packages/web/src/utils/zIndex.ts +++ b/packages/web/src/utils/zIndex.ts @@ -10,7 +10,7 @@ export enum zIndex { // These are still set in css, added here for reference // TODO: use these enums - UTIL_ONE = 1, + ONE = 1, GATED_TRACK_TILE_CORNER_TAG = 3, // FROSTED_HEADER_BACKGROUND = 10, From 60acdf36b3e10adff459c65f2da60b683f9fcb81 Mon Sep 17 00:00:00 2001 From: Dharit Tantiviramanond Date: Tue, 10 Sep 2024 15:47:44 -0500 Subject: [PATCH 3/4] fix in harmony - 2 for loading, 1 for image --- packages/harmony/src/components/artwork/Artwork.tsx | 5 +++-- .../web/src/pages/sign-up-page/components/AccountHeader.tsx | 1 - packages/web/src/utils/zIndex.ts | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/harmony/src/components/artwork/Artwork.tsx b/packages/harmony/src/components/artwork/Artwork.tsx index ec49a6e878a..574cd9dcf13 100644 --- a/packages/harmony/src/components/artwork/Artwork.tsx +++ b/packages/harmony/src/components/artwork/Artwork.tsx @@ -53,7 +53,7 @@ export const Artwork = (props: ArtworkProps) => { borderRadius={borderRadius} h='100%' w='100%' - css={{ zIndex: 1, position: 'absolute' }} + css={{ zIndex: 2, position: 'absolute' }} /> ) : null} { top: 0, left: 0, backgroundColor: src ? color.static.black : undefined, - opacity: src ? 0.4 : undefined + opacity: src ? 0.4 : undefined, + zIndex: 1 }} > {children} diff --git a/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx b/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx index 0081b602c88..f47c58b0fad 100644 --- a/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx +++ b/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx @@ -73,7 +73,6 @@ const ProfileImageAvatar = ({ color='staticWhite' shadow='drop' icon={IconCamera} - style={{ zIndex: zIndex.ONE }} /> ) : null} diff --git a/packages/web/src/utils/zIndex.ts b/packages/web/src/utils/zIndex.ts index 9c643b7477f..a7bb03045f2 100644 --- a/packages/web/src/utils/zIndex.ts +++ b/packages/web/src/utils/zIndex.ts @@ -10,7 +10,6 @@ export enum zIndex { // These are still set in css, added here for reference // TODO: use these enums - ONE = 1, GATED_TRACK_TILE_CORNER_TAG = 3, // FROSTED_HEADER_BACKGROUND = 10, From 1c96dc2295c6b9c11cc01ebafc1b5b13d2db8463 Mon Sep 17 00:00:00 2001 From: Dharit Tantiviramanond Date: Tue, 10 Sep 2024 15:48:27 -0500 Subject: [PATCH 4/4] lint --- packages/web/src/pages/sign-up-page/components/AccountHeader.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx b/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx index f47c58b0fad..6a27b2a9bc3 100644 --- a/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx +++ b/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx @@ -25,7 +25,6 @@ import { import { useMedia } from 'hooks/useMedia' import { useProfilePicture } from 'hooks/useUserProfilePicture' import { useSelector } from 'utils/reducer' -import zIndex from 'utils/zIndex' import { CoverPhotoBanner } from './CoverPhotoBanner' import { ImageField, ImageFieldValue } from './ImageField'