From ca46e819e51aac854234e799ebfd179a2fe01a2a Mon Sep 17 00:00:00 2001 From: Alec Savvy Date: Fri, 7 Jun 2024 11:25:44 -0600 Subject: [PATCH 1/4] switch to using modal instead of modalheader --- .../ClaimAllRewardsModal.tsx | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ClaimAllRewardsModal.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ClaimAllRewardsModal.tsx index e7864398446..c6ccc53777e 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ClaimAllRewardsModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ClaimAllRewardsModal.tsx @@ -16,7 +16,10 @@ import { Button, Flex, IconArrowRight, + Modal, ModalContent, + ModalHeader, + ModalTitle, ProgressBar, Text } from '@audius/harmony' @@ -121,16 +124,10 @@ export const ClaimAllRewardsModal = () => { }, []) return ( - + + + + @@ -196,6 +193,6 @@ export const ClaimAllRewardsModal = () => { )} - + ) } From 6549cb212c0ca53c3192b8f137b1812a60f293f3 Mon Sep 17 00:00:00 2001 From: Alec Savvy Date: Fri, 7 Jun 2024 11:44:12 -0600 Subject: [PATCH 2/4] web init --- .../modals/ChallengeRewardsModal/ClaimAllRewardsModal.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ClaimAllRewardsModal.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ClaimAllRewardsModal.tsx index c6ccc53777e..f74049a7d3a 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ClaimAllRewardsModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ClaimAllRewardsModal.tsx @@ -32,8 +32,6 @@ import { ToastContext } from 'components/toast/ToastContext' import { useWithMobileStyle } from 'hooks/useWithMobileStyle' import { CLAIM_REWARD_TOAST_TIMEOUT_MILLIS } from 'utils/constants' -import ModalDrawer from '../ModalDrawer' - import styles from './styles.module.css' const messages = { From f53d35c99bb95115cadc86167f99208df109821e Mon Sep 17 00:00:00 2001 From: Alec Savvy Date: Fri, 7 Jun 2024 11:45:35 -0600 Subject: [PATCH 3/4] web init --- .../modals/ChallengeRewardsModal/ClaimAllRewardsModal.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ClaimAllRewardsModal.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ClaimAllRewardsModal.tsx index f74049a7d3a..9f872abb4a1 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ClaimAllRewardsModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ClaimAllRewardsModal.tsx @@ -53,7 +53,6 @@ const { getClaimStatus } = audioRewardsPageSelectors export const ClaimAllRewardsModal = () => { const dispatch = useDispatch() const { toast } = useContext(ToastContext) - const wm = useWithMobileStyle(styles.mobile) const [isOpen, setOpen] = useModalState('ClaimAllRewards') const claimStatus = useSelector(getClaimStatus) const { claimableAmount, claimableChallenges, cooldownChallenges, summary } = From ac58182bbd12cfa110ecc769de5d4232c3060a07 Mon Sep 17 00:00:00 2001 From: Alec Savvy Date: Fri, 7 Jun 2024 12:20:01 -0600 Subject: [PATCH 4/4] linter --- .../modals/ChallengeRewardsModal/ClaimAllRewardsModal.tsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ClaimAllRewardsModal.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ClaimAllRewardsModal.tsx index 9f872abb4a1..6a00cdb0ff4 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ClaimAllRewardsModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ClaimAllRewardsModal.tsx @@ -29,11 +29,8 @@ import { useModalState } from 'common/hooks/useModalState' import LoadingSpinner from 'components/loading-spinner/LoadingSpinner' import { SummaryTable } from 'components/summary-table' import { ToastContext } from 'components/toast/ToastContext' -import { useWithMobileStyle } from 'hooks/useWithMobileStyle' import { CLAIM_REWARD_TOAST_TIMEOUT_MILLIS } from 'utils/constants' -import styles from './styles.module.css' - const messages = { upcomingRewards: 'Upcoming Rewards', claimAudio: (amount: string) => `Claim ${amount} $AUDIO`,