ci(release): publish latest release

Author: hello-happy-puppy

.nvmrc

@@ -1 +1 @@
-v18
+v18.16.0

.prettierignore

@@ -1,3 +1,4 @@
+*.tsbuildinfo
 __generated__
 __mocks__
 .detoxrc.js

RELEASE

@@ -1,8 +1,4 @@
-Here are the latest updates:
-
-Native Asset Top Up: Easily access our fiat on ramp feature if you don’t have enough native asset on a network to complete a transaction.
-
-Other changes:
-
-- Various bug fixes and performance improvements
-- Improved gas estimation for Send transactions
+We are back with some new updates! Here’s the latest:
+
+- Improved swap context menu linkouts
+- Various bug fixes and performance improvements

VERSION

@@ -1 +1 @@
-mobile/1.32
+extension/1.3.0

apps/extension/package.json

@@ -11,10 +11,9 @@
     "@sentry/react": "7.80.0",
     "@sentry/webpack-plugin": "2.10.3",
     "@svgr/webpack": "8.0.1",
-    "@tamagui/core": "1.95.1",
+    "@tamagui/core": "1.108.2",
     "@types/uuid": "9.0.1",
-    "@uniswap/analytics-events": "2.34.0",
-    "@uniswap/sdk-core": "5.3.0",
+    "@uniswap/analytics-events": "2.36.0",
     "@uniswap/universal-router-sdk": "2.2.0",
     "@uniswap/v3-sdk": "3.13.0",
     "dotenv-webpack": "8.0.1",
@@ -75,7 +74,7 @@
     "serve": "^14.2.0",
     "statsig-js": "4.41.0",
     "swc-loader": "^0.2.3",
-    "tamagui-loader": "1.95.1",
+    "tamagui-loader": "1.108.2",
     "typescript": "5.3.3",
     "webpack": "5.90.0",
     "webpack-cli": "^5.0.1",

apps/extension/src/app/PopupApp.tsx

@@ -0,0 +1,149 @@
+import '@tamagui/core/reset.css'
+import 'src/app/Global.css'
+
+import { useEffect } from 'react'
+import { I18nextProvider, useTranslation } from 'react-i18next'
+import { useDispatch } from 'react-redux'
+import { RouterProvider } from 'react-router-dom'
+import { PersistGate } from 'redux-persist/integration/react'
+import { ExtensionStatsigProvider } from 'src/app/StatsigProvider'
+import { GraphqlProvider } from 'src/app/apollo'
+import { ErrorElement } from 'src/app/components/ErrorElement'
+import { TraceUserProperties } from 'src/app/components/Trace/TraceUserProperties'
+import { DappContextProvider } from 'src/app/features/dapp/DappContext'
+import { SentryAppNameTag, initializeSentry, sentryCreateHashRouter } from 'src/app/sentry'
+import { initExtensionAnalytics } from 'src/app/utils/analytics'
+import { getLocalUserId } from 'src/app/utils/storage'
+import { getReduxPersistor, getReduxStore } from 'src/store/store'
+import { Button, Flex, Image, Text } from 'ui/src'
+import { CHROME_LOGO, UNISWAP_LOGO } from 'ui/src/assets'
+import { iconSizes, spacing } from 'ui/src/theme'
+import Trace from 'uniswap/src/features/telemetry/Trace'
+import { ElementName } from 'uniswap/src/features/telemetry/constants'
+import { UnitagUpdaterContextProvider } from 'uniswap/src/features/unitags/context'
+import i18n from 'uniswap/src/i18n/i18n'
+import { ExtensionScreens } from 'uniswap/src/types/screens/extension'
+import { logger } from 'utilities/src/logger/logger'
+import { ErrorBoundary } from 'wallet/src/components/ErrorBoundary/ErrorBoundary'
+import { LocalizationContextProvider } from 'wallet/src/features/language/LocalizationContext'
+import { syncAppWithDeviceLanguage } from 'wallet/src/features/language/slice'
+import { SharedProvider } from 'wallet/src/provider'
+
+getLocalUserId()
+  .then((userId) => {
+    initializeSentry(SentryAppNameTag.Popup, userId)
+  })
+  .catch((error) => {
+    logger.error(error, {
+      tags: { file: 'PopupApp.tsx', function: 'getLocalUserId' },
+    })
+  })
+
+const router = sentryCreateHashRouter([
+  {
+    path: '',
+    element: <PopupContent />,
+    errorElement: <ErrorElement />,
+  },
+])
+
+function PopupContent(): JSX.Element {
+  const { t } = useTranslation()
+  const dispatch = useDispatch()
+
+  useEffect(() => {
+    dispatch(syncAppWithDeviceLanguage())
+  }, [dispatch])
+
+  const searchParams = new URLSearchParams(window.location.search)
+  const tabId = searchParams.get('tabId')
+  const windowId = searchParams.get('windowId')
+
+  const tabIdNumber = tabId ? Number(tabId) : undefined
+  const windowIdNumber = windowId ? Number(windowId) : undefined
+
+  return (
+    <Trace logImpression screen={ExtensionScreens.PopupOpenExtension}>
+      <Flex fill gap="$spacing16" height="100%" px="$spacing24" py="$spacing24">
+        <Flex row>
+          <Flex position="relative">
+            <Image height={iconSizes.icon40} source={UNISWAP_LOGO} width={iconSizes.icon40} />
+            <Flex
+              backgroundColor="$surface1"
+              borderColor="$surface3"
+              borderRadius={6}
+              borderWidth={1}
+              bottom={-spacing.spacing4}
+              p="$spacing2"
+              position="absolute"
+              right={-spacing.spacing4}
+            >
+              <Image height={iconSizes.icon12} source={CHROME_LOGO} width={iconSizes.icon12} />
+            </Flex>
+          </Flex>
+        </Flex>
+
+        <Flex gap="$spacing4">
+          <Text color="$neutral1" variant="subheading1">
+            {t('extension.popup.chrome.title')}
+          </Text>
+          <Text color="$neutral2" variant="body2">
+            {t('extension.popup.chrome.description')}
+          </Text>
+        </Flex>
+
+        <Flex fill />
+
+        <Trace logPress element={ElementName.ExtensionPopupOpenButton}>
+          <Button
+            theme="primary"
+            width="100%"
+            onPress={async () => {
+              if (windowIdNumber) {
+                // eslint-disable-next-line security/detect-non-literal-fs-filename
+                await chrome.sidePanel.open({ tabId: tabIdNumber, windowId: windowIdNumber })
+                window.close()
+              }
+            }}
+          >
+            {t('extension.popup.chrome.button')}
+          </Button>
+        </Trace>
+      </Flex>
+    </Trace>
+  )
+}
+
+// TODO WALL-4313 - Backup for some broken chrome.sidePanel.open functionality
+// Consider removing this once the issue is resolved or leaving as fallback
+export default function PopupApp(): JSX.Element {
+  // initialize analytics on load
+  useEffect(() => {
+    initExtensionAnalytics().catch(() => undefined)
+  }, [])
+
+  return (
+    <Trace>
+      <PersistGate persistor={getReduxPersistor()}>
+        <ExtensionStatsigProvider>
+          <I18nextProvider i18n={i18n}>
+            <SharedProvider reduxStore={getReduxStore()}>
+              <ErrorBoundary>
+                <GraphqlProvider>
+                  <LocalizationContextProvider>
+                    <UnitagUpdaterContextProvider>
+                      <TraceUserProperties />
+                      <DappContextProvider>
+                        <RouterProvider router={router} />
+                      </DappContextProvider>
+                    </UnitagUpdaterContextProvider>
+                  </LocalizationContextProvider>
+                </GraphqlProvider>
+              </ErrorBoundary>
+            </SharedProvider>
+          </I18nextProvider>
+        </ExtensionStatsigProvider>
+      </PersistGate>
+    </Trace>
+  )
+}

apps/extension/src/app/features/accounts/AccountItem.tsx

@@ -7,14 +7,12 @@ import { removeAllDappConnectionsForAccount } from 'src/app/features/dapp/action
 import { ContextMenu, Flex, MenuContentItem, Text, TouchableArea } from 'ui/src'
 import { CopySheets, Edit, TrashFilled, TripleDots } from 'ui/src/components/icons'
 import { iconSizes } from 'ui/src/theme'
-import { usePortfolioTotalValue } from 'uniswap/src/features/dataApi/balances'
 import { ElementName, ModalName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
 import { setClipboard } from 'uniswap/src/utils/clipboard'
 import { NumberType } from 'utilities/src/format/types'
 import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
 import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
-import { usePortfolioValueModifiers } from 'wallet/src/features/dataApi/balances'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType, CopyNotificationType } from 'wallet/src/features/notifications/types'
@@ -26,16 +24,15 @@ import { DisplayNameType } from 'wallet/src/features/wallet/types'
 type AccountItemProps = {
   address: Address
   onAccountSelect?: () => void
+  balanceUSD?: number
 }
 
-export function AccountItem({ address, onAccountSelect }: AccountItemProps): JSX.Element {
+export function AccountItem({ address, onAccountSelect, balanceUSD }: AccountItemProps): JSX.Element {
   const { t } = useTranslation()
   const dispatch = useDispatch()
-  const valueModifiers = usePortfolioValueModifiers() ?? []
-  const { data, loading, error } = usePortfolioTotalValue({ address, valueModifiers })
-  const { balanceUSD } = data || {}
 
   const { convertFiatAmountFormatted } = useLocalizationContext()
+
   const formattedBalance = convertFiatAmountFormatted(balanceUSD, NumberType.PortfolioBalance)
 
   const [showEditLabelModal, setShowEditLabelModal] = useState(false)
@@ -173,7 +170,7 @@ export function AccountItem({ address, onAccountSelect }: AccountItemProps): JSX
               transform="translateY(-50%)"
               variant="body3"
             >
-              {loading || error ? '' : formattedBalance}
+              {formattedBalance}
             </Text>
             <ContextMenu closeOnClick itemId={address} menuOptions={menuOptions} onLeftClick>
               <Flex

apps/extension/src/app/features/accounts/AccountSwitcherScreen.tsx

@@ -16,6 +16,7 @@ import { navigate } from 'src/app/navigation/state'
 import { Button, Flex, MenuContent, MenuContentItem, Popover, ScrollView, Text, useSporeColors } from 'ui/src'
 import { WalletFilled, X } from 'ui/src/components/icons'
 import { spacing } from 'ui/src/theme'
+import { AccountType } from 'uniswap/src/features/accounts/types'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { ModalName, WalletEventName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
@@ -26,9 +27,10 @@ import { sleep } from 'utilities/src/time/timing'
 import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
 import { PlusCircle } from 'wallet/src/components/icons/PlusCircle'
 import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
+import { useAccountList } from 'wallet/src/features/accounts/hooks'
 import { createOnboardingAccount } from 'wallet/src/features/onboarding/createOnboardingAccount'
 import { WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
-import { AccountType, BackupType, SignerMnemonicAccount } from 'wallet/src/features/wallet/accounts/types'
+import { BackupType, SignerMnemonicAccount } from 'wallet/src/features/wallet/accounts/types'
 import { createAccountsActions } from 'wallet/src/features/wallet/create/createAccountsSaga'
 import { useActiveAccountWithThrow, useDisplayName, useSignerAccounts } from 'wallet/src/features/wallet/hooks'
 import { selectSortedSignerMnemonicAccounts } from 'wallet/src/features/wallet/selectors'
@@ -136,6 +138,17 @@ export function AccountSwitcherScreen(): JSX.Element {
       onPress: (): void => setShowRemoveWalletModal(true),
     },
   ]
+  const { data: accountBalanceData } = useAccountList({
+    addresses: accountAddresses,
+    notifyOnNetworkStatusChange: true,
+  })
+
+  const sortedAddressesByBalance = accountAddresses
+    .map((address) => {
+      const wallet = accountBalanceData?.portfolios?.find((portfolio) => portfolio?.ownerAddress === address)
+      return { address, balance: wallet?.tokensTotalDenominatedValue?.value }
+    })
+    .sort((a, b) => (b.balance ?? 0) - (a.balance ?? 0))
 
   const contentShadowProps = {
     shadowColor: colors.shadowColor.val,
@@ -201,11 +214,12 @@ export function AccountSwitcherScreen(): JSX.Element {
             </Text>
           )}
           <Flex>
-            {accountAddresses.map((address: string) => {
+            {sortedAddressesByBalance.map(({ address, balance }) => {
               return (
                 <AccountItem
                   key={address}
                   address={address}
+                  balanceUSD={balance}
                   onAccountSelect={async (): Promise<void> => {
                     dispatch(setAccountAsActive(address))
                     await updateDappConnectedAddressFromExtension(address)