revert(contests): remove event permalink additions, keep track permalink pattern

packages/common/src/api/index.ts

@@ -145,6 +145,7 @@ export * from './tan-query/users/useOtherChatUsers'
 // Account
 export * from './tan-query/users/account/useResetPassword'
 export * from './tan-query/users/account/useResendRecoveryEmail'
+export * from './tan-query/users/account/useCurrentUserEmail'
 
 // Playlist updates
 export * from './tan-query/playlist-updates/usePlaylistUpdates'

packages/common/src/api/tan-query/queryKeys.ts

@@ -46,6 +46,7 @@ export const QUERY_KEYS = {
   salesCount: 'salesCount',
   mutualFollowers: 'mutualFollowers',
   emailInUse: 'emailInUse',
+  currentUserEmail: 'currentUserEmail',
   handleInUse: 'handleInUse',
   handleReservedStatus: 'handleReservedStatus',
   search: 'search',

packages/common/src/api/tan-query/users/account/useCurrentUserEmail.ts

@@ -0,0 +1,28 @@
+import { useQuery } from '@tanstack/react-query'
+
+import { UserEmailResponse } from '~/services/auth/identity'
+
+import { QUERY_KEYS } from '../../queryKeys'
+import { QueryKey, QueryOptions } from '../../types'
+import { useQueryContext } from '../../utils'
+
+import { useCurrentUserId } from './useCurrentUserId'
+
+export const getCurrentUserEmailQueryKey = () =>
+  [QUERY_KEYS.currentUserEmail] as unknown as QueryKey<UserEmailResponse>
+
+/**
+ * Hook to get the currently logged in user's email address and email
+ * verification status from identity service.
+ */
+export const useCurrentUserEmail = (options?: QueryOptions) => {
+  const { identityService } = useQueryContext()
+  const { data: currentUserId } = useCurrentUserId()
+
+  return useQuery({
+    queryKey: getCurrentUserEmailQueryKey(),
+    queryFn: () => identityService.getUserEmailAndStatus(),
+    ...options,
+    enabled: options?.enabled !== false && !!currentUserId
+  })
+}

packages/common/src/hooks/useShareContent.ts

@@ -30,14 +30,6 @@ export const useShareContent = (
 
   if (request.type === 'track' || request.type === 'contest') {
     if (!track || !trackArtist) return null
-    if (request.type === 'contest') {
-      return {
-        type: 'contest',
-        track,
-        artist: trackArtist,
-        ...(request.eventPermalink ? { eventPermalink: request.eventPermalink } : {})
-      }
-    }
     return { type: request.type, track, artist: trackArtist }
   }
 

packages/common/src/messages/settings.ts

@@ -69,6 +69,8 @@ export const settingsMessages = {
   emailVerificationAlreadyVerified: 'Your email is already verified.',
   emailVerificationNotSent:
     'Unable to send verification email. Please try again!',
+  emailVerifiedStatus: 'Email verified',
+  emailNotVerifiedStatus: 'Email not verified',
   changeEmailButtonText: 'Change Email',
   changePasswordButtonText: 'Change Password',
   desktopAppButtonText: 'Get The App',

packages/common/src/models/Event.ts

@@ -1,6 +1,8 @@
 import { Event as EventSDK } from '@audius/sdk'
 import type { OverrideProperties } from 'type-fest'
+
 import { Nullable } from '../utils/typeUtils'
+
 import { ID } from './Identifiers'
 
 export type Event = OverrideProperties<
@@ -9,10 +11,5 @@ export type Event = OverrideProperties<
     eventId: ID
     userId: ID
     entityId: Nullable<ID>
-    /** Canonical contest permalink (e.g. /{handle}/contest-title).
-     *  Set once the API returns a permalink field from event_routes.
-     *  Optional - consumers fall back to deriving the URL from the
-     *  associated track's permalink when this is absent. */
-    permalink?: string
   }
 >

packages/common/src/services/auth/identity.ts

@@ -30,6 +30,11 @@ type ResendEmailVerificationResponse = {
   alreadyVerified?: boolean
 }
 
+export type UserEmailResponse = {
+  email: string | undefined | null
+  isEmailVerified: boolean
+}
+
 enum TransactionMetadataType {
   PURCHASE_SOL_AUDIO_SWAP = 'PURCHASE_SOL_AUDIO_SWAP'
 }
@@ -220,16 +225,24 @@ export class IdentityService {
   }
 
   /**
-   * Get the user's email used for notifications and display.
+   * Get the user's email and verification status used for notifications and
+   * display.
    */
-  async getUserEmail() {
+  async getUserEmailAndStatus() {
     const headers = await this.getAuthHeaders()
 
-    const res = await this._makeRequest<{ email: string | undefined | null }>({
+    return await this._makeRequest<UserEmailResponse>({
       url: '/user/email',
       method: 'get',
       headers
     })
+  }
+
+  /**
+   * Get the user's email used for notifications and display.
+   */
+  async getUserEmail() {
+    const res = await this.getUserEmailAndStatus()
 
     if (!res.email) {
       throw new Error('No email found')

packages/common/src/store/social/tracks/actions.ts

@@ -129,9 +129,5 @@ export const shareTrack = createCustomAction(
  */
 export const shareContest = createCustomAction(
   SHARE_CONTEST,
-  (trackId: ID, source: ShareSource, eventPermalink?: string) => ({
-    trackId,
-    source,
-    eventPermalink
-  })
+  (trackId: ID, source: ShareSource) => ({ trackId, source })
 )

packages/common/src/store/ui/share-modal/types.ts

@@ -16,15 +16,11 @@ type ShareTrackContent = {
  * Contest shares use the same underlying data as a track share (the
  * contest is keyed off a parent track) but link to the contest page
  * (`{trackPermalink}/contest`) instead of the track itself.
- * When the event has its own permalink from event_routes, that value is
- * passed as `eventPermalink` and used directly.
  */
 type ShareContestContent = {
   type: 'contest'
   track: Track
   artist: User
-  /** Canonical contest permalink from event_routes, if available. */
-  eventPermalink?: string
 }
 
 type ShareProfileContent = {
@@ -59,7 +55,7 @@ export type ShareContent =
 
 export type ShareModalRequest =
   | { type: 'track'; trackId: ID }
-  | { type: 'contest'; trackId: ID; eventPermalink?: string }
+  | { type: 'contest'; trackId: ID }
   | { type: 'profile'; profileId: ID }
   | { type: 'collection'; collectionId: ID }
 

packages/identity-service/src/routes/user.js

@@ -198,7 +198,8 @@ module.exports = function (app) {
       })
 
       return successResponse({
-        email: userData.email
+        email: userData.email,
+        isEmailVerified: userData.isEmailVerified
       })
     })
   )

packages/mobile/src/components/share-drawer/utils.ts

@@ -17,14 +17,11 @@ export const getContentUrl = (content: ShareContent) => {
       return getTrackRoute(track, true)
     }
     case 'contest': {
-      // Contest shares point at the contest page. When the event has its
-      // own permalink from event_routes, use it directly; otherwise derive
-      // from the parent track's permalink.
-      const { track, eventPermalink } = content
-      return getContestRoute(
-        { permalink: track.permalink, contestPermalink: eventPermalink },
-        true
-      )
+      // Contest shares point at the parent track's contest page —
+      // `{permalink}/contest` — so sharing copies the contest URL
+      // rather than the underlying track.
+      const { track } = content
+      return getContestRoute(track, true)
     }
     case 'profile': {
       const { profile } = content

packages/mobile/src/screens/contest-screen/ContestScreen.tsx

@@ -216,8 +216,7 @@ export const ContestScreen = () => {
       shareModalUIActions.requestOpen({
         type: 'contest',
         trackId,
-        source: ShareSource.PAGE,
-        ...(contest?.permalink ? { eventPermalink: contest.permalink } : {})
+        source: ShareSource.PAGE
       })
     )
   }, [dispatch, trackId, contest?.permalink])

packages/mobile/src/screens/settings-screen/AccountSettingsItem.tsx

@@ -2,7 +2,13 @@ import type { ComponentType } from 'react'
 
 import type { SvgProps } from 'react-native-svg'
 
-import { Button } from '@audius/harmony-native'
+import {
+  Button,
+  Flex,
+  IconError,
+  IconValidationCheck,
+  Text
+} from '@audius/harmony-native'
 import { makeStyles } from 'app/styles'
 
 import { SettingsRowLabel } from './SettingRowLabel'
@@ -16,33 +22,66 @@ type AccountSettingsItemProps = {
   buttonTitle: string
   onPress?: () => void
   disabled?: boolean
+  /** Optional verification status shown above the action button. */
+  isVerified?: boolean
+  verifiedText?: string
+  notVerifiedText?: string
+  /** Hide the action button (e.g. once the email is verified). */
+  hideButton?: boolean
 }
 
 const useStyles = makeStyles(({ spacing }) => ({
   button: {
     marginTop: spacing(2)
+  },
+  status: {
+    marginTop: spacing(2)
   }
 }))
 
 export const AccountSettingsItem = (props: AccountSettingsItemProps) => {
-  const { title, titleIcon, description, buttonTitle, onPress, disabled } =
-    props
+  const {
+    title,
+    titleIcon,
+    description,
+    buttonTitle,
+    onPress,
+    disabled,
+    isVerified,
+    verifiedText,
+    notVerifiedText,
+    hideButton
+  } = props
   const styles = useStyles()
 
   return (
     <SettingsRow>
       <SettingsRowLabel label={title} icon={titleIcon} />
       <SettingsRowDescription>{description}</SettingsRowDescription>
-      <Button
-        style={styles.button}
-        variant='secondary'
-        size='small'
-        fullWidth
-        onPress={onPress}
-        disabled={disabled}
-      >
-        {buttonTitle}
-      </Button>
+      {verifiedText && notVerifiedText ? (
+        <Flex row alignItems='center' gap='xs' style={styles.status}>
+          {isVerified ? (
+            <IconValidationCheck size='s' />
+          ) : (
+            <IconError size='s' color='subdued' />
+          )}
+          <Text variant='body' size='s' color='subdued'>
+            {isVerified ? verifiedText : notVerifiedText}
+          </Text>
+        </Flex>
+      ) : null}
+      {hideButton ? null : (
+        <Button
+          style={styles.button}
+          variant='secondary'
+          size='small'
+          fullWidth
+          onPress={onPress}
+          disabled={disabled}
+        >
+          {buttonTitle}
+        </Button>
+      )}
     </SettingsRow>
   )
 }

packages/mobile/src/screens/settings-screen/AccountSettingsScreen.tsx

@@ -2,6 +2,7 @@ import { useCallback, useState } from 'react'
 
 import {
   useCurrentAccountUser,
+  useCurrentUserEmail,
   useQueryContext,
   useResendRecoveryEmail
 } from '@audius/common/api'
@@ -52,6 +53,8 @@ const messages = {
   emailVerificationAlreadyVerified: 'Your email is already verified.',
   emailVerificationNotSent:
     'Unable to send verification email. Please try again!',
+  emailVerifiedStatus: 'Email verified',
+  emailNotVerifiedStatus: 'Email not verified',
   verifyTitle: 'Verification',
   verifyDescription:
     'Verify your Audius profile by completing identity verification.',
@@ -90,6 +93,8 @@ export const AccountSettingsScreen = () => {
   const { identityService } = useQueryContext()
   const [isSendingVerificationEmail, setIsSendingVerificationEmail] =
     useState(false)
+  const { data: emailData } = useCurrentUserEmail()
+  const isEmailVerified = emailData?.isEmailVerified
   const { data: accountData } = useCurrentAccountUser({
     select: (user) => pick(user, ['user_id', 'handle', 'name'])
   })
@@ -191,6 +196,10 @@ export const AccountSettingsScreen = () => {
             buttonTitle={messages.emailVerificationButtonTitle}
             onPress={handlePressEmailVerification}
             disabled={isSendingVerificationEmail}
+            isVerified={isEmailVerified}
+            verifiedText={messages.emailVerifiedStatus}
+            notVerifiedText={messages.emailNotVerifiedStatus}
+            hideButton={isEmailVerified}
           />
           <AccountSettingsItem
             title={messages.verifyTitle}

packages/mobile/src/utils/routes.tsx

@@ -16,16 +16,11 @@ export const getTrackRoute = (
 }
 
 export const getContestRoute = (
-  track: { permalink: string; contestPermalink?: string },
+  track: { permalink: string },
   fullUrl = false
 ) => {
-  // If the event has its own permalink from event_routes, use it directly.
-  if (track.contestPermalink) {
-    const route = track.contestPermalink
-    return fullUrl ? `${AUDIUS_URL}${route}` : route
-  }
-  // Fallback: derive contest URL from the track permalink.
-  // `/{handle}/{slug}` → `/{handle}/contest/{slug}`.
+  // Permalink shape: `/{handle}/{slug}` → contest URL is
+  // `/{handle}/contest/{slug}`. Mirror the web `contestPage` helper.
   const [, handle, ...rest] = track.permalink.split('/')
   const route = `/${handle}/contest/${rest.join('/')}`
   return fullUrl ? `${AUDIUS_URL}${route}` : route

packages/sdk/src/sdk/api/generated/default/models/Event.ts

@@ -79,12 +79,6 @@ export interface Event {
      * @memberof Event
      */
     eventData: object;
-    /**
-     * Canonical contest permalink derived from event_routes.
-     * @type {string}
-     * @memberof Event
-     */
-    permalink?: string;
 }
 
 
@@ -144,7 +138,6 @@ export function EventFromJSONTyped(json: any, ignoreDiscriminator: boolean): Eve
         'createdAt': json['created_at'],
         'updatedAt': json['updated_at'],
         'eventData': json['event_data'],
-        'permalink': !exists(json, 'permalink') ? undefined : json['permalink'],
     };
 }
 
@@ -167,7 +160,6 @@ export function EventToJSON(value?: Event | null): any {
         'created_at': value.createdAt,
         'updated_at': value.updatedAt,
         'event_data': value.eventData,
-        'permalink': value.permalink,
     };
 }