Deploy mobile

.changeset/young-dryers-grab.md

@@ -0,0 +1,5 @@
+---
+"@audius/sdk": patch
+---
+
+Add/update user should use CID for photo/cover art

.github/workflows/mobile.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - mobile-app-fix
     paths:
       - 'packages/mobile/**'
       - 'packages/common/**'
@@ -93,7 +94,7 @@ jobs:
     name: iOS Release Candidate Build & Upload
     runs-on: macos-15
     needs: mobile-init
-    if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
+    if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/mobile-app-fix') && github.event_name != 'pull_request'
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -261,7 +262,7 @@ jobs:
     name: Android Release Candidate Build & Upload
     runs-on: ubuntu-latest
     needs: mobile-init
-    if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
+    if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/mobile-app-fix') && github.event_name != 'pull_request'
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -471,7 +472,7 @@ jobs:
     name: iOS Production Build & Upload
     runs-on: macos-15
     needs: mobile-init
-    if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
+    if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/mobile-app-fix') && github.event_name != 'pull_request'
     environment:
       name: mobile-production-ios
       url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
@@ -632,7 +633,7 @@ jobs:
     name: Android Production Build & Upload
     runs-on: ubuntu-latest
     needs: mobile-init
-    if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
+    if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/mobile-app-fix') && github.event_name != 'pull_request'
     environment:
       name: mobile-production-android
       url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

packages/common/src/api/tan-query/users/useUnfollowUser.ts

@@ -9,7 +9,6 @@ import { Feature } from '~/models/ErrorReporting'
 import { ID } from '~/models/Identifiers'
 import { UserMetadata } from '~/models/User'
 import { removeFolloweeId } from '~/store/gated-content/slice'
-import { revokeFollowGatedAccess } from '~/store/tipping/slice'
 
 import { primeUserData } from '../utils/primeUserData'
 
@@ -49,9 +48,6 @@ export const useUnfollowUser = () => {
       // Handle gated content
       dispatch(removeFolloweeId({ id: followeeUserId }))
 
-      dispatch(revokeFollowGatedAccess({ userId: followeeUserId }))
-
-      // Track the unfollow
       if (source) {
         track(
           make({

packages/common/src/store/pages/trending/actions.ts

@@ -2,11 +2,8 @@ import { Genre } from '~/utils'
 
 import { TimeRange } from '../../../models'
 
-import type { TrendingCategory } from './types'
-
 export const SET_TRENDING_GENRE = 'TRENDING/SET_TRENDING_GENRE'
 export const SET_TRENDING_TIME_RANGE = 'TRENDING/SET_TRENDING_TIME_RANGE'
-export const SET_TRENDING_CATEGORY = 'TRENDING/SET_TRENDING_CATEGORY'
 export const SET_LAST_FETCHED_TRENDING_GENRE =
   'TRENDING/SET_LAST_FETCHED_TRENDING_GENRE'
 
@@ -20,11 +17,6 @@ export type SetTrendingTimeRangeAction = {
   timeRange: TimeRange
 }
 
-export type SetTrendingCategoryAction = {
-  type: typeof SET_TRENDING_CATEGORY
-  category: TrendingCategory
-}
-
 export type SetLastFetchedTrendingGenreAction = {
   type: typeof SET_LAST_FETCHED_TRENDING_GENRE
   genre: Genre | null
@@ -33,19 +25,13 @@ export type SetLastFetchedTrendingGenreAction = {
 export type TrendingPageAction =
   | SetTrendingGenreAction
   | SetTrendingTimeRangeAction
-  | SetTrendingCategoryAction
   | SetLastFetchedTrendingGenreAction
 
 export const setTrendingGenre = (genre: Genre | null) => ({
   type: SET_TRENDING_GENRE,
   genre
 })
 
-export const setTrendingCategory = (category: TrendingCategory) => ({
-  type: SET_TRENDING_CATEGORY,
-  category
-})
-
 export const setTrendingTimeRange = (timeRange: TimeRange) => ({
   type: SET_TRENDING_TIME_RANGE,
   timeRange

packages/common/src/store/pages/trending/reducer.ts

@@ -4,11 +4,9 @@ import { LineupActions, asLineup } from '~/store/lineup/reducer'
 import {
   SET_TRENDING_GENRE,
   SET_TRENDING_TIME_RANGE,
-  SET_TRENDING_CATEGORY,
   SET_LAST_FETCHED_TRENDING_GENRE,
   SetTrendingGenreAction,
   SetTrendingTimeRangeAction,
-  SetTrendingCategoryAction,
   SetLastFetchedTrendingGenreAction,
   TrendingPageAction
 } from '~/store/pages/trending/actions'
@@ -39,15 +37,6 @@ const actionsMap = {
       trendingTimeRange: action.timeRange
     }
   },
-  [SET_TRENDING_CATEGORY](
-    state: TrendingPageState,
-    action: SetTrendingCategoryAction
-  ) {
-    return {
-      ...state,
-      trendingCategory: action.category
-    }
-  },
   [SET_TRENDING_GENRE](
     state: TrendingPageState,
     action: SetTrendingGenreAction
@@ -88,8 +77,7 @@ const reducer =
         trendingMonth: makeInitialState(TRENDING_MONTH_PREFIX),
         trendingAllTime: makeInitialState(TRENDING_ALL_TIME_PREFIX),
         trendingGenre: null,
-        trendingTimeRange: TimeRange.WEEK,
-        trendingCategory: 'tracks'
+        trendingTimeRange: TimeRange.WEEK
       }
 
       if (history) {
@@ -142,11 +130,6 @@ const reducer =
           state,
           action as SetTrendingTimeRangeAction
         )
-      case SET_TRENDING_CATEGORY:
-        return actionsMap[SET_TRENDING_CATEGORY](
-          state,
-          action as SetTrendingCategoryAction
-        )
       case SET_LAST_FETCHED_TRENDING_GENRE:
         return actionsMap[SET_LAST_FETCHED_TRENDING_GENRE](
           state,

packages/common/src/store/pages/trending/selectors.ts

@@ -31,8 +31,5 @@ export const getTrendingTimeRange = (state: CommonState) =>
 export const getTrendingGenre = (state: CommonState) =>
   state.pages.trending.trendingGenre
 
-export const getTrendingCategory = (state: CommonState) =>
-  state.pages.trending.trendingCategory
-
 export const getLastFetchedTrendingGenre = (state: CommonState) =>
   state.pages.trending.lastFetchedTrendingGenre

packages/common/src/store/pages/trending/types.ts

@@ -2,15 +2,11 @@ import { Genre } from '~/utils'
 
 import { LineupState, TimeRange, Track } from '../../../models'
 
-export type TrendingCategory = 'tracks' | 'underground'
-
 export type TrendingPageState = {
   trendingWeek: LineupState<Track>
   trendingMonth: LineupState<Track>
   trendingAllTime: LineupState<Track>
   trendingTimeRange: TimeRange
   trendingGenre: Genre | null
   lastFetchedTrendingGenre: Genre | null
-  /** Mobile: selected tab for trending (Tracks vs Underground). */
-  trendingCategory: TrendingCategory
 }

packages/common/src/store/ui/modals/parentSlice.ts

@@ -24,8 +24,6 @@ export const initialState: BasicModalsState = {
   FeedFilter: { isOpen: false },
   PurchaseVendor: { isOpen: false },
   TrendingGenreSelection: { isOpen: false },
-  TrendingCategory: { isOpen: false },
-  TrendingTimeRange: { isOpen: false },
   TrendingRewardsExplainer: { isOpen: false },
   SocialProof: { isOpen: false },
   EditFolder: { isOpen: false },

packages/common/src/store/ui/modals/types.ts

@@ -59,8 +59,6 @@ export type Modals =
   | 'FeedFilter'
   | 'PurchaseVendor'
   | 'TrendingGenreSelection'
-  | 'TrendingCategory'
-  | 'TrendingTimeRange'
   | 'TrendingRewardsExplainer'
   | 'SocialProof'
   | 'EditFolder'

packages/discovery-provider/integration_tests/queries/test_get_sitemap.py

@@ -72,7 +72,7 @@ def test_get_sitemaps(mock_get_base_url, app):
             default_sitemap = build_default()
             assert (
                 default_sitemap
-                == b'<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">\n  <url>\n    <loc>https://audius.co/legal/privacy-policy</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/legal/terms-of-use</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/download</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/feed</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/trending</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/upload</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/favorites</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/history</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/messages</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/dashboard</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore/playlists</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore/top-albums</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore/remixables</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore/feeling-lucky</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore/chill</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore/upbeat</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore/intense</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore/provoking</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore/intimate</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/signup</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/signin</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/audio</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/settings</loc>\n  </url>\n</urlset>\n'
+                == b'<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">\n  <url>\n    <loc>https://audius.co/legal/privacy-policy</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/legal/terms-of-use</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/download</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/feed</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/trending</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/upload</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/favorites</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/history</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/messages</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/dashboard</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore/playlists</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore/underground</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore/top-albums</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore/remixables</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore/feeling-lucky</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore/chill</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore/upbeat</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore/intense</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore/provoking</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/explore/intimate</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/signup</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/signin</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/audio</loc>\n  </url>\n  <url>\n    <loc>https://audius.co/settings</loc>\n  </url>\n</urlset>\n'
             )
 
             # Validate that there are 7 track sitemaps  - 10 total track / 3 user per sitemap = 4

packages/discovery-provider/src/queries/get_sitemap.py

@@ -63,6 +63,7 @@ def create_xml_url(route):
     "messages",
     "dashboard",
     "explore/playlists",
+    "explore/underground",
     "explore/top-albums",
     "explore/remixables",
     "explore/feeling-lucky",

packages/mobile/src/app/Drawers.tsx

@@ -54,11 +54,7 @@ import { PublishConfirmationDrawer } from 'app/screens/edit-track-screen/compone
 import { ConnectNewWalletDrawer } from 'app/screens/external-wallets/components/ConnectNewWalletDrawer'
 import { WelcomeDrawer } from 'app/screens/sign-on-screen/components/WelcomeDrawer'
 import { PickWinnersDrawer } from 'app/screens/track-screen/PickWinnersDrawer'
-import {
-  TrendingCategoryDrawer,
-  TrendingFilterDrawer,
-  TrendingTimeRangeDrawer
-} from 'app/screens/trending-screen'
+import { TrendingFilterDrawer } from 'app/screens/trending-screen'
 import { WalletRowOverflowMenu } from 'app/screens/wallet-screen/components/LinkedWallets'
 
 import { useDrawerState } from '../components/drawer'
@@ -117,8 +113,6 @@ const commonDrawersMap: { [Modal in Modals]?: ComponentType } = {
   DeactivateAccountConfirmation: DeactivateAccountConfirmationDrawer,
   FeedFilter: FeedFilterDrawer,
   TrendingGenreSelection: TrendingFilterDrawer,
-  TrendingCategory: TrendingCategoryDrawer,
-  TrendingTimeRange: TrendingTimeRangeDrawer,
   Overflow: OverflowMenuDrawer,
   SignOutConfirmation: SignOutConfirmationDrawer,
   AddToCollection: AddToCollectionDrawer,

packages/mobile/src/components/navigation-container/NavigationContainer.tsx

@@ -203,6 +203,7 @@ const NavigationContainer = (props: NavigationContainerProps) => {
                       screens: {
                         Explore: 'explore',
                         PremiumTracks: 'explore/premium-tracks',
+                        TrendingUnderground: 'explore/underground',
                         LetThemDJ: 'explore/let-them-dj',
                         TopAlbums: 'explore/top-albums',
                         UnderTheRadar: 'explore/under-the-radar',

packages/mobile/src/components/trending-rewards-drawer/TrendingRewardsDrawer.tsx

@@ -180,7 +180,7 @@ export const TrendingRewardsDrawer = (titleIcon) => {
         break
       }
       case 'underground': {
-        navigation.navigate('trending', { screen: 'Trending' })
+        navigation.navigate('explore', { screen: 'TrendingUnderground' })
         break
       }
     }

packages/mobile/src/screens/app-screen/ExploreTabScreen.tsx

@@ -1,6 +1,7 @@
 import type { SearchCategory, SearchFilters } from '@audius/common/api'
 
 import { SearchExploreScreen } from '../explore-screen/SearchExploreScreen'
+import { TrendingUndergroundScreen } from '../explore-screen/tabs/ForYouTab/TrendingUndergroundScreen'
 
 import type { AppTabScreenParamList } from './AppTabScreen'
 import { createAppTabScreenStack } from './createAppTabScreenStack'
@@ -12,13 +13,18 @@ export type ExploreTabScreenParamList = AppTabScreenParamList & {
     category?: SearchCategory
     filters?: SearchFilters
   }
+  TrendingUnderground: undefined
 }
 
 export const ExploreTabScreen =
   createAppTabScreenStack<ExploreTabScreenParamList>((Stack) => {
     return (
       <>
         <Stack.Screen name='SearchExplore' component={SearchExploreScreen} />
+        <Stack.Screen
+          name='TrendingUnderground'
+          component={TrendingUndergroundScreen}
+        />
       </>
     )
   })

packages/mobile/src/screens/explore-screen/collections.ts

@@ -4,6 +4,7 @@ import type { ImageSourcePropType } from 'react-native'
 import type { SvgProps } from 'react-native-svg'
 
 import { IconCart } from '@audius/harmony-native'
+import IconCassette from 'app/assets/images/iconCassette.svg'
 
 export type ExploreCollection = {
   title: string
@@ -31,3 +32,15 @@ export const PREMIUM_TRACKS: ExploreCollection = {
   shadowOpacity: 0.25,
   icon: IconCart
 }
+
+export const TRENDING_UNDERGROUND: ExploreCollection = {
+  title: 'Underground Trending',
+  description:
+    'Some of the best up-and-coming music on Audius all in one place',
+  gradientColors: ['#BA27FF', '#EF8CD9'],
+  gradientAngle: 315,
+  shadowColor: 'rgb(242,87,255)',
+  shadowOpacity: 0.25,
+  icon: IconCassette,
+  incentivized: true
+}

packages/mobile/src/screens/explore-screen/components/ExploreContent.tsx

@@ -14,6 +14,7 @@ import { FeelingLucky } from './FeelingLucky'
 import { ForYouTracks } from './ForYouTracks'
 import { LabelSpotlight } from './LabelSpotlight'
 import { RecentlyPlayedTracks } from './RecentlyPlayed'
+import { UndergroundTrendingTracks } from './UndergroundTrendingTracks'
 
 export const ExploreContent = () => {
   const [category] = useSearchCategory()
@@ -34,6 +35,7 @@ export const ExploreContent = () => {
       )}
       {showPlaylistContent && <FeaturedPlaylists />}
       {showTrackContent && <FeaturedRemixContests />}
+      {showTrackContent && <UndergroundTrendingTracks />}
       {showUserContent && <ArtistSpotlight />}
       {showUserContent && <LabelSpotlight />}
       {showTrackContent && showUserContextualContent && <FeelingLucky />}