ci(release): publish latest release

Author: hello-happy-puppy

VERSION

@@ -1 +1 @@
-mobile/1.62.1
+extension/1.62.1

apps/mobile/src/components/explore/ExploreSections/ExploreSections.tsx

@@ -30,7 +30,6 @@ import { TokenItemData } from 'src/components/explore/TokenItemData'
 import { getTokenMetadataDisplayType } from 'src/features/explore/utils'
 import { Flex, Loader, Text } from 'ui/src'
 import { AnimatedBottomSheetFlashList } from 'ui/src/components/AnimatedFlashList/AnimatedFlashList'
-import { NoTokens } from 'ui/src/components/icons'
 import { spacing } from 'ui/src/theme'
 import { BaseCard } from 'uniswap/src/components/BaseCard/BaseCard'
 import { useTokenRankingsQuery } from 'uniswap/src/data/rest/tokenRankings'
@@ -155,15 +154,10 @@ function _ExploreSections({
   }, [insets.bottom])
 
   const dataWithBottomTabs = useMemo(
-    () => (showFullScreenLoadingState ? [] : topTokenItems),
+    () => (showFullScreenLoadingState ? [] : (topTokenItems ?? [])),
     [showFullScreenLoadingState, topTokenItems],
   )
 
-  const listEmptyComponent = useMemo(
-    () => <TokenListEmptyComponent isLoading={showFullScreenLoadingState} />,
-    [showFullScreenLoadingState],
-  )
-
   if (!hasAllData && error) {
     return (
       <Flex height="100%" pb="$spacing60">
@@ -182,7 +176,7 @@ function _ExploreSections({
         <LegendList
           ref={legendListRef}
           refScrollView={scrollRef}
-          ListEmptyComponent={listEmptyComponent}
+          ListEmptyComponent={ListEmptyComponent}
           ListHeaderComponent={
             <ListHeaderComponent
               listRef={scrollRef}
@@ -214,7 +208,7 @@ function _ExploreSections({
     <Flex fill animation="100ms">
       <AnimatedBottomSheetFlashList
         ref={listRef}
-        ListEmptyComponent={listEmptyComponent}
+        ListEmptyComponent={ListEmptyComponent}
         ListHeaderComponent={
           <ListHeaderComponent
             listRef={listRef}
@@ -304,9 +298,9 @@ function processTokens(
 
 function processTokenRankings(
   tokenRankings: TokenRankingsResponse['tokenRankings'] | undefined,
-): Partial<Record<ExploreOrderBy, TokenItemDataWithMetadata[]>> {
+): Record<ExploreOrderBy, TokenItemDataWithMetadata[]> {
   if (!tokenRankings) {
-    return {} as const
+    return {} as Record<ExploreOrderBy, TokenItemDataWithMetadata[]>
   }
 
   const result: Record<string, TokenItemDataWithMetadata[]> = {}
@@ -327,11 +321,14 @@ function processTokenRankings(
   return result
 }
 
-function useTokenItems(data: TokenRankingsResponse | undefined, orderBy: ExploreOrderBy): TokenItemDataWithMetadata[] {
+function useTokenItems(
+  data: TokenRankingsResponse | undefined,
+  orderBy: ExploreOrderBy,
+): TokenItemDataWithMetadata[] | undefined {
   // process all the token rankings into a map of orderBy to token items (only do this once)
   const allTokenItemsByOrderBy = useMemo(() => processTokenRankings(data?.tokenRankings), [data])
-  // return the token items for the given orderBy, or empty array if the orderBy key doesn't exist
-  return useMemo(() => allTokenItemsByOrderBy[orderBy] ?? [], [allTokenItemsByOrderBy, orderBy])
+  // return the token items for the given orderBy
+  return useMemo(() => allTokenItemsByOrderBy[orderBy], [allTokenItemsByOrderBy, orderBy])
 }
 
 type ListHeaderProps = {
@@ -389,31 +386,11 @@ const ListHeaderComponent = ({
   )
 }
 
-const TokenListEmptyComponent = memo(function TokenListEmptyComponent({
-  isLoading,
-}: {
-  isLoading: boolean
-}): JSX.Element {
-  const { t } = useTranslation()
-
-  if (isLoading) {
-    return (
-      <Flex mx="$spacing24" my="$spacing12">
-        <Loader.Token repeat={5} />
-      </Flex>
-    )
-  }
-
-  return (
-    <Flex centered pt="$spacing48" px="$spacing36">
-      <BaseCard.EmptyState
-        description={t('explore.tokens.empty.description')}
-        icon={<NoTokens color="$neutral3" size="$icon.70" />}
-        title={t('explore.tokens.empty.title')}
-      />
-    </Flex>
-  )
-})
+const ListEmptyComponent = (): JSX.Element => (
+  <Flex mx="$spacing24" my="$spacing12">
+    <Loader.Token repeat={5} />
+  </Flex>
+)
 
 function useOrderBy(): {
   uiOrderBy: ExploreOrderBy

packages/uniswap/src/components/menus/ContextMenuV2.native.tsx

@@ -184,22 +184,15 @@ export function ContextMenu({
               setIsMenuVisible(false)
             }}
             onPress={() => {
-              // close the menu first to allow the closing animation to trigger asap
-              setIsMenuVisible(false)
-              closeMenu()
-              // pushes the main action (problematic navigation action) to the end of the event loop
-              // to allow the menu to close properly before
-              setTimeout(() => {
-                try {
-                  // run both actions; `onPressAny` will not run if `onPressAction` throws
-                  onPressAction()
-                  onPressAny?.({ name: label, index, indexPath: [index] })
-                } catch (error) {
-                  logger.error(error, {
-                    tags: { file: 'ContextMenuV2.tsx', function: 'createPressHandler' },
-                  })
-                }
-              }, 0)
+              try {
+                // run both actions; `onPressAny` will not run if `onPressAction` throws
+                onPressAction()
+                onPressAny?.({ name: label, index, indexPath: [index] })
+              } catch (error) {
+                logger.error(error, {
+                  tags: { file: 'ContextMenuV2.tsx', function: 'createPressHandler' },
+                })
+              }
             }}
             {...otherProps}
           />

packages/uniswap/src/i18n/locales/source/en-US.json

@@ -741,8 +741,6 @@
   "explore.search.section.nft": "NFT Collections",
   "explore.search.section.popularNFT": "Popular NFT collections",
   "explore.search.section.wallets": "Wallets",
-  "explore.tokens.empty.description": "There are no tokens available for this network and filter combination.",
-  "explore.tokens.empty.title": "No tokens found",
   "explore.tokens.error": "Couldn’t load tokens",
   "explore.tokens.favorite.action.add": "Favorite token",
   "explore.tokens.favorite.action.edit": "Edit favorites",

packages/utilities/src/format/localeBased.test.ts

@@ -83,11 +83,11 @@ it('formats fiat estimates for tokens correctly', () => {
   expect(formatNumber({ input: 1234.5678, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe('$1,234.57')
 
   expect(formatNumber({ input: 0.010235, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe('$0.0102')
-  expect(formatNumber({ input: 0.001231, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe('$0.00123')
-  expect(formatNumber({ input: 0.00001231, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe('$0.0000123')
+  expect(formatNumber({ input: 0.001231, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe('<$0.01')
+  expect(formatNumber({ input: 0.00001231, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe('<$0.01')
 
-  expect(formatNumber({ input: 1.234e-7, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe('$0.000000123')
-  expect(formatNumber({ input: 9.876e-9, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe('<$0.00000001')
+  expect(formatNumber({ input: 1.234e-7, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe('<$0.01')
+  expect(formatNumber({ input: 9.876e-9, type: NumberType.FiatTokenPrice, locale: 'en-US' })).toBe('<$0.01')
 })
 
 it('formats fiat estimates for token stats correctly', () => {

packages/utilities/src/format/localeBasedFormats.ts

@@ -515,9 +515,9 @@ export const fiatTokenDetailsFormatter: Formatter = {
 export const fiatTokenPricesFormatter: Formatter = {
   rules: [
     {
-      upperBound: 0.00000001,
-      overrideValue: 0.00000001,
-      formatter: SmallestNumCurrency,
+      upperBound: 0.01,
+      overrideValue: 0.01,
+      formatter: TwoDecimalsCurrency,
       postFormatModifier: lessThanPostFormatModifier,
     },
     { upperBound: 1, formatter: ThreeSigFigsCurrency },