@aptos-labs/wallet-adapter-mui-design 5.1.3 → 5.3.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @aptos-labs/wallet-adapter-mui-design
 
+## 5.3.0
+
+### Minor Changes
+
+- d2d308c: Bump @aptos-connect/wallet-adapter-plugin to 2.7.0
+- b3474b3: Update AC dns to web.petra.app
+- 499e03e: Rename aptos connect to petra web
+
+### Patch Changes
+
+- Updated dependencies [d2d308c]
+- Updated dependencies [b3474b3]
+- Updated dependencies [499e03e]
+  - @aptos-labs/wallet-adapter-react@7.2.0
+
+## 5.2.0
+
+### Minor Changes
+
+- 7cfd347: Add cross chain wallet support to MUI wallet selector
+
 ## 5.1.3
 
 ### Patch Changes

package/dist/index.js

@@ -288,7 +288,7 @@ function WalletsModal(_a) {
                   },
                   children: hasAptosConnectWallets ? /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_jsx_runtime3.Fragment, { children: [
                     /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("span", { children: "Log in or sign up" }),
-                    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("span", { children: "with Social + Aptos Connect" })
+                    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("span", { children: "with Social + Petra Web" })
                   ] }) : "Connect Wallet"
                 }
               ),
@@ -372,7 +372,7 @@ function WalletsModal(_a) {
                             appearance: "none"
                           },
                           children: [
-                            "Aptos Connect ",
+                            "Petra Web ",
                             /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_icons_material2.ArrowForward, { sx: { height: 16, width: 16 } })
                           ]
                         }
@@ -532,7 +532,7 @@ function renderEducationScreen(screen) {
         },
         children: [
           /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material3.IconButton, { onClick: screen.cancel, children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_icons_material2.ArrowBack, {}) }),
-          /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material3.Typography, { variant: "body1", component: "h2", width: "100%", align: "center", children: "About Aptos Connect" })
+          /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_material3.Typography, { variant: "body1", component: "h2", width: "100%", align: "center", children: "About Petra Web" })
         ]
       }
     ),

package/dist/index.mjs

@@ -297,7 +297,7 @@ function WalletsModal(_a) {
                   },
                   children: hasAptosConnectWallets ? /* @__PURE__ */ jsxs3(Fragment2, { children: [
                     /* @__PURE__ */ jsx3("span", { children: "Log in or sign up" }),
-                    /* @__PURE__ */ jsx3("span", { children: "with Social + Aptos Connect" })
+                    /* @__PURE__ */ jsx3("span", { children: "with Social + Petra Web" })
                   ] }) : "Connect Wallet"
                 }
               ),
@@ -381,7 +381,7 @@ function WalletsModal(_a) {
                             appearance: "none"
                           },
                           children: [
-                            "Aptos Connect ",
+                            "Petra Web ",
                             /* @__PURE__ */ jsx3(ArrowForward, { sx: { height: 16, width: 16 } })
                           ]
                         }
@@ -541,7 +541,7 @@ function renderEducationScreen(screen) {
         },
         children: [
           /* @__PURE__ */ jsx3(IconButton, { onClick: screen.cancel, children: /* @__PURE__ */ jsx3(ArrowBack, {}) }),
-          /* @__PURE__ */ jsx3(Typography2, { variant: "body1", component: "h2", width: "100%", align: "center", children: "About Aptos Connect" })
+          /* @__PURE__ */ jsx3(Typography2, { variant: "body1", component: "h2", width: "100%", align: "center", children: "About Petra Web" })
         ]
       }
     ),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-labs/wallet-adapter-mui-design",
-  "version": "5.1.3",
+  "version": "5.3.0",
   "description": "Aptos Wallet Adapter mui design",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -41,7 +41,7 @@
     "@emotion/styled": "^11.10.5",
     "@mui/icons-material": "^5.11.0",
     "@mui/material": "^5.11.6",
-    "@aptos-labs/wallet-adapter-react": "7.1.3"
+    "@aptos-labs/wallet-adapter-react": "7.2.0"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0",

package/src/WalletConnector.tsx

@@ -1,20 +1,13 @@
-import { WalletSortingOptions } from "@aptos-labs/wallet-adapter-react";
-import { Breakpoint } from "@mui/material";
 import { useState } from "react";
 import WalletButton from "./WalletButton";
 import WalletsModal from "./WalletModel";
-
-export interface WalletConnectorProps extends WalletSortingOptions {
-  networkSupport?: string;
-  handleNavigate?: () => void;
-  /** The max width of the wallet selector modal. Defaults to `xs`. */
-  modalMaxWidth?: Breakpoint;
-}
+import { WalletConnectorProps } from "./types";
 
 export function WalletConnector({
   networkSupport,
   handleNavigate,
   modalMaxWidth,
+  crossChainWallets,
   ...walletSortingOptions
 }: WalletConnectorProps) {
   const [modalOpen, setModalOpen] = useState(false);
@@ -32,6 +25,7 @@ export function WalletConnector({
         modalOpen={modalOpen}
         networkSupport={networkSupport}
         modalMaxWidth={modalMaxWidth}
+        crossChainWallets={crossChainWallets}
         {...walletSortingOptions}
       />
     </>

package/src/WalletModel.tsx

@@ -20,6 +20,8 @@ import {
   ListItem,
   ListItemText,
   Stack,
+  Tab,
+  Tabs,
   Typography,
   useTheme,
 } from "@mui/material";
@@ -32,14 +34,19 @@ import {
   ExpandMore,
   LanOutlined as LanOutlinedIcon,
 } from "@mui/icons-material";
-import { useState } from "react";
-import { WalletConnectorProps } from "./WalletConnector";
+import { SyntheticEvent, useState } from "react";
+import { WalletConnectorProps } from "./types";
 
 interface WalletsModalProps
   extends Pick<WalletConnectorProps, "networkSupport" | "modalMaxWidth">,
     WalletSortingOptions {
   handleClose: () => void;
   modalOpen: boolean;
+  // Make crossChainWallets optional - if not provided, shows single list
+  crossChainWallets?: {
+    evm: boolean;
+    solana: boolean;
+  };
 }
 
 export default function WalletsModal({
@@ -47,21 +54,131 @@ export default function WalletsModal({
   modalOpen,
   networkSupport,
   modalMaxWidth,
+  crossChainWallets,
   ...walletSortingOptions
 }: WalletsModalProps): JSX.Element {
   const theme = useTheme();
   const [expanded, setExpanded] = useState(false);
+  const [tabValue, setTabValue] = useState<number>(0);
+
+  const handleTabChange = (event: SyntheticEvent, newValue: number) => {
+    setTabValue(newValue);
+  };
 
   const { wallets = [], notDetectedWallets = [] } = useWallet();
 
   const { aptosConnectWallets, availableWallets, installableWallets } =
     groupAndSortWallets(
       [...wallets, ...notDetectedWallets],
-      walletSortingOptions,
+      walletSortingOptions
     );
 
   const hasAptosConnectWallets = !!aptosConnectWallets.length;
 
+  // Determine if we should show tabs (cross-chain mode)
+  const crossChainMode =
+    crossChainWallets && (crossChainWallets.evm || crossChainWallets.solana);
+
+  // Group wallets by chain if in cross-chain mode
+  const { evmWallets, solanaWallets, aptosWallets } = crossChainMode
+    ? availableWallets.reduce<{
+        evmWallets: AdapterWallet[];
+        solanaWallets: AdapterWallet[];
+        aptosWallets: AdapterWallet[];
+      }>(
+        (acc, wallet) => {
+          if (wallet.name.includes("Ethereum")) {
+            acc.evmWallets.push(wallet);
+          } else if (wallet.name.includes("Solana")) {
+            acc.solanaWallets.push(wallet);
+          } else {
+            acc.aptosWallets.push(wallet);
+          }
+          return acc;
+        },
+        { evmWallets: [], solanaWallets: [], aptosWallets: [] }
+      )
+    : { evmWallets: [], solanaWallets: [], aptosWallets: availableWallets };
+
+  const {
+    evmInstallableWallets,
+    solanaInstallableWallets,
+    aptosInstallableWallets,
+  } = crossChainMode
+    ? installableWallets.reduce<{
+        evmInstallableWallets: AdapterNotDetectedWallet[];
+        solanaInstallableWallets: AdapterNotDetectedWallet[];
+        aptosInstallableWallets: AdapterNotDetectedWallet[];
+      }>(
+        (acc, wallet) => {
+          if (wallet.name.includes("Ethereum")) {
+            acc.evmInstallableWallets.push(wallet);
+          } else if (wallet.name.includes("Solana")) {
+            acc.solanaInstallableWallets.push(wallet);
+          } else {
+            acc.aptosInstallableWallets.push(wallet);
+          }
+          return acc;
+        },
+        {
+          evmInstallableWallets: [],
+          solanaInstallableWallets: [],
+          aptosInstallableWallets: [],
+        }
+      )
+    : {
+        evmInstallableWallets: [],
+        solanaInstallableWallets: [],
+        aptosInstallableWallets: installableWallets,
+      };
+
+  // Calculate dynamic indices for tabs
+  const tabsConfig = crossChainMode
+    ? [
+        { key: "aptos", label: "Aptos", enabled: true },
+        { key: "solana", label: "Solana", enabled: crossChainWallets!.solana },
+        { key: "evm", label: "Ethereum", enabled: crossChainWallets!.evm },
+      ].filter((tab) => tab.enabled)
+    : [];
+
+  const getTabIndex = (key: string) =>
+    tabsConfig.findIndex((tab) => tab.key === key);
+
+  // Render wallet list for a specific chain
+  const renderWalletList = (
+    wallets: AdapterWallet[],
+    installableWallets: AdapterNotDetectedWallet[]
+  ) => (
+    <>
+      {wallets.map((wallet) => (
+        <WalletRow key={wallet.name} wallet={wallet} onConnect={handleClose} />
+      ))}
+      {!!installableWallets.length && (
+        <>
+          <Button
+            variant="text"
+            size="small"
+            onClick={() => setExpanded((prev) => !prev)}
+            endIcon={<ExpandMore sx={{ height: "20px", width: "20px" }} />}
+          >
+            More Wallets
+          </Button>
+          <Collapse in={expanded} timeout="auto" unmountOnExit>
+            <Stack sx={{ gap: 1 }}>
+              {installableWallets.map((wallet) => (
+                <WalletRow
+                  key={wallet.name}
+                  wallet={wallet}
+                  onConnect={handleClose}
+                />
+              ))}
+            </Stack>
+          </Collapse>
+        </>
+      )}
+    </>
+  );
+
   return (
     <Dialog
       open={modalOpen}
@@ -92,6 +209,7 @@ export default function WalletsModal({
         >
           <CloseIcon />
         </IconButton>
+
         <AboutAptosConnect renderEducationScreen={renderEducationScreen}>
           <Typography
             align="center"
@@ -106,12 +224,13 @@ export default function WalletsModal({
             {hasAptosConnectWallets ? (
               <>
                 <span>Log in or sign up</span>
-                <span>with Social + Aptos Connect</span>
+                <span>with Social + Petra Web</span>
               </>
             ) : (
               "Connect Wallet"
             )}
           </Typography>
+
           {networkSupport && (
             <Box
               sx={{
@@ -139,6 +258,7 @@ export default function WalletsModal({
               </Typography>
             </Box>
           )}
+
           {hasAptosConnectWallets && (
             <Stack gap={1}>
               {aptosConnectWallets.map((wallet) => (
@@ -177,7 +297,7 @@ export default function WalletsModal({
                     appearance: "none",
                   }}
                 >
-                  Aptos Connect <ArrowForward sx={{ height: 16, width: 16 }} />
+                  Petra Web <ArrowForward sx={{ height: 16, width: 16 }} />
                 </Box>
               </Typography>
 
@@ -213,40 +333,45 @@ export default function WalletsModal({
               <Divider sx={{ color: grey[400], pt: 2 }}>Or</Divider>
             </Stack>
           )}
-          <Stack sx={{ gap: 1 }}>
-            {availableWallets.map((wallet) => (
-              <WalletRow
-                key={wallet.name}
-                wallet={wallet}
-                onConnect={handleClose}
-              />
-            ))}
-            {!!installableWallets.length && (
-              <>
-                <Button
-                  variant="text"
-                  size="small"
-                  onClick={() => setExpanded((prev) => !prev)}
-                  endIcon={
-                    <ExpandMore sx={{ height: "20px", width: "20px" }} />
-                  }
-                >
-                  More Wallets
-                </Button>
-                <Collapse in={expanded} timeout="auto" unmountOnExit>
-                  <Stack sx={{ gap: 1 }}>
-                    {installableWallets.map((wallet) => (
-                      <WalletRow
-                        key={wallet.name}
-                        wallet={wallet}
-                        onConnect={handleClose}
-                      />
-                    ))}
-                  </Stack>
-                </Collapse>
-              </>
-            )}
-          </Stack>
+
+          {/* Conditional rendering: Tabs for cross-chain, simple list for single-chain */}
+          {crossChainMode ? (
+            <>
+              <Tabs
+                value={tabValue}
+                onChange={handleTabChange}
+                textColor="secondary"
+                indicatorColor="secondary"
+                variant="fullWidth"
+                aria-label="cross chain wallets tabs"
+              >
+                {tabsConfig.map((tab, index) => (
+                  <Tab key={tab.key} label={tab.label} {...a11yProps(index)} />
+                ))}
+              </Tabs>
+
+              <TabPanel value={tabValue} index={getTabIndex("aptos")}>
+                {renderWalletList(aptosWallets, aptosInstallableWallets)}
+              </TabPanel>
+
+              {crossChainWallets!.solana && (
+                <TabPanel value={tabValue} index={getTabIndex("solana")}>
+                  {renderWalletList(solanaWallets, solanaInstallableWallets)}
+                </TabPanel>
+              )}
+
+              {crossChainWallets!.evm && (
+                <TabPanel value={tabValue} index={getTabIndex("evm")}>
+                  {renderWalletList(evmWallets, evmInstallableWallets)}
+                </TabPanel>
+              )}
+            </>
+          ) : (
+            // Simple list mode (original WalletModel behavior)
+            <Stack sx={{ gap: 1 }}>
+              {renderWalletList(availableWallets, installableWallets)}
+            </Stack>
+          )}
         </AboutAptosConnect>
       </Stack>
     </Dialog>
@@ -340,7 +465,7 @@ function renderEducationScreen(screen: AboutAptosConnectEducationScreen) {
           <ArrowBack />
         </IconButton>
         <Typography variant="body1" component="h2" width="100%" align="center">
-          About Aptos Connect
+          About Petra Web
         </Typography>
       </Box>
 
@@ -432,3 +557,32 @@ function renderEducationScreen(screen: AboutAptosConnectEducationScreen) {
     </>
   );
 }
+
+interface TabPanelProps {
+  children?: React.ReactNode;
+  index: number;
+  value: number;
+}
+
+function TabPanel(props: TabPanelProps) {
+  const { children, value, index, ...other } = props;
+
+  return (
+    <div
+      role="tabpanel"
+      hidden={value !== index}
+      id={`simple-tabpanel-${index}`}
+      aria-labelledby={`simple-tab-${index}`}
+      {...other}
+    >
+      {value === index && <Stack sx={{ gap: 1 }}>{children}</Stack>}
+    </div>
+  );
+}
+
+function a11yProps(index: number) {
+  return {
+    id: `simple-tab-${index}`,
+    "aria-controls": `simple-tabpanel-${index}`,
+  };
+}

package/src/types.ts

@@ -0,0 +1,13 @@
+import { WalletSortingOptions } from "@aptos-labs/wallet-adapter-react";
+import { Breakpoint } from "@mui/material";
+
+export interface WalletConnectorProps extends WalletSortingOptions {
+  networkSupport?: string;
+  handleNavigate?: () => void;
+  /** The max width of the wallet selector modal. Defaults to `xs`. */
+  modalMaxWidth?: Breakpoint;
+  crossChainWallets?: {
+    evm: boolean;
+    solana: boolean;
+  };
+}