Merge branch 'dev' into feat/unified-address-format

.changeset/config.json

@@ -17,6 +17,7 @@
     "extension-core",
     "extension-shared",
     "playground",
-    "talisman-ui"
+    "talisman-ui",
+    "sapi"
   ]
 }

.changeset/fuzzy-penguins-promise.md

@@ -0,0 +1,5 @@
+---
+"@talismn/chaindata-provider": patch
+---
+
+fix: unawaited promise

apps/extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extension",
-  "version": "2.3.2",
+  "version": "2.4.0",
   "private": true,
   "license": "GPL-3.0-or-later",
   "dependencies": {
@@ -82,6 +82,7 @@
     "dompurify": "^3.1.7",
     "extension-core": "workspace:*",
     "extension-shared": "workspace:*",
+    "sapi": "workspace:*",
     "framer-motion": "11.11.9",
     "highlight.js": "11.10.0",
     "html-react-parser": "5.1.18",

apps/extension/src/ui/api/api.ts

@@ -36,8 +36,6 @@ export const api: MessageTypes = {
   allowPhishingSite: (url) => messageService.sendMessage("pri(app.phishing.addException)", { url }),
 
   // app messages -------------------------------------------------------
-  modalOpen: (request) => messageService.sendMessage("pri(app.modalOpen.request)", request),
-  modalOpenSubscribe: (cb) => messageService.subscribe("pri(app.modalOpen.subscribe)", null, cb),
   analyticsCapture: (request) => messageService.sendMessage("pri(app.analyticsCapture)", request),
   sendFundsOpen: (request = {}) => messageService.sendMessage("pri(app.sendFunds.open)", request),
   resetWallet: () => messageService.sendMessage("pri(app.resetWallet)"),

apps/extension/src/ui/api/types.ts

@@ -41,7 +41,6 @@ import {
   EvmAddress,
   LoggedinType,
   MetadataUpdateStatus,
-  ModalOpenRequest,
   NftData,
   ProviderType,
   RequestAccountCreateLedgerSubstrate,
@@ -119,8 +118,6 @@ export default interface MessageTypes {
   cancelEncryptRequest: (id: DecryptRequestId | EncryptRequestId) => Promise<boolean>
 
   // app message types -------------------------------------------------------
-  modalOpen: (modal: ModalOpenRequest) => Promise<boolean>
-  modalOpenSubscribe: (cb: (val: ModalOpenRequest) => void) => UnsubscribeFn
   analyticsCapture: (request: AnalyticsCaptureRequest) => Promise<boolean>
   sendFundsOpen: (request?: SendFundsOpenRequest) => Promise<boolean>
   resetWallet: () => Promise<boolean>

apps/extension/src/ui/apps/dashboard/index.tsx

@@ -9,7 +9,6 @@ import { SuspenseTracker } from "@talisman/components/SuspenseTracker"
 import { api } from "@ui/api"
 import { DatabaseErrorAlert } from "@ui/domains/Settings/DatabaseErrorAlert"
 import { useLoginCheck } from "@ui/hooks/useLoginCheck"
-import { useModalSubscription } from "@ui/hooks/useModalSubscription"
 
 import { AccountAddMenu } from "./routes/AccountAdd"
 import { AccountAddDcentDashboardWizard } from "./routes/AccountAdd/AccountAddDcentWizard"
@@ -46,8 +45,6 @@ import { TokensPage } from "./routes/Tokens/TokensPage"
 import { TxHistory } from "./routes/TxHistory"
 
 const DashboardInner = () => {
-  useModalSubscription()
-
   return (
     <Suspense fallback={<SuspenseTracker name="Dashboard" />}>
       <Routes>

apps/extension/src/ui/apps/dashboard/routes/Portfolio/index.tsx

@@ -3,7 +3,7 @@ import { Route, Routes, useSearchParams } from "react-router-dom"
 
 import { NavigateWithQuery } from "@talisman/components/NavigateWithQuery"
 import { DashboardLayout } from "@ui/apps/dashboard/layout"
-import { useBuyTokensModal } from "@ui/domains/Asset/Buy/useBuyTokensModal"
+import { useBuyTokensModal } from "@ui/domains/Asset/Buy/hooks/useBuyTokensModal"
 import { DashboardPortfolioHeader } from "@ui/domains/Portfolio/DashboardPortfolioHeader"
 import { PortfolioContainer } from "@ui/domains/Portfolio/PortfolioContainer"
 import { PortfolioToolbarNfts } from "@ui/domains/Portfolio/PortfolioToolbarNfts"

apps/extension/src/ui/apps/popup/components/TotalFiatBalance.tsx

@@ -15,6 +15,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "talisman-ui"
 
 import { api } from "@ui/api"
 import { AnalyticsEventName, AnalyticsPage, sendAnalyticsEvent } from "@ui/api/analytics"
+import { useBuyTokensModal } from "@ui/domains/Asset/Buy/hooks/useBuyTokensModal"
 import { currencyConfig } from "@ui/domains/Asset/currencyConfig"
 import { Fiat } from "@ui/domains/Asset/Fiat"
 import { useCopyAddressModal } from "@ui/domains/CopyAddress"
@@ -162,6 +163,7 @@ const ANALYTICS_PAGE: AnalyticsPage = {
 const TopActions = ({ disabled }: { disabled?: boolean }) => {
   const { t } = useTranslation()
   const { open: openCopyAddressModal } = useCopyAddressModal()
+  const { open: openBuyTokensModal } = useBuyTokensModal()
   const ownedAccounts = useAccounts("owned")
   const canBuy = useFeatureFlag("BUY_CRYPTO")
   const showQuestLink = useFeatureFlag("QUEST_LINK")
@@ -211,15 +213,23 @@ const TopActions = ({ disabled }: { disabled?: boolean }) => {
           ? {
               analyticsName: "Goto",
               analyticsAction: "Buy Crypto button",
-              label: t("Buy"),
+              label: t("Buy/Sell"),
               icon: CreditCardIcon,
-              onClick: () => api.modalOpen({ modalType: "buy" }).then(() => window.close()),
+              onClick: () => openBuyTokensModal(),
               disabled: disableActions,
               disabledReason,
             }
           : null,
       ].filter(Boolean) as Array<ActionProps>,
-    [canBuy, disableActions, disabledReason, handleSwapClick, openCopyAddressModal, t],
+    [
+      canBuy,
+      disableActions,
+      disabledReason,
+      handleSwapClick,
+      openBuyTokensModal,
+      openCopyAddressModal,
+      t,
+    ],
   )
 
   return (

apps/extension/src/ui/apps/popup/index.tsx

@@ -17,6 +17,7 @@ import { AccountExportModal } from "@ui/domains/Account/AccountExportModal"
 import { AccountExportPrivateKeyModal } from "@ui/domains/Account/AccountExportPrivateKeyModal"
 import { AccountRemoveModal } from "@ui/domains/Account/AccountRemoveModal"
 import { AccountRenameModal } from "@ui/domains/Account/AccountRenameModal"
+import { BuyTokensModal } from "@ui/domains/Asset/Buy/BuyTokensModal"
 import { CopyAddressModal } from "@ui/domains/CopyAddress"
 import { DatabaseErrorAlert } from "@ui/domains/Settings/DatabaseErrorAlert"
 import { BondModal } from "@ui/domains/Staking/Bond/BondModal"
@@ -88,6 +89,7 @@ const Popup = () => {
         <AccountExportModal />
         <AccountExportPrivateKeyModal />
         <CopyAddressModal />
+        <BuyTokensModal />
         <ExplorerNetworkPickerModal />
         <BackupWarningDrawer />
         <LedgerPolkadotUpgradeAlertDrawer />

apps/extension/src/ui/apps/popup/pages/Portfolio/index.tsx

@@ -4,6 +4,7 @@ import { Route, Routes, useLocation } from "react-router-dom"
 
 import { ScrollContainer } from "@talisman/components/ScrollContainer"
 import { SuspenseTracker } from "@talisman/components/SuspenseTracker"
+import { BuyTokensModal } from "@ui/domains/Asset/Buy/BuyTokensModal"
 import { PortfolioContainer } from "@ui/domains/Portfolio/PortfolioContainer"
 import BraveWarningPopupBanner from "@ui/domains/Settings/BraveWarning/BraveWarningPopupBanner"
 import MigratePasswordAlert from "@ui/domains/Settings/MigratePasswordAlert"
@@ -22,6 +23,7 @@ const PortfolioRoutes = () => (
       <Route path="nfts/:collectionId" element={<PortfolioNftCollection />} />
       <Route path="nfts" element={<PortfolioAssets />} />
       <Route path="tokens/:symbol" element={<PortfolioAsset />} />
+      <Route path="ramp/*" element={<BuyTokensModal />} />
       <Route path="*" element={<PortfolioAccounts />} />
     </Routes>
     <Suspense fallback={<SuspenseTracker name="HasAccountsPortfolioContent" />}>

apps/extension/src/ui/apps/popup/pages/WhatsNew/assets/index.ts

@@ -13,6 +13,7 @@ import content2000 from "./v2.0.0"
 import content2100 from "./v2.1.0"
 import content2200 from "./v2.2.0"
 import content2300 from "./v2.3.0"
+import content2400 from "./v2.4.0"
 
 export const latestUpdates: WhatsNewVersionData = {
   ...content1210,
@@ -29,4 +30,5 @@ export const latestUpdates: WhatsNewVersionData = {
   ...content2100,
   ...content2200,
   ...content2300,
+  ...content2400,
 }

apps/extension/src/ui/apps/popup/pages/WhatsNew/assets/v2.4.0/content.md

@@ -0,0 +1,3 @@
+<!-- version: v2.4.0 -->
+
+**<span class="icon">🛹</span> On and Off Ramps:** In partnership with Ramp, Talisman now offers an easy way to buy and sell crypto assets.

apps/extension/src/ui/apps/popup/pages/WhatsNew/assets/v2.4.0/index.ts

@@ -0,0 +1,11 @@
+import { WhatsNewVersionData } from "../types"
+import content from "./content.md"
+
+const content240: WhatsNewVersionData = {
+  "2.4.0": {
+    content,
+    date: "January 2025",
+  },
+}
+
+export default content240