Skip to content

release latest #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Cussone merged 3 commits into from
Dec 24, 2025
Merged

release latest #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca2d086
fix: set installed prop inside `getModalWallet` by window object
Cussone Dec 24, 2025
e8a5a9d
Merge pull request #246 from argentlabs/fix/bug-with-installed-wallet…
Cussone Dec 24, 2025
bdd9d7f
chore(release): 3.4.2 [skip ci]
semantic-release-bot Dec 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "starknetkit",
"version": "3.4.1",
"version": "3.4.2",
"repository": "github:argentlabs/starknetkit",
"private": false,
"browser": {
Expand Down
2 changes: 1 addition & 1 deletion src/connectors/argent/argentMobile/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ export class ArgentMobileBaseConnector extends Connector {
url,
icons,
rpcUrl: providerRpcUrl,
modalWallet: getModalWallet(this, discoveryWallets),
modalWallet: getModalWallet(this, { discoveryWallets }),
}

if (projectId === DEFAULT_PROJECT_ID) {
Expand Down
22 changes: 14 additions & 8 deletions src/helpers/mapModalWallets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { WalletProvider } from "@starknet-io/get-starknet-core"
import { isString } from "lodash-es"
import type { StarknetWindowObject } from "@starknet-io/types-js"
import {
import type {
Connector,
StarknetkitCompoundConnector,
StarknetkitConnector,
Expand Down Expand Up @@ -30,10 +30,13 @@ export function getModalWallet(
| Connector
| StarknetkitConnector
| StarknetkitCompoundConnector,
discoveryWallets?: WalletProvider[],
_storeVersion?: StoreVersion | null,
options?: {
installedWallets?: StarknetWindowObject[]
discoveryWallets?: WalletProvider[]
storeVersion?: StoreVersion | null
},
): ModalWallet {
let storeVersion = _storeVersion
let storeVersion = options?.storeVersion
if (!storeVersion) {
storeVersion = getStoreVersionFromBrowser()
}
Expand All @@ -44,17 +47,21 @@ export function getModalWallet(

const isCompound = isCompoundConnector(connectorOrCompoundConnector)

const downloads = discoveryWallets?.find(
const downloads = options?.discoveryWallets?.find(
(d) =>
d.id === (connector.id === "argentMobile" ? "argentX" : connector.id),
)?.downloads

const installed =
connector.id === "argentMobile" ||
Boolean(options?.installedWallets?.find((w) => w.id === connector.id))

return {
installed,
name: isCompound ? connectorOrCompoundConnector.name : connector.name,
id: connector.id,
icon: isCompound ? connectorOrCompoundConnector.icon : connector.icon,
connector: connectorOrCompoundConnector,
installed: connector.id === "argentMobile",
title:
"title" in connector && isString(connector.title)
? connector.title
Expand Down Expand Up @@ -105,7 +112,6 @@ export const mapModalWallets = ({
if (installed) {
let icon
let name
let download

if (isCompound) {
icon = _c.icon
Expand Down Expand Up @@ -166,7 +172,7 @@ export const mapModalWallets = ({
return null
}

return getModalWallet(_c, discoveryWallets)
return getModalWallet(_c, { discoveryWallets })
})
.filter((c): c is ModalWallet => c !== null)

Expand Down
1 change: 1 addition & 0 deletions src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ export const connect = async ({
theme: modalTheme === "system" ? null : (modalTheme ?? null),
modalWallets,
discoveryWallets,
installedWallets,
},
}) as unknown as ModalInstance // Prevents vite build errors
})
Expand Down
6 changes: 4 additions & 2 deletions src/modal/Modal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<script lang="ts">
import { onMount } from "svelte"
import type { WalletProvider } from "@starknet-io/get-starknet-core"
import type { StarknetWindowObject } from "@starknet-io/types-js"

import {
type Callback,
Expand Down Expand Up @@ -41,6 +42,7 @@
}

export let discoveryWallets: WalletProvider[]
export let installedWallets: StarknetWindowObject[]
export let modalWallets: ModalWallet[] = []
export let selectedWallet: ModalWallet | null = null
$: selectedConnector =
Expand Down Expand Up @@ -75,7 +77,7 @@
if (isInAppBrowser) {
try {
setTimeout(() => {
void callback(getModalWallet(new ArgentX()))
void callback(getModalWallet(new ArgentX(), { installedWallets }))
})
} catch (e) {
console.error(e)
Expand All @@ -90,7 +92,7 @@
if (isBraavosMobileApp) {
try {
setTimeout(() => {
void callback(getModalWallet(new Braavos()))
void callback(getModalWallet(new Braavos(), { installedWallets }))
})
} catch (e) {
console.error(e)
Expand Down