From f4d0b121fef575b4709d68d601593d40a3cb9fa1 Mon Sep 17 00:00:00 2001 From: Raymond Jacobson Date: Tue, 31 Oct 2023 16:07:00 -0700 Subject: [PATCH 1/3] [PAY-2070] Fix dashboard filter --- .../components/TracksTableContainer.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/web/src/pages/artist-dashboard-page/components/TracksTableContainer.tsx b/packages/web/src/pages/artist-dashboard-page/components/TracksTableContainer.tsx index 63cfec92ebb..54705c9beb0 100644 --- a/packages/web/src/pages/artist-dashboard-page/components/TracksTableContainer.tsx +++ b/packages/web/src/pages/artist-dashboard-page/components/TracksTableContainer.tsx @@ -88,7 +88,11 @@ export const TracksTableContainer = ({ let filteredData: DataSourceTrack[] const { hasOnlyOneSection, pub, gated, hidden, premium, specialAccess } = useMemo(() => { - const pub = dataSource.filter((data) => data.is_unlisted === false) + const pub = dataSource.filter( + (data) => + data.is_unlisted === false && + !('usdc_purchase' in data.premium_conditions || {}) + ) const gated = dataSource.filter( (data) => 'tip_user_id' in (data.premium_conditions || {}) || From d63e8fd505075ad15d18d6ff86bfb481d8f47873 Mon Sep 17 00:00:00 2001 From: Raymond Jacobson Date: Tue, 31 Oct 2023 16:16:12 -0700 Subject: [PATCH 2/3] Use helper --- .../components/TracksTableContainer.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/web/src/pages/artist-dashboard-page/components/TracksTableContainer.tsx b/packages/web/src/pages/artist-dashboard-page/components/TracksTableContainer.tsx index 54705c9beb0..024d12d2cf1 100644 --- a/packages/web/src/pages/artist-dashboard-page/components/TracksTableContainer.tsx +++ b/packages/web/src/pages/artist-dashboard-page/components/TracksTableContainer.tsx @@ -1,6 +1,11 @@ import { useState, useCallback, useMemo } from 'react' -import { Status, User, Track } from '@audius/common' +import { + Status, + User, + Track, + isPremiumContentUSDCPurchaseGated +} from '@audius/common' import { SelectablePill } from '@audius/harmony' import { IconHidden, @@ -91,7 +96,7 @@ export const TracksTableContainer = ({ const pub = dataSource.filter( (data) => data.is_unlisted === false && - !('usdc_purchase' in data.premium_conditions || {}) + !isPremiumContentUSDCPurchaseGated(data.premium_conditions) ) const gated = dataSource.filter( (data) => From 8febbda2639e38e18369b6720440132c3c38edce Mon Sep 17 00:00:00 2001 From: Raymond Jacobson Date: Tue, 31 Oct 2023 16:24:41 -0700 Subject: [PATCH 3/3] Fix button --- .../components/USDCCard.tsx | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/packages/web/src/pages/artist-dashboard-page/components/USDCCard.tsx b/packages/web/src/pages/artist-dashboard-page/components/USDCCard.tsx index d28dce83751..fa53c501f23 100644 --- a/packages/web/src/pages/artist-dashboard-page/components/USDCCard.tsx +++ b/packages/web/src/pages/artist-dashboard-page/components/USDCCard.tsx @@ -13,15 +13,11 @@ import { ButtonType, IconWithdraw, IconKebabHorizontal, - IconQuestionCircle + IconQuestionCircle, + PlainButton, + PlainButtonType } from '@audius/harmony' -import { - PopupMenu, - PopupMenuItem, - HarmonyPlainButton, - HarmonyPlainButtonType, - LogoUSDC -} from '@audius/stems' +import { PopupMenu, PopupMenuItem, LogoUSDC } from '@audius/stems' import BN from 'bn.js' import { Icon } from 'components/Icon' @@ -108,12 +104,13 @@ export const USDCCard = ({ balance }: { balance: BNUSDC }) => {
{messages.earn} - + variant={PlainButtonType.INVERTED} + > + {messages.learnMore} +