Skip to content
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.

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

Release #32

Merged
merged 3 commits into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"starknet-react-chains-next": "npm:@starknet-react/[email protected]",
"starknet-react-core-next": "npm:@starknet-react/[email protected]",
"starknetkit-latest": "npm:starknetkit@^1.1.9",
"starknetkit-next": "npm:starknetkit@^2.2.17"
"starknetkit-next": "npm:starknetkit@^2.2.18"
},
"devDependencies": {
"@types/lodash-es": "^4.17.12",
Expand Down
124 changes: 62 additions & 62 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export default function Home() {
>
<Heading as="h1">Starknetkit</Heading>
<ConnectButtonStarknetkitLatest />
{/* manually hidden */}
<ConnectButtonStarknetkitNext />
<Heading as="h1">Starknetkit + Starknet-react</Heading>
<Button
Expand All @@ -55,6 +56,7 @@ export default function Home() {
<span>starknet-react ({process.env.starknetReactVersion})</span>
</Flex>
</Button>
{/* manually hidden */}
<Flex flexDirection="column">
<Button
as="a"
Expand All @@ -65,9 +67,7 @@ export default function Home() {
h="20"
>
<Flex flexDirection="column" alignItems="center">
<span>
starknetkit@next ({process.env.starknetkitLatestVersion})
</span>
<span>starknetkit@next ({process.env.starknetkitNextVersion})</span>
<span>+</span>
<span>starknet-react ({process.env.starknetReactNextVersion})</span>
</Flex>
Expand Down
8 changes: 5 additions & 3 deletions src/components/AccountSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@ const AccountSection: FC<AccountSectionProps> = ({ address, chainId }) => {

return (
<>
<Flex alignItems="center" justifyContent="space-between">
<Heading>{starknetkitVersion}</Heading>
{starknetReactVersion && <Heading>{starknetReactVersion}</Heading>}
<Flex flexDirection="column" gap="2">
<Heading size="sm">{starknetkitVersion}</Heading>
{starknetReactVersion && (
<Heading size="sm">{starknetReactVersion}</Heading>
)}
</Flex>
<Section>
<Box
Expand Down
10 changes: 7 additions & 3 deletions src/components/Actions/SignMessageWithStarknetReact.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const SignMessageWithStarknetReact: FC<SignMessageWithStarknetReactProps> = ({
}

return (
<Flex flex={1} width="full">
<Flex flexDirection={{ base: "column", sm: "row" }} flex={1} width="full">
<Flex
as="form"
onSubmit={(e) => {
Expand All @@ -79,7 +79,11 @@ const SignMessageWithStarknetReact: FC<SignMessageWithStarknetReactProps> = ({
onChange={(e) => setShortText(e.target.value)}
/>

<div style={{ display: "flex", alignItems: "center", gap: "1em" }}>
<Flex
flexDirection={{ base: "column", sm: "row" }}
alignItems="center"
gap="1em"
>
<Button colorScheme="primary" type="submit" w="full">
Sign
</Button>
Expand All @@ -93,7 +97,7 @@ const SignMessageWithStarknetReact: FC<SignMessageWithStarknetReactProps> = ({
>
Sign without deploy
</Button>
</div>
</Flex>
</Flex>
<Flex
as="form"
Expand Down
10 changes: 7 additions & 3 deletions src/components/Actions/SignMessageWithStarknetReactNext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const SignMessageWithStarknetReactNext: FC<
}

return (
<Flex flex={1} width="full">
<Flex flexDirection={{ base: "column", sm: "row" }} flex={1} width="full">
<Flex
as="form"
onSubmit={(e) => {
Expand All @@ -85,7 +85,11 @@ const SignMessageWithStarknetReactNext: FC<
onChange={(e) => setShortText(e.target.value)}
/>

<div style={{ display: "flex", alignItems: "center", gap: "1em" }}>
<Flex
flexDirection={{ base: "column", sm: "row" }}
alignItems="center"
gap="1em"
>
<Button colorScheme="primary" type="submit" w="full">
Sign
</Button>
Expand All @@ -99,7 +103,7 @@ const SignMessageWithStarknetReactNext: FC<
>
Sign without deploy
</Button>
</div>
</Flex>
</Flex>
<Flex
as="form"
Expand Down
25 changes: 10 additions & 15 deletions src/components/connect/ConnectStarknetReactNext.tsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
import { availableConnectors } from "@/helpers/connectorsNext"
import {
starknetReactVersionAtom,
starknetkitVersionAtom,
} from "@/state/versionState"
import { Button, Flex, Heading, Image } from "@chakra-ui/react"
import { useConnect } from "starknet-react-core-next"
import { useSetAtom } from "jotai"
import React, { useEffect, useState } from "react"
import { Connector, useStarknetkitConnectModal } from "starknetkit-next"
import { isInArgentMobileAppBrowser } from "starknetkit-next/argentMobile"
import { availableConnectors } from "@/helpers/connectorsNext"
import { useConnect } from "starknet-react-core-next"
import {
StarknetkitConnector,
useStarknetkitConnectModal,
} from "starknetkit-next"

const ConnectStarknetReactNext = () => {
const { connectAsync, connectors, status } = useConnect()
const { connectAsync, connectors } = useConnect()
const [isClient, setIsClient] = useState(false)
const setStarknetkitVersion = useSetAtom(starknetkitVersionAtom)
const setStarknetReactVersion = useSetAtom(starknetReactVersionAtom)

const { starknetkitConnectModal } = useStarknetkitConnectModal({
connectors: availableConnectors,
connectors: availableConnectors as StarknetkitConnector[],
})

// https://nextjs.org/docs/messages/react-hydration-error#solution-1-using-useeffect-to-run-on-the-client-only
Expand All @@ -32,24 +34,17 @@ const ConnectStarknetReactNext = () => {
return <></>
}

const inAppBrowserFilter = (c: any) => {
if (isInArgentMobileAppBrowser()) {
return c.id === "argentX"
}
return c
}

return (
<Flex direction="column" gap="3" p="5">
<Flex direction="column" gap="3">
{connectors.filter(inAppBrowserFilter).map((connector) => {
{connectors.map((connector) => {
if (!connector.available()) {
return <React.Fragment key={connector.id} />
}
const icon =
typeof connector.icon === "string"
? connector.icon
: connector.icon.dark ?? ""
: (connector.icon.dark ?? "")
const isSvg = icon?.startsWith("<svg")

return (
Expand Down
36 changes: 25 additions & 11 deletions src/helpers/connectorsNext.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,28 @@
import { InjectedConnector } from "starknetkit-next/injected"
import { ARGENT_WEBWALLET_URL, CHAIN_ID } from "@/constants"
import { isInArgentMobileAppBrowser } from "starknetkit-next/argentMobile"
import { ArgentMobileConnector } from "starknetkit-next/argentMobile"
import { InjectedConnector } from "starknetkit-next/injected"
import { WebWalletConnector } from "starknetkit-next/webwallet"
import { ARGENT_WEBWALLET_URL, CHAIN_ID } from "@/constants"

export const availableConnectors = [
new InjectedConnector({ options: { id: "argentX" } }),
new InjectedConnector({ options: { id: "braavos" } }),
new ArgentMobileConnector({
dappName: "Example dapp",
chainId: CHAIN_ID,
}),
new WebWalletConnector({ url: ARGENT_WEBWALLET_URL }),
]
export const availableConnectors = isInArgentMobileAppBrowser()
? [
ArgentMobileConnector.init({
options: {
dappName: "Example dapp",
chainId: CHAIN_ID,
},
inAppBrowserOptions: {},
}),
]
: [
new InjectedConnector({ options: { id: "argentX" } }),
new InjectedConnector({ options: { id: "braavos" } }),
ArgentMobileConnector.init({
options: {
dappName: "Example dapp",
chainId: CHAIN_ID,
},
inAppBrowserOptions: {},
}),
new WebWalletConnector({ url: ARGENT_WEBWALLET_URL }),
]