Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions packages/common/src/models/Analytics.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -300,10 +300,8 @@ export enum Name {
REWARDS_CLAIM_ALL_REQUEST = 'Rewards Claim All: Request',
REWARDS_CLAIM_ALL_SUCCESS = 'Rewards Claim All: Success',
REWARDS_CLAIM_ALL_FAILURE = 'Rewards Claim All: Failure',
REWARDS_CLAIM_ALL_BLOCKED = 'Rewards Claim All: Blocked',
REWARDS_CLAIM_REQUEST = 'Rewards Claim: Request',
REWARDS_CLAIM_SUCCESS = 'Rewards Claim: Success',
REWARDS_CLAIM_BLOCKED = 'Rewards Claim: Blocked',

// Buy USDC
BUY_USDC_ON_RAMP_OPENED = 'Buy USDC: On Ramp Opened',
Expand DownExpand Up@@ -1493,14 +1491,6 @@ type RewardsClaimSuccess = {
amount: number
}

type RewardsClaimBlocked = {
eventName: Name.REWARDS_CLAIM_BLOCKED
challengeId: string
specifier: string
amount: number
code: number
}

type RewardsClaimAllRequest = {
eventName: Name.REWARDS_CLAIM_ALL_REQUEST
count: number
Expand All@@ -1513,11 +1503,6 @@ type RewardsClaimAllFailure = {
eventName: Name.REWARDS_CLAIM_ALL_FAILURE
count: number
}
type RewardsClaimAllBlocked = {
eventName: Name.REWARDS_CLAIM_ALL_BLOCKED
count: number
code: number
}

type AudiusOauthStart = {
eventName: Name.AUDIUS_OAUTH_START
Expand DownExpand Up@@ -2749,11 +2734,9 @@ export type AllTrackingEvents =
| RewardsClaimDetailsOpened
| RewardsClaimRequest
| RewardsClaimSuccess
| RewardsClaimBlocked
| RewardsClaimAllRequest
| RewardsClaimAllSuccess
| RewardsClaimAllFailure
| RewardsClaimAllBlocked
| FolderOpenEdit
| FolderSubmitEdit
| FolderDelete
Expand Down
9 changes: 0 additions & 9 deletions packages/common/src/store/pages/audio-rewards/selectors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@ import { createSelector } from 'reselect'
import { ChallengeRewardID, UserChallenge } from '../../../models/AudioRewards'
import { CommonState } from '../../commonStore'

import { ClaimStatus } from './types'

export const getTrendingRewardsModalType = (state: CommonState) => {
const type = state.pages.audioRewards.trendingRewardsModalType as string
// 'playlists' is deprecated; treat as 'tracks'
Expand DownExpand Up@@ -65,10 +63,3 @@ export const getHCaptchaStatus = (state: CommonState) =>
export const getShowRewardClaimedToast = (state: CommonState) =>
state.pages.audioRewards.showRewardClaimedToast

export const getAAOErrorCode = (state: CommonState) => {
const claimState = state.pages.audioRewards.claimState
if (claimState.status !== ClaimStatus.ERROR) {
return undefined
}
return claimState.aaoErrorCode
}
13 changes: 2 additions & 11 deletions packages/common/src/store/pages/audio-rewards/slice.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -237,17 +237,8 @@ const slice = createSlice({
state.claimState = { status: ClaimStatus.WAITING_FOR_RETRY }
state.claimToRetry = action.payload
},
claimChallengeRewardFailed: (
state,
action: PayloadAction<
| {
aaoErrorCode: number
}
| undefined
>
) => {
const aaoErrorCode = action.payload?.aaoErrorCode
state.claimState = { status: ClaimStatus.ERROR, aaoErrorCode }
claimChallengeRewardFailed: (state) => {
state.claimState = { status: ClaimStatus.ERROR }
},
claimChallengeRewardAlreadyClaimed: (state) => {
state.claimState = { status: ClaimStatus.ALREADY_CLAIMED }
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/store/pages/audio-rewards/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ export type ClaimState =
| { status: ClaimStatus.ALREADY_CLAIMED }
| { status: ClaimStatus.SUCCESS }
| { status: ClaimStatus.CUMULATIVE_SUCCESS }
| { status: ClaimStatus.ERROR; aaoErrorCode: number | undefined }
| { status: ClaimStatus.ERROR }

export type AudioRewardsClaim = {
challengeId: ChallengeRewardID
Expand Down
9 changes: 0 additions & 9 deletions packages/common/src/utils/aaoErrorCodes.test.ts

This file was deleted.

29 changes: 0 additions & 29 deletions packages/common/src/utils/aaoErrorCodes.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/common/src/utils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ export * from './timingUtils'
export * from './typeUtils'
export * from './urlUtils'
export * from './uid'
export * from './aaoErrorCodes'
export * from './wallet'
export * from './sagaHelpers'
export * from './fileUtil'
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,6 @@ type AudioMatchingChallengeName =
| ChallengeName.AudioMatchingSell

export const AudioMatchingChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -150,7 +149,7 @@ export const AudioMatchingChallengeContent = ({
additionalContent={additionalContent}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import type { Challenge } from './types'

const {
getClaimStatus,
getAAOErrorCode,
getUndisbursedUserChallenges,
getChallengeRewardsModalType
} = audioRewardsPageSelectors
Expand DownExpand Up@@ -51,7 +50,6 @@ export const ChallengeRewardsDrawer = () => {
)
const undisbursedUserChallenges = useSelector(getUndisbursedUserChallenges)
const claimStatus = useSelector(getClaimStatus)
const aaoErrorCode = useSelector(getAAOErrorCode)
const { toast } = useToast()

const handleClose = useCallback(() => {
Expand DownExpand Up@@ -119,7 +117,6 @@ export const ChallengeRewardsDrawer = () => {
challenge={challenge}
challengeName={challengeName}
claimStatus={claimStatus}
aaoErrorCode={aaoErrorCode}
onClaim={() => onClaim(challenge)}
onClose={handleClose}
/>
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
import { getAAOErrorEmojis } from '@audius/common/utils'

import { Text } from '@audius/harmony-native'

const messages = {
claimErrorMessage:
'Something went wrong while claiming your rewards. Please try again and contact support@audius.co.',
claimErrorMessageAAO:
'Your account is unable to claim rewards at this time. Please try again later or contact support@audius.co. '
'Something went wrong while claiming your rewards. Please try again and contact support@audius.co.'
}

/** Renders a generic error message for failed challenge claims */
export const ClaimError = ({ aaoErrorCode }: { aaoErrorCode?: number }) => {
return aaoErrorCode === undefined ? (
export const ClaimError = () => {
return (
<Text size='s' color='danger'>
{messages.claimErrorMessage}
</Text>
) : (
<Text size='s' color='danger'>
{messages.claimErrorMessageAAO}
{getAAOErrorEmojis(aaoErrorCode)}
</Text>
)
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const CosignChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -130,7 +129,7 @@ export const CosignChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ export const DefaultChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose,
children
Expand DownExpand Up@@ -110,7 +109,7 @@ export const DefaultChallengeContent = ({
statusLabel={statusLabel}
actions={children ?? actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!challenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const FirstWeeklyCommentChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -134,7 +133,7 @@ export const FirstWeeklyCommentChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,6 @@ const messages = {
}

export const ListenStreakEndlessChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -124,7 +123,7 @@ export const ListenStreakEndlessChallengeContent = ({
statusLabel={statusLabel}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const PinnedCommentChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -132,7 +131,7 @@ export const PinnedCommentChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!challenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ const messages = {
}

export const PlayCountMilestoneContent = (props: ChallengeContentProps) => {
const { challengeName, onClose, onClaim, claimStatus, aaoErrorCode } = props
const { challengeName, onClose, onClaim, claimStatus } = props
const { data: currentAccount } = useCurrentAccount()
const { data: currentUser } = useCurrentAccountUser()
const userChallenges = useSelector((state: CommonState) =>
Expand DownExpand Up@@ -141,7 +141,7 @@ export const PlayCountMilestoneContent = (props: ChallengeContentProps) => {
actions={actions}
additionalContent={additionalContent}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!optimisticChallenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,6 @@ export const ProfileCompletionChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose
}: ChallengeContentProps) => {
Expand DownExpand Up@@ -216,7 +215,7 @@ export const ProfileCompletionChallengeContent = ({
additionalContent={completionChecks}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ export const ReferralChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose
}: ChallengeContentProps) => {
Expand DownExpand Up@@ -119,7 +118,7 @@ export const ReferralChallengeContent = ({
additionalContent={referralContent}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const RemixContestWinnerChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -129,7 +128,7 @@ export const RemixContestWinnerChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ const messages = {
}

export const TastemakerChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -120,7 +119,7 @@ export const TastemakerChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={Boolean(challenge?.cooldown_days)}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,6 @@ export type ChallengeContentProps = {
challengeName: ChallengeName
/** The current claim status */
claimStatus: ClaimStatus
/** Error code from AAO */
aaoErrorCode?: number
/** Callback for claiming rewards */
onClaim?: () => void
/** Callback for closing the drawer */
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions packages/common/src/models/Analytics.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -300,10 +300,8 @@ export enum Name {
REWARDS_CLAIM_ALL_REQUEST = 'Rewards Claim All: Request',
REWARDS_CLAIM_ALL_SUCCESS = 'Rewards Claim All: Success',
REWARDS_CLAIM_ALL_FAILURE = 'Rewards Claim All: Failure',
REWARDS_CLAIM_ALL_BLOCKED = 'Rewards Claim All: Blocked',
REWARDS_CLAIM_REQUEST = 'Rewards Claim: Request',
REWARDS_CLAIM_SUCCESS = 'Rewards Claim: Success',
REWARDS_CLAIM_BLOCKED = 'Rewards Claim: Blocked',

// Buy USDC
BUY_USDC_ON_RAMP_OPENED = 'Buy USDC: On Ramp Opened',
Expand DownExpand Up@@ -1493,14 +1491,6 @@ type RewardsClaimSuccess = {
amount: number
}

type RewardsClaimBlocked = {
eventName: Name.REWARDS_CLAIM_BLOCKED
challengeId: string
specifier: string
amount: number
code: number
}

type RewardsClaimAllRequest = {
eventName: Name.REWARDS_CLAIM_ALL_REQUEST
count: number
Expand All@@ -1513,11 +1503,6 @@ type RewardsClaimAllFailure = {
eventName: Name.REWARDS_CLAIM_ALL_FAILURE
count: number
}
type RewardsClaimAllBlocked = {
eventName: Name.REWARDS_CLAIM_ALL_BLOCKED
count: number
code: number
}

type AudiusOauthStart = {
eventName: Name.AUDIUS_OAUTH_START
Expand DownExpand Up@@ -2749,11 +2734,9 @@ export type AllTrackingEvents =
| RewardsClaimDetailsOpened
| RewardsClaimRequest
| RewardsClaimSuccess
| RewardsClaimBlocked
| RewardsClaimAllRequest
| RewardsClaimAllSuccess
| RewardsClaimAllFailure
| RewardsClaimAllBlocked
| FolderOpenEdit
| FolderSubmitEdit
| FolderDelete
Expand Down
9 changes: 0 additions & 9 deletions packages/common/src/store/pages/audio-rewards/selectors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@ import { createSelector } from 'reselect'
import { ChallengeRewardID, UserChallenge } from '../../../models/AudioRewards'
import { CommonState } from '../../commonStore'

import { ClaimStatus } from './types'

export const getTrendingRewardsModalType = (state: CommonState) => {
const type = state.pages.audioRewards.trendingRewardsModalType as string
// 'playlists' is deprecated; treat as 'tracks'
Expand DownExpand Up@@ -65,10 +63,3 @@ export const getHCaptchaStatus = (state: CommonState) =>
export const getShowRewardClaimedToast = (state: CommonState) =>
state.pages.audioRewards.showRewardClaimedToast

export const getAAOErrorCode = (state: CommonState) => {
const claimState = state.pages.audioRewards.claimState
if (claimState.status !== ClaimStatus.ERROR) {
return undefined
}
return claimState.aaoErrorCode
}
13 changes: 2 additions & 11 deletions packages/common/src/store/pages/audio-rewards/slice.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -237,17 +237,8 @@ const slice = createSlice({
state.claimState = { status: ClaimStatus.WAITING_FOR_RETRY }
state.claimToRetry = action.payload
},
claimChallengeRewardFailed: (
state,
action: PayloadAction<
| {
aaoErrorCode: number
}
| undefined
>
) => {
const aaoErrorCode = action.payload?.aaoErrorCode
state.claimState = { status: ClaimStatus.ERROR, aaoErrorCode }
claimChallengeRewardFailed: (state) => {
state.claimState = { status: ClaimStatus.ERROR }
},
claimChallengeRewardAlreadyClaimed: (state) => {
state.claimState = { status: ClaimStatus.ALREADY_CLAIMED }
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/store/pages/audio-rewards/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ export type ClaimState =
| { status: ClaimStatus.ALREADY_CLAIMED }
| { status: ClaimStatus.SUCCESS }
| { status: ClaimStatus.CUMULATIVE_SUCCESS }
| { status: ClaimStatus.ERROR; aaoErrorCode: number | undefined }
| { status: ClaimStatus.ERROR }

export type AudioRewardsClaim = {
challengeId: ChallengeRewardID
Expand Down
9 changes: 0 additions & 9 deletions packages/common/src/utils/aaoErrorCodes.test.ts

This file was deleted.

29 changes: 0 additions & 29 deletions packages/common/src/utils/aaoErrorCodes.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/common/src/utils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ export * from './timingUtils'
export * from './typeUtils'
export * from './urlUtils'
export * from './uid'
export * from './aaoErrorCodes'
export * from './wallet'
export * from './sagaHelpers'
export * from './fileUtil'
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,6 @@ type AudioMatchingChallengeName =
| ChallengeName.AudioMatchingSell

export const AudioMatchingChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -150,7 +149,7 @@ export const AudioMatchingChallengeContent = ({
additionalContent={additionalContent}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import type { Challenge } from './types'

const {
getClaimStatus,
getAAOErrorCode,
getUndisbursedUserChallenges,
getChallengeRewardsModalType
} = audioRewardsPageSelectors
Expand DownExpand Up@@ -51,7 +50,6 @@ export const ChallengeRewardsDrawer = () => {
)
const undisbursedUserChallenges = useSelector(getUndisbursedUserChallenges)
const claimStatus = useSelector(getClaimStatus)
const aaoErrorCode = useSelector(getAAOErrorCode)
const { toast } = useToast()

const handleClose = useCallback(() => {
Expand DownExpand Up@@ -119,7 +117,6 @@ export const ChallengeRewardsDrawer = () => {
challenge={challenge}
challengeName={challengeName}
claimStatus={claimStatus}
aaoErrorCode={aaoErrorCode}
onClaim={() => onClaim(challenge)}
onClose={handleClose}
/>
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
import { getAAOErrorEmojis } from '@audius/common/utils'

import { Text } from '@audius/harmony-native'

const messages = {
claimErrorMessage:
'Something went wrong while claiming your rewards. Please try again and contact support@audius.co.',
claimErrorMessageAAO:
'Your account is unable to claim rewards at this time. Please try again later or contact support@audius.co. '
'Something went wrong while claiming your rewards. Please try again and contact support@audius.co.'
}

/** Renders a generic error message for failed challenge claims */
export const ClaimError = ({ aaoErrorCode }: { aaoErrorCode?: number }) => {
return aaoErrorCode === undefined ? (
export const ClaimError = () => {
return (
<Text size='s' color='danger'>
{messages.claimErrorMessage}
</Text>
) : (
<Text size='s' color='danger'>
{messages.claimErrorMessageAAO}
{getAAOErrorEmojis(aaoErrorCode)}
</Text>
)
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const CosignChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -130,7 +129,7 @@ export const CosignChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ export const DefaultChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose,
children
Expand DownExpand Up@@ -110,7 +109,7 @@ export const DefaultChallengeContent = ({
statusLabel={statusLabel}
actions={children ?? actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!challenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const FirstWeeklyCommentChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -134,7 +133,7 @@ export const FirstWeeklyCommentChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,6 @@ const messages = {
}

export const ListenStreakEndlessChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -124,7 +123,7 @@ export const ListenStreakEndlessChallengeContent = ({
statusLabel={statusLabel}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const PinnedCommentChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -132,7 +131,7 @@ export const PinnedCommentChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!challenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ const messages = {
}

export const PlayCountMilestoneContent = (props: ChallengeContentProps) => {
const { challengeName, onClose, onClaim, claimStatus, aaoErrorCode } = props
const { challengeName, onClose, onClaim, claimStatus } = props
const { data: currentAccount } = useCurrentAccount()
const { data: currentUser } = useCurrentAccountUser()
const userChallenges = useSelector((state: CommonState) =>
Expand DownExpand Up@@ -141,7 +141,7 @@ export const PlayCountMilestoneContent = (props: ChallengeContentProps) => {
actions={actions}
additionalContent={additionalContent}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!optimisticChallenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,6 @@ export const ProfileCompletionChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose
}: ChallengeContentProps) => {
Expand DownExpand Up@@ -216,7 +215,7 @@ export const ProfileCompletionChallengeContent = ({
additionalContent={completionChecks}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ export const ReferralChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose
}: ChallengeContentProps) => {
Expand DownExpand Up@@ -119,7 +118,7 @@ export const ReferralChallengeContent = ({
additionalContent={referralContent}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const RemixContestWinnerChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -129,7 +128,7 @@ export const RemixContestWinnerChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ const messages = {
}

export const TastemakerChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -120,7 +119,7 @@ export const TastemakerChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={Boolean(challenge?.cooldown_days)}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,6 @@ export type ChallengeContentProps = {
challengeName: ChallengeName
/** The current claim status */
claimStatus: ClaimStatus
/** Error code from AAO */
aaoErrorCode?: number
/** Callback for claiming rewards */
onClaim?: () => void
/** Callback for closing the drawer */
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions packages/common/src/models/Analytics.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -300,10 +300,8 @@ export enum Name {
REWARDS_CLAIM_ALL_REQUEST = 'Rewards Claim All: Request',
REWARDS_CLAIM_ALL_SUCCESS = 'Rewards Claim All: Success',
REWARDS_CLAIM_ALL_FAILURE = 'Rewards Claim All: Failure',
REWARDS_CLAIM_ALL_BLOCKED = 'Rewards Claim All: Blocked',
REWARDS_CLAIM_REQUEST = 'Rewards Claim: Request',
REWARDS_CLAIM_SUCCESS = 'Rewards Claim: Success',
REWARDS_CLAIM_BLOCKED = 'Rewards Claim: Blocked',

// Buy USDC
BUY_USDC_ON_RAMP_OPENED = 'Buy USDC: On Ramp Opened',
Expand DownExpand Up@@ -1493,14 +1491,6 @@ type RewardsClaimSuccess = {
amount: number
}

type RewardsClaimBlocked = {
eventName: Name.REWARDS_CLAIM_BLOCKED
challengeId: string
specifier: string
amount: number
code: number
}

type RewardsClaimAllRequest = {
eventName: Name.REWARDS_CLAIM_ALL_REQUEST
count: number
Expand All@@ -1513,11 +1503,6 @@ type RewardsClaimAllFailure = {
eventName: Name.REWARDS_CLAIM_ALL_FAILURE
count: number
}
type RewardsClaimAllBlocked = {
eventName: Name.REWARDS_CLAIM_ALL_BLOCKED
count: number
code: number
}

type AudiusOauthStart = {
eventName: Name.AUDIUS_OAUTH_START
Expand DownExpand Up@@ -2749,11 +2734,9 @@ export type AllTrackingEvents =
| RewardsClaimDetailsOpened
| RewardsClaimRequest
| RewardsClaimSuccess
| RewardsClaimBlocked
| RewardsClaimAllRequest
| RewardsClaimAllSuccess
| RewardsClaimAllFailure
| RewardsClaimAllBlocked
| FolderOpenEdit
| FolderSubmitEdit
| FolderDelete
Expand Down
9 changes: 0 additions & 9 deletions packages/common/src/store/pages/audio-rewards/selectors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@ import { createSelector } from 'reselect'
import { ChallengeRewardID, UserChallenge } from '../../../models/AudioRewards'
import { CommonState } from '../../commonStore'

import { ClaimStatus } from './types'

export const getTrendingRewardsModalType = (state: CommonState) => {
const type = state.pages.audioRewards.trendingRewardsModalType as string
// 'playlists' is deprecated; treat as 'tracks'
Expand DownExpand Up@@ -65,10 +63,3 @@ export const getHCaptchaStatus = (state: CommonState) =>
export const getShowRewardClaimedToast = (state: CommonState) =>
state.pages.audioRewards.showRewardClaimedToast

export const getAAOErrorCode = (state: CommonState) => {
const claimState = state.pages.audioRewards.claimState
if (claimState.status !== ClaimStatus.ERROR) {
return undefined
}
return claimState.aaoErrorCode
}
13 changes: 2 additions & 11 deletions packages/common/src/store/pages/audio-rewards/slice.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -237,17 +237,8 @@ const slice = createSlice({
state.claimState = { status: ClaimStatus.WAITING_FOR_RETRY }
state.claimToRetry = action.payload
},
claimChallengeRewardFailed: (
state,
action: PayloadAction<
| {
aaoErrorCode: number
}
| undefined
>
) => {
const aaoErrorCode = action.payload?.aaoErrorCode
state.claimState = { status: ClaimStatus.ERROR, aaoErrorCode }
claimChallengeRewardFailed: (state) => {
state.claimState = { status: ClaimStatus.ERROR }
},
claimChallengeRewardAlreadyClaimed: (state) => {
state.claimState = { status: ClaimStatus.ALREADY_CLAIMED }
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/store/pages/audio-rewards/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ export type ClaimState =
| { status: ClaimStatus.ALREADY_CLAIMED }
| { status: ClaimStatus.SUCCESS }
| { status: ClaimStatus.CUMULATIVE_SUCCESS }
| { status: ClaimStatus.ERROR; aaoErrorCode: number | undefined }
| { status: ClaimStatus.ERROR }

export type AudioRewardsClaim = {
challengeId: ChallengeRewardID
Expand Down
9 changes: 0 additions & 9 deletions packages/common/src/utils/aaoErrorCodes.test.ts

This file was deleted.

29 changes: 0 additions & 29 deletions packages/common/src/utils/aaoErrorCodes.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/common/src/utils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ export * from './timingUtils'
export * from './typeUtils'
export * from './urlUtils'
export * from './uid'
export * from './aaoErrorCodes'
export * from './wallet'
export * from './sagaHelpers'
export * from './fileUtil'
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,6 @@ type AudioMatchingChallengeName =
| ChallengeName.AudioMatchingSell

export const AudioMatchingChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -150,7 +149,7 @@ export const AudioMatchingChallengeContent = ({
additionalContent={additionalContent}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import type { Challenge } from './types'

const {
getClaimStatus,
getAAOErrorCode,
getUndisbursedUserChallenges,
getChallengeRewardsModalType
} = audioRewardsPageSelectors
Expand DownExpand Up@@ -51,7 +50,6 @@ export const ChallengeRewardsDrawer = () => {
)
const undisbursedUserChallenges = useSelector(getUndisbursedUserChallenges)
const claimStatus = useSelector(getClaimStatus)
const aaoErrorCode = useSelector(getAAOErrorCode)
const { toast } = useToast()

const handleClose = useCallback(() => {
Expand DownExpand Up@@ -119,7 +117,6 @@ export const ChallengeRewardsDrawer = () => {
challenge={challenge}
challengeName={challengeName}
claimStatus={claimStatus}
aaoErrorCode={aaoErrorCode}
onClaim={() => onClaim(challenge)}
onClose={handleClose}
/>
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
import { getAAOErrorEmojis } from '@audius/common/utils'

import { Text } from '@audius/harmony-native'

const messages = {
claimErrorMessage:
'Something went wrong while claiming your rewards. Please try again and contact support@audius.co.',
claimErrorMessageAAO:
'Your account is unable to claim rewards at this time. Please try again later or contact support@audius.co. '
'Something went wrong while claiming your rewards. Please try again and contact support@audius.co.'
}

/** Renders a generic error message for failed challenge claims */
export const ClaimError = ({ aaoErrorCode }: { aaoErrorCode?: number }) => {
return aaoErrorCode === undefined ? (
export const ClaimError = () => {
return (
<Text size='s' color='danger'>
{messages.claimErrorMessage}
</Text>
) : (
<Text size='s' color='danger'>
{messages.claimErrorMessageAAO}
{getAAOErrorEmojis(aaoErrorCode)}
</Text>
)
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const CosignChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -130,7 +129,7 @@ export const CosignChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ export const DefaultChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose,
children
Expand DownExpand Up@@ -110,7 +109,7 @@ export const DefaultChallengeContent = ({
statusLabel={statusLabel}
actions={children ?? actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!challenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const FirstWeeklyCommentChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -134,7 +133,7 @@ export const FirstWeeklyCommentChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,6 @@ const messages = {
}

export const ListenStreakEndlessChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -124,7 +123,7 @@ export const ListenStreakEndlessChallengeContent = ({
statusLabel={statusLabel}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const PinnedCommentChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -132,7 +131,7 @@ export const PinnedCommentChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!challenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ const messages = {
}

export const PlayCountMilestoneContent = (props: ChallengeContentProps) => {
const { challengeName, onClose, onClaim, claimStatus, aaoErrorCode } = props
const { challengeName, onClose, onClaim, claimStatus } = props
const { data: currentAccount } = useCurrentAccount()
const { data: currentUser } = useCurrentAccountUser()
const userChallenges = useSelector((state: CommonState) =>
Expand DownExpand Up@@ -141,7 +141,7 @@ export const PlayCountMilestoneContent = (props: ChallengeContentProps) => {
actions={actions}
additionalContent={additionalContent}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!optimisticChallenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,6 @@ export const ProfileCompletionChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose
}: ChallengeContentProps) => {
Expand DownExpand Up@@ -216,7 +215,7 @@ export const ProfileCompletionChallengeContent = ({
additionalContent={completionChecks}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ export const ReferralChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose
}: ChallengeContentProps) => {
Expand DownExpand Up@@ -119,7 +118,7 @@ export const ReferralChallengeContent = ({
additionalContent={referralContent}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const RemixContestWinnerChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -129,7 +128,7 @@ export const RemixContestWinnerChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ const messages = {
}

export const TastemakerChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -120,7 +119,7 @@ export const TastemakerChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={Boolean(challenge?.cooldown_days)}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,6 @@ export type ChallengeContentProps = {
challengeName: ChallengeName
/** The current claim status */
claimStatus: ClaimStatus
/** Error code from AAO */
aaoErrorCode?: number
/** Callback for claiming rewards */
onClaim?: () => void
/** Callback for closing the drawer */
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions packages/common/src/models/Analytics.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -300,10 +300,8 @@ export enum Name {
REWARDS_CLAIM_ALL_REQUEST = 'Rewards Claim All: Request',
REWARDS_CLAIM_ALL_SUCCESS = 'Rewards Claim All: Success',
REWARDS_CLAIM_ALL_FAILURE = 'Rewards Claim All: Failure',
REWARDS_CLAIM_ALL_BLOCKED = 'Rewards Claim All: Blocked',
REWARDS_CLAIM_REQUEST = 'Rewards Claim: Request',
REWARDS_CLAIM_SUCCESS = 'Rewards Claim: Success',
REWARDS_CLAIM_BLOCKED = 'Rewards Claim: Blocked',

// Buy USDC
BUY_USDC_ON_RAMP_OPENED = 'Buy USDC: On Ramp Opened',
Expand DownExpand Up@@ -1493,14 +1491,6 @@ type RewardsClaimSuccess = {
amount: number
}

type RewardsClaimBlocked = {
eventName: Name.REWARDS_CLAIM_BLOCKED
challengeId: string
specifier: string
amount: number
code: number
}

type RewardsClaimAllRequest = {
eventName: Name.REWARDS_CLAIM_ALL_REQUEST
count: number
Expand All@@ -1513,11 +1503,6 @@ type RewardsClaimAllFailure = {
eventName: Name.REWARDS_CLAIM_ALL_FAILURE
count: number
}
type RewardsClaimAllBlocked = {
eventName: Name.REWARDS_CLAIM_ALL_BLOCKED
count: number
code: number
}

type AudiusOauthStart = {
eventName: Name.AUDIUS_OAUTH_START
Expand DownExpand Up@@ -2749,11 +2734,9 @@ export type AllTrackingEvents =
| RewardsClaimDetailsOpened
| RewardsClaimRequest
| RewardsClaimSuccess
| RewardsClaimBlocked
| RewardsClaimAllRequest
| RewardsClaimAllSuccess
| RewardsClaimAllFailure
| RewardsClaimAllBlocked
| FolderOpenEdit
| FolderSubmitEdit
| FolderDelete
Expand Down
9 changes: 0 additions & 9 deletions packages/common/src/store/pages/audio-rewards/selectors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@ import { createSelector } from 'reselect'
import { ChallengeRewardID, UserChallenge } from '../../../models/AudioRewards'
import { CommonState } from '../../commonStore'

import { ClaimStatus } from './types'

export const getTrendingRewardsModalType = (state: CommonState) => {
const type = state.pages.audioRewards.trendingRewardsModalType as string
// 'playlists' is deprecated; treat as 'tracks'
Expand DownExpand Up@@ -65,10 +63,3 @@ export const getHCaptchaStatus = (state: CommonState) =>
export const getShowRewardClaimedToast = (state: CommonState) =>
state.pages.audioRewards.showRewardClaimedToast

export const getAAOErrorCode = (state: CommonState) => {
const claimState = state.pages.audioRewards.claimState
if (claimState.status !== ClaimStatus.ERROR) {
return undefined
}
return claimState.aaoErrorCode
}
13 changes: 2 additions & 11 deletions packages/common/src/store/pages/audio-rewards/slice.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -237,17 +237,8 @@ const slice = createSlice({
state.claimState = { status: ClaimStatus.WAITING_FOR_RETRY }
state.claimToRetry = action.payload
},
claimChallengeRewardFailed: (
state,
action: PayloadAction<
| {
aaoErrorCode: number
}
| undefined
>
) => {
const aaoErrorCode = action.payload?.aaoErrorCode
state.claimState = { status: ClaimStatus.ERROR, aaoErrorCode }
claimChallengeRewardFailed: (state) => {
state.claimState = { status: ClaimStatus.ERROR }
},
claimChallengeRewardAlreadyClaimed: (state) => {
state.claimState = { status: ClaimStatus.ALREADY_CLAIMED }
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/store/pages/audio-rewards/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ export type ClaimState =
| { status: ClaimStatus.ALREADY_CLAIMED }
| { status: ClaimStatus.SUCCESS }
| { status: ClaimStatus.CUMULATIVE_SUCCESS }
| { status: ClaimStatus.ERROR; aaoErrorCode: number | undefined }
| { status: ClaimStatus.ERROR }

export type AudioRewardsClaim = {
challengeId: ChallengeRewardID
Expand Down
9 changes: 0 additions & 9 deletions packages/common/src/utils/aaoErrorCodes.test.ts

This file was deleted.

29 changes: 0 additions & 29 deletions packages/common/src/utils/aaoErrorCodes.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/common/src/utils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ export * from './timingUtils'
export * from './typeUtils'
export * from './urlUtils'
export * from './uid'
export * from './aaoErrorCodes'
export * from './wallet'
export * from './sagaHelpers'
export * from './fileUtil'
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,6 @@ type AudioMatchingChallengeName =
| ChallengeName.AudioMatchingSell

export const AudioMatchingChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -150,7 +149,7 @@ export const AudioMatchingChallengeContent = ({
additionalContent={additionalContent}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import type { Challenge } from './types'

const {
getClaimStatus,
getAAOErrorCode,
getUndisbursedUserChallenges,
getChallengeRewardsModalType
} = audioRewardsPageSelectors
Expand DownExpand Up@@ -51,7 +50,6 @@ export const ChallengeRewardsDrawer = () => {
)
const undisbursedUserChallenges = useSelector(getUndisbursedUserChallenges)
const claimStatus = useSelector(getClaimStatus)
const aaoErrorCode = useSelector(getAAOErrorCode)
const { toast } = useToast()

const handleClose = useCallback(() => {
Expand DownExpand Up@@ -119,7 +117,6 @@ export const ChallengeRewardsDrawer = () => {
challenge={challenge}
challengeName={challengeName}
claimStatus={claimStatus}
aaoErrorCode={aaoErrorCode}
onClaim={() => onClaim(challenge)}
onClose={handleClose}
/>
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
import { getAAOErrorEmojis } from '@audius/common/utils'

import { Text } from '@audius/harmony-native'

const messages = {
claimErrorMessage:
'Something went wrong while claiming your rewards. Please try again and contact support@audius.co.',
claimErrorMessageAAO:
'Your account is unable to claim rewards at this time. Please try again later or contact support@audius.co. '
'Something went wrong while claiming your rewards. Please try again and contact support@audius.co.'
}

/** Renders a generic error message for failed challenge claims */
export const ClaimError = ({ aaoErrorCode }: { aaoErrorCode?: number }) => {
return aaoErrorCode === undefined ? (
export const ClaimError = () => {
return (
<Text size='s' color='danger'>
{messages.claimErrorMessage}
</Text>
) : (
<Text size='s' color='danger'>
{messages.claimErrorMessageAAO}
{getAAOErrorEmojis(aaoErrorCode)}
</Text>
)
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const CosignChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -130,7 +129,7 @@ export const CosignChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ export const DefaultChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose,
children
Expand DownExpand Up@@ -110,7 +109,7 @@ export const DefaultChallengeContent = ({
statusLabel={statusLabel}
actions={children ?? actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!challenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const FirstWeeklyCommentChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -134,7 +133,7 @@ export const FirstWeeklyCommentChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,6 @@ const messages = {
}

export const ListenStreakEndlessChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -124,7 +123,7 @@ export const ListenStreakEndlessChallengeContent = ({
statusLabel={statusLabel}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const PinnedCommentChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -132,7 +131,7 @@ export const PinnedCommentChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!challenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ const messages = {
}

export const PlayCountMilestoneContent = (props: ChallengeContentProps) => {
const { challengeName, onClose, onClaim, claimStatus, aaoErrorCode } = props
const { challengeName, onClose, onClaim, claimStatus } = props
const { data: currentAccount } = useCurrentAccount()
const { data: currentUser } = useCurrentAccountUser()
const userChallenges = useSelector((state: CommonState) =>
Expand DownExpand Up@@ -141,7 +141,7 @@ export const PlayCountMilestoneContent = (props: ChallengeContentProps) => {
actions={actions}
additionalContent={additionalContent}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!optimisticChallenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,6 @@ export const ProfileCompletionChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose
}: ChallengeContentProps) => {
Expand DownExpand Up@@ -216,7 +215,7 @@ export const ProfileCompletionChallengeContent = ({
additionalContent={completionChecks}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ export const ReferralChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose
}: ChallengeContentProps) => {
Expand DownExpand Up@@ -119,7 +118,7 @@ export const ReferralChallengeContent = ({
additionalContent={referralContent}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const RemixContestWinnerChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -129,7 +128,7 @@ export const RemixContestWinnerChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ const messages = {
}

export const TastemakerChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -120,7 +119,7 @@ export const TastemakerChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={Boolean(challenge?.cooldown_days)}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,6 @@ export type ChallengeContentProps = {
challengeName: ChallengeName
/** The current claim status */
claimStatus: ClaimStatus
/** Error code from AAO */
aaoErrorCode?: number
/** Callback for claiming rewards */
onClaim?: () => void
/** Callback for closing the drawer */
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions packages/common/src/models/Analytics.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -300,10 +300,8 @@ export enum Name {
REWARDS_CLAIM_ALL_REQUEST = 'Rewards Claim All: Request',
REWARDS_CLAIM_ALL_SUCCESS = 'Rewards Claim All: Success',
REWARDS_CLAIM_ALL_FAILURE = 'Rewards Claim All: Failure',
REWARDS_CLAIM_ALL_BLOCKED = 'Rewards Claim All: Blocked',
REWARDS_CLAIM_REQUEST = 'Rewards Claim: Request',
REWARDS_CLAIM_SUCCESS = 'Rewards Claim: Success',
REWARDS_CLAIM_BLOCKED = 'Rewards Claim: Blocked',

// Buy USDC
BUY_USDC_ON_RAMP_OPENED = 'Buy USDC: On Ramp Opened',
Expand DownExpand Up@@ -1493,14 +1491,6 @@ type RewardsClaimSuccess = {
amount: number
}

type RewardsClaimBlocked = {
eventName: Name.REWARDS_CLAIM_BLOCKED
challengeId: string
specifier: string
amount: number
code: number
}

type RewardsClaimAllRequest = {
eventName: Name.REWARDS_CLAIM_ALL_REQUEST
count: number
Expand All@@ -1513,11 +1503,6 @@ type RewardsClaimAllFailure = {
eventName: Name.REWARDS_CLAIM_ALL_FAILURE
count: number
}
type RewardsClaimAllBlocked = {
eventName: Name.REWARDS_CLAIM_ALL_BLOCKED
count: number
code: number
}

type AudiusOauthStart = {
eventName: Name.AUDIUS_OAUTH_START
Expand DownExpand Up@@ -2749,11 +2734,9 @@ export type AllTrackingEvents =
| RewardsClaimDetailsOpened
| RewardsClaimRequest
| RewardsClaimSuccess
| RewardsClaimBlocked
| RewardsClaimAllRequest
| RewardsClaimAllSuccess
| RewardsClaimAllFailure
| RewardsClaimAllBlocked
| FolderOpenEdit
| FolderSubmitEdit
| FolderDelete
Expand Down
9 changes: 0 additions & 9 deletions packages/common/src/store/pages/audio-rewards/selectors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@ import { createSelector } from 'reselect'
import { ChallengeRewardID, UserChallenge } from '../../../models/AudioRewards'
import { CommonState } from '../../commonStore'

import { ClaimStatus } from './types'

export const getTrendingRewardsModalType = (state: CommonState) => {
const type = state.pages.audioRewards.trendingRewardsModalType as string
// 'playlists' is deprecated; treat as 'tracks'
Expand DownExpand Up@@ -65,10 +63,3 @@ export const getHCaptchaStatus = (state: CommonState) =>
export const getShowRewardClaimedToast = (state: CommonState) =>
state.pages.audioRewards.showRewardClaimedToast

export const getAAOErrorCode = (state: CommonState) => {
const claimState = state.pages.audioRewards.claimState
if (claimState.status !== ClaimStatus.ERROR) {
return undefined
}
return claimState.aaoErrorCode
}
13 changes: 2 additions & 11 deletions packages/common/src/store/pages/audio-rewards/slice.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -237,17 +237,8 @@ const slice = createSlice({
state.claimState = { status: ClaimStatus.WAITING_FOR_RETRY }
state.claimToRetry = action.payload
},
claimChallengeRewardFailed: (
state,
action: PayloadAction<
| {
aaoErrorCode: number
}
| undefined
>
) => {
const aaoErrorCode = action.payload?.aaoErrorCode
state.claimState = { status: ClaimStatus.ERROR, aaoErrorCode }
claimChallengeRewardFailed: (state) => {
state.claimState = { status: ClaimStatus.ERROR }
},
claimChallengeRewardAlreadyClaimed: (state) => {
state.claimState = { status: ClaimStatus.ALREADY_CLAIMED }
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/store/pages/audio-rewards/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ export type ClaimState =
| { status: ClaimStatus.ALREADY_CLAIMED }
| { status: ClaimStatus.SUCCESS }
| { status: ClaimStatus.CUMULATIVE_SUCCESS }
| { status: ClaimStatus.ERROR; aaoErrorCode: number | undefined }
| { status: ClaimStatus.ERROR }

export type AudioRewardsClaim = {
challengeId: ChallengeRewardID
Expand Down
9 changes: 0 additions & 9 deletions packages/common/src/utils/aaoErrorCodes.test.ts

This file was deleted.

29 changes: 0 additions & 29 deletions packages/common/src/utils/aaoErrorCodes.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/common/src/utils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ export * from './timingUtils'
export * from './typeUtils'
export * from './urlUtils'
export * from './uid'
export * from './aaoErrorCodes'
export * from './wallet'
export * from './sagaHelpers'
export * from './fileUtil'
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,6 @@ type AudioMatchingChallengeName =
| ChallengeName.AudioMatchingSell

export const AudioMatchingChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -150,7 +149,7 @@ export const AudioMatchingChallengeContent = ({
additionalContent={additionalContent}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import type { Challenge } from './types'

const {
getClaimStatus,
getAAOErrorCode,
getUndisbursedUserChallenges,
getChallengeRewardsModalType
} = audioRewardsPageSelectors
Expand DownExpand Up@@ -51,7 +50,6 @@ export const ChallengeRewardsDrawer = () => {
)
const undisbursedUserChallenges = useSelector(getUndisbursedUserChallenges)
const claimStatus = useSelector(getClaimStatus)
const aaoErrorCode = useSelector(getAAOErrorCode)
const { toast } = useToast()

const handleClose = useCallback(() => {
Expand DownExpand Up@@ -119,7 +117,6 @@ export const ChallengeRewardsDrawer = () => {
challenge={challenge}
challengeName={challengeName}
claimStatus={claimStatus}
aaoErrorCode={aaoErrorCode}
onClaim={() => onClaim(challenge)}
onClose={handleClose}
/>
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
import { getAAOErrorEmojis } from '@audius/common/utils'

import { Text } from '@audius/harmony-native'

const messages = {
claimErrorMessage:
'Something went wrong while claiming your rewards. Please try again and contact support@audius.co.',
claimErrorMessageAAO:
'Your account is unable to claim rewards at this time. Please try again later or contact support@audius.co. '
'Something went wrong while claiming your rewards. Please try again and contact support@audius.co.'
}

/** Renders a generic error message for failed challenge claims */
export const ClaimError = ({ aaoErrorCode }: { aaoErrorCode?: number }) => {
return aaoErrorCode === undefined ? (
export const ClaimError = () => {
return (
<Text size='s' color='danger'>
{messages.claimErrorMessage}
</Text>
) : (
<Text size='s' color='danger'>
{messages.claimErrorMessageAAO}
{getAAOErrorEmojis(aaoErrorCode)}
</Text>
)
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const CosignChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -130,7 +129,7 @@ export const CosignChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ export const DefaultChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose,
children
Expand DownExpand Up@@ -110,7 +109,7 @@ export const DefaultChallengeContent = ({
statusLabel={statusLabel}
actions={children ?? actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!challenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const FirstWeeklyCommentChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -134,7 +133,7 @@ export const FirstWeeklyCommentChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,6 @@ const messages = {
}

export const ListenStreakEndlessChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -124,7 +123,7 @@ export const ListenStreakEndlessChallengeContent = ({
statusLabel={statusLabel}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const PinnedCommentChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -132,7 +131,7 @@ export const PinnedCommentChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!challenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ const messages = {
}

export const PlayCountMilestoneContent = (props: ChallengeContentProps) => {
const { challengeName, onClose, onClaim, claimStatus, aaoErrorCode } = props
const { challengeName, onClose, onClaim, claimStatus } = props
const { data: currentAccount } = useCurrentAccount()
const { data: currentUser } = useCurrentAccountUser()
const userChallenges = useSelector((state: CommonState) =>
Expand DownExpand Up@@ -141,7 +141,7 @@ export const PlayCountMilestoneContent = (props: ChallengeContentProps) => {
actions={actions}
additionalContent={additionalContent}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!optimisticChallenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,6 @@ export const ProfileCompletionChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose
}: ChallengeContentProps) => {
Expand DownExpand Up@@ -216,7 +215,7 @@ export const ProfileCompletionChallengeContent = ({
additionalContent={completionChecks}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ export const ReferralChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose
}: ChallengeContentProps) => {
Expand DownExpand Up@@ -119,7 +118,7 @@ export const ReferralChallengeContent = ({
additionalContent={referralContent}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const RemixContestWinnerChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -129,7 +128,7 @@ export const RemixContestWinnerChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ const messages = {
}

export const TastemakerChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -120,7 +119,7 @@ export const TastemakerChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={Boolean(challenge?.cooldown_days)}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,6 @@ export type ChallengeContentProps = {
challengeName: ChallengeName
/** The current claim status */
claimStatus: ClaimStatus
/** Error code from AAO */
aaoErrorCode?: number
/** Callback for claiming rewards */
onClaim?: () => void
/** Callback for closing the drawer */
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions packages/common/src/models/Analytics.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -300,10 +300,8 @@ export enum Name {
REWARDS_CLAIM_ALL_REQUEST = 'Rewards Claim All: Request',
REWARDS_CLAIM_ALL_SUCCESS = 'Rewards Claim All: Success',
REWARDS_CLAIM_ALL_FAILURE = 'Rewards Claim All: Failure',
REWARDS_CLAIM_ALL_BLOCKED = 'Rewards Claim All: Blocked',
REWARDS_CLAIM_REQUEST = 'Rewards Claim: Request',
REWARDS_CLAIM_SUCCESS = 'Rewards Claim: Success',
REWARDS_CLAIM_BLOCKED = 'Rewards Claim: Blocked',

// Buy USDC
BUY_USDC_ON_RAMP_OPENED = 'Buy USDC: On Ramp Opened',
Expand DownExpand Up@@ -1493,14 +1491,6 @@ type RewardsClaimSuccess = {
amount: number
}

type RewardsClaimBlocked = {
eventName: Name.REWARDS_CLAIM_BLOCKED
challengeId: string
specifier: string
amount: number
code: number
}

type RewardsClaimAllRequest = {
eventName: Name.REWARDS_CLAIM_ALL_REQUEST
count: number
Expand All@@ -1513,11 +1503,6 @@ type RewardsClaimAllFailure = {
eventName: Name.REWARDS_CLAIM_ALL_FAILURE
count: number
}
type RewardsClaimAllBlocked = {
eventName: Name.REWARDS_CLAIM_ALL_BLOCKED
count: number
code: number
}

type AudiusOauthStart = {
eventName: Name.AUDIUS_OAUTH_START
Expand DownExpand Up@@ -2749,11 +2734,9 @@ export type AllTrackingEvents =
| RewardsClaimDetailsOpened
| RewardsClaimRequest
| RewardsClaimSuccess
| RewardsClaimBlocked
| RewardsClaimAllRequest
| RewardsClaimAllSuccess
| RewardsClaimAllFailure
| RewardsClaimAllBlocked
| FolderOpenEdit
| FolderSubmitEdit
| FolderDelete
Expand Down
9 changes: 0 additions & 9 deletions packages/common/src/store/pages/audio-rewards/selectors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@ import { createSelector } from 'reselect'
import { ChallengeRewardID, UserChallenge } from '../../../models/AudioRewards'
import { CommonState } from '../../commonStore'

import { ClaimStatus } from './types'

export const getTrendingRewardsModalType = (state: CommonState) => {
const type = state.pages.audioRewards.trendingRewardsModalType as string
// 'playlists' is deprecated; treat as 'tracks'
Expand DownExpand Up@@ -65,10 +63,3 @@ export const getHCaptchaStatus = (state: CommonState) =>
export const getShowRewardClaimedToast = (state: CommonState) =>
state.pages.audioRewards.showRewardClaimedToast

export const getAAOErrorCode = (state: CommonState) => {
const claimState = state.pages.audioRewards.claimState
if (claimState.status !== ClaimStatus.ERROR) {
return undefined
}
return claimState.aaoErrorCode
}
13 changes: 2 additions & 11 deletions packages/common/src/store/pages/audio-rewards/slice.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -237,17 +237,8 @@ const slice = createSlice({
state.claimState = { status: ClaimStatus.WAITING_FOR_RETRY }
state.claimToRetry = action.payload
},
claimChallengeRewardFailed: (
state,
action: PayloadAction<
| {
aaoErrorCode: number
}
| undefined
>
) => {
const aaoErrorCode = action.payload?.aaoErrorCode
state.claimState = { status: ClaimStatus.ERROR, aaoErrorCode }
claimChallengeRewardFailed: (state) => {
state.claimState = { status: ClaimStatus.ERROR }
},
claimChallengeRewardAlreadyClaimed: (state) => {
state.claimState = { status: ClaimStatus.ALREADY_CLAIMED }
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/store/pages/audio-rewards/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ export type ClaimState =
| { status: ClaimStatus.ALREADY_CLAIMED }
| { status: ClaimStatus.SUCCESS }
| { status: ClaimStatus.CUMULATIVE_SUCCESS }
| { status: ClaimStatus.ERROR; aaoErrorCode: number | undefined }
| { status: ClaimStatus.ERROR }

export type AudioRewardsClaim = {
challengeId: ChallengeRewardID
Expand Down
9 changes: 0 additions & 9 deletions packages/common/src/utils/aaoErrorCodes.test.ts

This file was deleted.

29 changes: 0 additions & 29 deletions packages/common/src/utils/aaoErrorCodes.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/common/src/utils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ export * from './timingUtils'
export * from './typeUtils'
export * from './urlUtils'
export * from './uid'
export * from './aaoErrorCodes'
export * from './wallet'
export * from './sagaHelpers'
export * from './fileUtil'
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,6 @@ type AudioMatchingChallengeName =
| ChallengeName.AudioMatchingSell

export const AudioMatchingChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -150,7 +149,7 @@ export const AudioMatchingChallengeContent = ({
additionalContent={additionalContent}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import type { Challenge } from './types'

const {
getClaimStatus,
getAAOErrorCode,
getUndisbursedUserChallenges,
getChallengeRewardsModalType
} = audioRewardsPageSelectors
Expand DownExpand Up@@ -51,7 +50,6 @@ export const ChallengeRewardsDrawer = () => {
)
const undisbursedUserChallenges = useSelector(getUndisbursedUserChallenges)
const claimStatus = useSelector(getClaimStatus)
const aaoErrorCode = useSelector(getAAOErrorCode)
const { toast } = useToast()

const handleClose = useCallback(() => {
Expand DownExpand Up@@ -119,7 +117,6 @@ export const ChallengeRewardsDrawer = () => {
challenge={challenge}
challengeName={challengeName}
claimStatus={claimStatus}
aaoErrorCode={aaoErrorCode}
onClaim={() => onClaim(challenge)}
onClose={handleClose}
/>
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
import { getAAOErrorEmojis } from '@audius/common/utils'

import { Text } from '@audius/harmony-native'

const messages = {
claimErrorMessage:
'Something went wrong while claiming your rewards. Please try again and contact support@audius.co.',
claimErrorMessageAAO:
'Your account is unable to claim rewards at this time. Please try again later or contact support@audius.co. '
'Something went wrong while claiming your rewards. Please try again and contact support@audius.co.'
}

/** Renders a generic error message for failed challenge claims */
export const ClaimError = ({ aaoErrorCode }: { aaoErrorCode?: number }) => {
return aaoErrorCode === undefined ? (
export const ClaimError = () => {
return (
<Text size='s' color='danger'>
{messages.claimErrorMessage}
</Text>
) : (
<Text size='s' color='danger'>
{messages.claimErrorMessageAAO}
{getAAOErrorEmojis(aaoErrorCode)}
</Text>
)
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const CosignChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -130,7 +129,7 @@ export const CosignChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ export const DefaultChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose,
children
Expand DownExpand Up@@ -110,7 +109,7 @@ export const DefaultChallengeContent = ({
statusLabel={statusLabel}
actions={children ?? actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!challenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const FirstWeeklyCommentChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -134,7 +133,7 @@ export const FirstWeeklyCommentChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,6 @@ const messages = {
}

export const ListenStreakEndlessChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -124,7 +123,7 @@ export const ListenStreakEndlessChallengeContent = ({
statusLabel={statusLabel}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const PinnedCommentChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -132,7 +131,7 @@ export const PinnedCommentChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!challenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ const messages = {
}

export const PlayCountMilestoneContent = (props: ChallengeContentProps) => {
const { challengeName, onClose, onClaim, claimStatus, aaoErrorCode } = props
const { challengeName, onClose, onClaim, claimStatus } = props
const { data: currentAccount } = useCurrentAccount()
const { data: currentUser } = useCurrentAccountUser()
const userChallenges = useSelector((state: CommonState) =>
Expand DownExpand Up@@ -141,7 +141,7 @@ export const PlayCountMilestoneContent = (props: ChallengeContentProps) => {
actions={actions}
additionalContent={additionalContent}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!optimisticChallenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,6 @@ export const ProfileCompletionChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose
}: ChallengeContentProps) => {
Expand DownExpand Up@@ -216,7 +215,7 @@ export const ProfileCompletionChallengeContent = ({
additionalContent={completionChecks}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ export const ReferralChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose
}: ChallengeContentProps) => {
Expand DownExpand Up@@ -119,7 +118,7 @@ export const ReferralChallengeContent = ({
additionalContent={referralContent}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const RemixContestWinnerChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -129,7 +128,7 @@ export const RemixContestWinnerChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ const messages = {
}

export const TastemakerChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -120,7 +119,7 @@ export const TastemakerChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={Boolean(challenge?.cooldown_days)}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,6 @@ export type ChallengeContentProps = {
challengeName: ChallengeName
/** The current claim status */
claimStatus: ClaimStatus
/** Error code from AAO */
aaoErrorCode?: number
/** Callback for claiming rewards */
onClaim?: () => void
/** Callback for closing the drawer */
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions packages/common/src/models/Analytics.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -300,10 +300,8 @@ export enum Name {
REWARDS_CLAIM_ALL_REQUEST = 'Rewards Claim All: Request',
REWARDS_CLAIM_ALL_SUCCESS = 'Rewards Claim All: Success',
REWARDS_CLAIM_ALL_FAILURE = 'Rewards Claim All: Failure',
REWARDS_CLAIM_ALL_BLOCKED = 'Rewards Claim All: Blocked',
REWARDS_CLAIM_REQUEST = 'Rewards Claim: Request',
REWARDS_CLAIM_SUCCESS = 'Rewards Claim: Success',
REWARDS_CLAIM_BLOCKED = 'Rewards Claim: Blocked',

// Buy USDC
BUY_USDC_ON_RAMP_OPENED = 'Buy USDC: On Ramp Opened',
Expand DownExpand Up@@ -1493,14 +1491,6 @@ type RewardsClaimSuccess = {
amount: number
}

type RewardsClaimBlocked = {
eventName: Name.REWARDS_CLAIM_BLOCKED
challengeId: string
specifier: string
amount: number
code: number
}

type RewardsClaimAllRequest = {
eventName: Name.REWARDS_CLAIM_ALL_REQUEST
count: number
Expand All@@ -1513,11 +1503,6 @@ type RewardsClaimAllFailure = {
eventName: Name.REWARDS_CLAIM_ALL_FAILURE
count: number
}
type RewardsClaimAllBlocked = {
eventName: Name.REWARDS_CLAIM_ALL_BLOCKED
count: number
code: number
}

type AudiusOauthStart = {
eventName: Name.AUDIUS_OAUTH_START
Expand DownExpand Up@@ -2749,11 +2734,9 @@ export type AllTrackingEvents =
| RewardsClaimDetailsOpened
| RewardsClaimRequest
| RewardsClaimSuccess
| RewardsClaimBlocked
| RewardsClaimAllRequest
| RewardsClaimAllSuccess
| RewardsClaimAllFailure
| RewardsClaimAllBlocked
| FolderOpenEdit
| FolderSubmitEdit
| FolderDelete
Expand Down
9 changes: 0 additions & 9 deletions packages/common/src/store/pages/audio-rewards/selectors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@ import { createSelector } from 'reselect'
import { ChallengeRewardID, UserChallenge } from '../../../models/AudioRewards'
import { CommonState } from '../../commonStore'

import { ClaimStatus } from './types'

export const getTrendingRewardsModalType = (state: CommonState) => {
const type = state.pages.audioRewards.trendingRewardsModalType as string
// 'playlists' is deprecated; treat as 'tracks'
Expand DownExpand Up@@ -65,10 +63,3 @@ export const getHCaptchaStatus = (state: CommonState) =>
export const getShowRewardClaimedToast = (state: CommonState) =>
state.pages.audioRewards.showRewardClaimedToast

export const getAAOErrorCode = (state: CommonState) => {
const claimState = state.pages.audioRewards.claimState
if (claimState.status !== ClaimStatus.ERROR) {
return undefined
}
return claimState.aaoErrorCode
}
13 changes: 2 additions & 11 deletions packages/common/src/store/pages/audio-rewards/slice.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -237,17 +237,8 @@ const slice = createSlice({
state.claimState = { status: ClaimStatus.WAITING_FOR_RETRY }
state.claimToRetry = action.payload
},
claimChallengeRewardFailed: (
state,
action: PayloadAction<
| {
aaoErrorCode: number
}
| undefined
>
) => {
const aaoErrorCode = action.payload?.aaoErrorCode
state.claimState = { status: ClaimStatus.ERROR, aaoErrorCode }
claimChallengeRewardFailed: (state) => {
state.claimState = { status: ClaimStatus.ERROR }
},
claimChallengeRewardAlreadyClaimed: (state) => {
state.claimState = { status: ClaimStatus.ALREADY_CLAIMED }
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/store/pages/audio-rewards/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ export type ClaimState =
| { status: ClaimStatus.ALREADY_CLAIMED }
| { status: ClaimStatus.SUCCESS }
| { status: ClaimStatus.CUMULATIVE_SUCCESS }
| { status: ClaimStatus.ERROR; aaoErrorCode: number | undefined }
| { status: ClaimStatus.ERROR }

export type AudioRewardsClaim = {
challengeId: ChallengeRewardID
Expand Down
9 changes: 0 additions & 9 deletions packages/common/src/utils/aaoErrorCodes.test.ts

This file was deleted.

29 changes: 0 additions & 29 deletions packages/common/src/utils/aaoErrorCodes.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/common/src/utils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ export * from './timingUtils'
export * from './typeUtils'
export * from './urlUtils'
export * from './uid'
export * from './aaoErrorCodes'
export * from './wallet'
export * from './sagaHelpers'
export * from './fileUtil'
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,6 @@ type AudioMatchingChallengeName =
| ChallengeName.AudioMatchingSell

export const AudioMatchingChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -150,7 +149,7 @@ export const AudioMatchingChallengeContent = ({
additionalContent={additionalContent}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import type { Challenge } from './types'

const {
getClaimStatus,
getAAOErrorCode,
getUndisbursedUserChallenges,
getChallengeRewardsModalType
} = audioRewardsPageSelectors
Expand DownExpand Up@@ -51,7 +50,6 @@ export const ChallengeRewardsDrawer = () => {
)
const undisbursedUserChallenges = useSelector(getUndisbursedUserChallenges)
const claimStatus = useSelector(getClaimStatus)
const aaoErrorCode = useSelector(getAAOErrorCode)
const { toast } = useToast()

const handleClose = useCallback(() => {
Expand DownExpand Up@@ -119,7 +117,6 @@ export const ChallengeRewardsDrawer = () => {
challenge={challenge}
challengeName={challengeName}
claimStatus={claimStatus}
aaoErrorCode={aaoErrorCode}
onClaim={() => onClaim(challenge)}
onClose={handleClose}
/>
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
import { getAAOErrorEmojis } from '@audius/common/utils'

import { Text } from '@audius/harmony-native'

const messages = {
claimErrorMessage:
'Something went wrong while claiming your rewards. Please try again and contact support@audius.co.',
claimErrorMessageAAO:
'Your account is unable to claim rewards at this time. Please try again later or contact support@audius.co. '
'Something went wrong while claiming your rewards. Please try again and contact support@audius.co.'
}

/** Renders a generic error message for failed challenge claims */
export const ClaimError = ({ aaoErrorCode }: { aaoErrorCode?: number }) => {
return aaoErrorCode === undefined ? (
export const ClaimError = () => {
return (
<Text size='s' color='danger'>
{messages.claimErrorMessage}
</Text>
) : (
<Text size='s' color='danger'>
{messages.claimErrorMessageAAO}
{getAAOErrorEmojis(aaoErrorCode)}
</Text>
)
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const CosignChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -130,7 +129,7 @@ export const CosignChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ export const DefaultChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose,
children
Expand DownExpand Up@@ -110,7 +109,7 @@ export const DefaultChallengeContent = ({
statusLabel={statusLabel}
actions={children ?? actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!challenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const FirstWeeklyCommentChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -134,7 +133,7 @@ export const FirstWeeklyCommentChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,6 @@ const messages = {
}

export const ListenStreakEndlessChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -124,7 +123,7 @@ export const ListenStreakEndlessChallengeContent = ({
statusLabel={statusLabel}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const PinnedCommentChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -132,7 +131,7 @@ export const PinnedCommentChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!challenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ const messages = {
}

export const PlayCountMilestoneContent = (props: ChallengeContentProps) => {
const { challengeName, onClose, onClaim, claimStatus, aaoErrorCode } = props
const { challengeName, onClose, onClaim, claimStatus } = props
const { data: currentAccount } = useCurrentAccount()
const { data: currentUser } = useCurrentAccountUser()
const userChallenges = useSelector((state: CommonState) =>
Expand DownExpand Up@@ -141,7 +141,7 @@ export const PlayCountMilestoneContent = (props: ChallengeContentProps) => {
actions={actions}
additionalContent={additionalContent}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!optimisticChallenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,6 @@ export const ProfileCompletionChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose
}: ChallengeContentProps) => {
Expand DownExpand Up@@ -216,7 +215,7 @@ export const ProfileCompletionChallengeContent = ({
additionalContent={completionChecks}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ export const ReferralChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose
}: ChallengeContentProps) => {
Expand DownExpand Up@@ -119,7 +118,7 @@ export const ReferralChallengeContent = ({
additionalContent={referralContent}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const RemixContestWinnerChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -129,7 +128,7 @@ export const RemixContestWinnerChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ const messages = {
}

export const TastemakerChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -120,7 +119,7 @@ export const TastemakerChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={Boolean(challenge?.cooldown_days)}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,6 @@ export type ChallengeContentProps = {
challengeName: ChallengeName
/** The current claim status */
claimStatus: ClaimStatus
/** Error code from AAO */
aaoErrorCode?: number
/** Callback for claiming rewards */
onClaim?: () => void
/** Callback for closing the drawer */
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions packages/common/src/models/Analytics.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -300,10 +300,8 @@ export enum Name {
REWARDS_CLAIM_ALL_REQUEST = 'Rewards Claim All: Request',
REWARDS_CLAIM_ALL_SUCCESS = 'Rewards Claim All: Success',
REWARDS_CLAIM_ALL_FAILURE = 'Rewards Claim All: Failure',
REWARDS_CLAIM_ALL_BLOCKED = 'Rewards Claim All: Blocked',
REWARDS_CLAIM_REQUEST = 'Rewards Claim: Request',
REWARDS_CLAIM_SUCCESS = 'Rewards Claim: Success',
REWARDS_CLAIM_BLOCKED = 'Rewards Claim: Blocked',

// Buy USDC
BUY_USDC_ON_RAMP_OPENED = 'Buy USDC: On Ramp Opened',
Expand DownExpand Up@@ -1493,14 +1491,6 @@ type RewardsClaimSuccess = {
amount: number
}

type RewardsClaimBlocked = {
eventName: Name.REWARDS_CLAIM_BLOCKED
challengeId: string
specifier: string
amount: number
code: number
}

type RewardsClaimAllRequest = {
eventName: Name.REWARDS_CLAIM_ALL_REQUEST
count: number
Expand All@@ -1513,11 +1503,6 @@ type RewardsClaimAllFailure = {
eventName: Name.REWARDS_CLAIM_ALL_FAILURE
count: number
}
type RewardsClaimAllBlocked = {
eventName: Name.REWARDS_CLAIM_ALL_BLOCKED
count: number
code: number
}

type AudiusOauthStart = {
eventName: Name.AUDIUS_OAUTH_START
Expand DownExpand Up@@ -2749,11 +2734,9 @@ export type AllTrackingEvents =
| RewardsClaimDetailsOpened
| RewardsClaimRequest
| RewardsClaimSuccess
| RewardsClaimBlocked
| RewardsClaimAllRequest
| RewardsClaimAllSuccess
| RewardsClaimAllFailure
| RewardsClaimAllBlocked
| FolderOpenEdit
| FolderSubmitEdit
| FolderDelete
Expand Down
9 changes: 0 additions & 9 deletions packages/common/src/store/pages/audio-rewards/selectors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@ import { createSelector } from 'reselect'
import { ChallengeRewardID, UserChallenge } from '../../../models/AudioRewards'
import { CommonState } from '../../commonStore'

import { ClaimStatus } from './types'

export const getTrendingRewardsModalType = (state: CommonState) => {
const type = state.pages.audioRewards.trendingRewardsModalType as string
// 'playlists' is deprecated; treat as 'tracks'
Expand DownExpand Up@@ -65,10 +63,3 @@ export const getHCaptchaStatus = (state: CommonState) =>
export const getShowRewardClaimedToast = (state: CommonState) =>
state.pages.audioRewards.showRewardClaimedToast

export const getAAOErrorCode = (state: CommonState) => {
const claimState = state.pages.audioRewards.claimState
if (claimState.status !== ClaimStatus.ERROR) {
return undefined
}
return claimState.aaoErrorCode
}
13 changes: 2 additions & 11 deletions packages/common/src/store/pages/audio-rewards/slice.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -237,17 +237,8 @@ const slice = createSlice({
state.claimState = { status: ClaimStatus.WAITING_FOR_RETRY }
state.claimToRetry = action.payload
},
claimChallengeRewardFailed: (
state,
action: PayloadAction<
| {
aaoErrorCode: number
}
| undefined
>
) => {
const aaoErrorCode = action.payload?.aaoErrorCode
state.claimState = { status: ClaimStatus.ERROR, aaoErrorCode }
claimChallengeRewardFailed: (state) => {
state.claimState = { status: ClaimStatus.ERROR }
},
claimChallengeRewardAlreadyClaimed: (state) => {
state.claimState = { status: ClaimStatus.ALREADY_CLAIMED }
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/store/pages/audio-rewards/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ export type ClaimState =
| { status: ClaimStatus.ALREADY_CLAIMED }
| { status: ClaimStatus.SUCCESS }
| { status: ClaimStatus.CUMULATIVE_SUCCESS }
| { status: ClaimStatus.ERROR; aaoErrorCode: number | undefined }
| { status: ClaimStatus.ERROR }

export type AudioRewardsClaim = {
challengeId: ChallengeRewardID
Expand Down
9 changes: 0 additions & 9 deletions packages/common/src/utils/aaoErrorCodes.test.ts

This file was deleted.

29 changes: 0 additions & 29 deletions packages/common/src/utils/aaoErrorCodes.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/common/src/utils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ export * from './timingUtils'
export * from './typeUtils'
export * from './urlUtils'
export * from './uid'
export * from './aaoErrorCodes'
export * from './wallet'
export * from './sagaHelpers'
export * from './fileUtil'
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,6 @@ type AudioMatchingChallengeName =
| ChallengeName.AudioMatchingSell

export const AudioMatchingChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -150,7 +149,7 @@ export const AudioMatchingChallengeContent = ({
additionalContent={additionalContent}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import type { Challenge } from './types'

const {
getClaimStatus,
getAAOErrorCode,
getUndisbursedUserChallenges,
getChallengeRewardsModalType
} = audioRewardsPageSelectors
Expand DownExpand Up@@ -51,7 +50,6 @@ export const ChallengeRewardsDrawer = () => {
)
const undisbursedUserChallenges = useSelector(getUndisbursedUserChallenges)
const claimStatus = useSelector(getClaimStatus)
const aaoErrorCode = useSelector(getAAOErrorCode)
const { toast } = useToast()

const handleClose = useCallback(() => {
Expand DownExpand Up@@ -119,7 +117,6 @@ export const ChallengeRewardsDrawer = () => {
challenge={challenge}
challengeName={challengeName}
claimStatus={claimStatus}
aaoErrorCode={aaoErrorCode}
onClaim={() => onClaim(challenge)}
onClose={handleClose}
/>
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
import { getAAOErrorEmojis } from '@audius/common/utils'

import { Text } from '@audius/harmony-native'

const messages = {
claimErrorMessage:
'Something went wrong while claiming your rewards. Please try again and contact support@audius.co.',
claimErrorMessageAAO:
'Your account is unable to claim rewards at this time. Please try again later or contact support@audius.co. '
'Something went wrong while claiming your rewards. Please try again and contact support@audius.co.'
}

/** Renders a generic error message for failed challenge claims */
export const ClaimError = ({ aaoErrorCode }: { aaoErrorCode?: number }) => {
return aaoErrorCode === undefined ? (
export const ClaimError = () => {
return (
<Text size='s' color='danger'>
{messages.claimErrorMessage}
</Text>
) : (
<Text size='s' color='danger'>
{messages.claimErrorMessageAAO}
{getAAOErrorEmojis(aaoErrorCode)}
</Text>
)
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const CosignChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -130,7 +129,7 @@ export const CosignChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ export const DefaultChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose,
children
Expand DownExpand Up@@ -110,7 +109,7 @@ export const DefaultChallengeContent = ({
statusLabel={statusLabel}
actions={children ?? actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!challenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const FirstWeeklyCommentChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -134,7 +133,7 @@ export const FirstWeeklyCommentChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,6 @@ const messages = {
}

export const ListenStreakEndlessChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -124,7 +123,7 @@ export const ListenStreakEndlessChallengeContent = ({
statusLabel={statusLabel}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const PinnedCommentChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -132,7 +131,7 @@ export const PinnedCommentChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!challenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ const messages = {
}

export const PlayCountMilestoneContent = (props: ChallengeContentProps) => {
const { challengeName, onClose, onClaim, claimStatus, aaoErrorCode } = props
const { challengeName, onClose, onClaim, claimStatus } = props
const { data: currentAccount } = useCurrentAccount()
const { data: currentUser } = useCurrentAccountUser()
const userChallenges = useSelector((state: CommonState) =>
Expand DownExpand Up@@ -141,7 +141,7 @@ export const PlayCountMilestoneContent = (props: ChallengeContentProps) => {
actions={actions}
additionalContent={additionalContent}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={!!optimisticChallenge?.cooldown_days}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,6 @@ export const ProfileCompletionChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose
}: ChallengeContentProps) => {
Expand DownExpand Up@@ -216,7 +215,7 @@ export const ProfileCompletionChallengeContent = ({
additionalContent={completionChecks}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ export const ReferralChallengeContent = ({
challenge,
challengeName,
claimStatus,
aaoErrorCode,
onClaim,
onClose
}: ChallengeContentProps) => {
Expand DownExpand Up@@ -119,7 +118,7 @@ export const ReferralChallengeContent = ({
additionalContent={referralContent}
actions={actions}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={false}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ const messages = {
}

export const RemixContestWinnerChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -129,7 +128,7 @@ export const RemixContestWinnerChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ const messages = {
}

export const TastemakerChallengeContent = ({
aaoErrorCode,
challenge,
challengeName,
claimStatus,
Expand DownExpand Up@@ -120,7 +119,7 @@ export const TastemakerChallengeContent = ({
) : null
}
errorContent={
claimError ? <ClaimError aaoErrorCode={aaoErrorCode} /> : null
claimError ? <ClaimError /> : null
}
isCooldownChallenge={Boolean(challenge?.cooldown_days)}
/>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,6 @@ export type ChallengeContentProps = {
challengeName: ChallengeName
/** The current claim status */
claimStatus: ClaimStatus
/** Error code from AAO */
aaoErrorCode?: number
/** Callback for claiming rewards */
onClaim?: () => void
/** Callback for closing the drawer */
Expand Down
Loading
Loading