Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/efdevcon/monorepo into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
lassejaco committed Oct 29, 2024
2 parents 7a7844d + 7f17013 commit 350f94a
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 3 deletions.
19 changes: 16 additions & 3 deletions devcon-app/src/components/domain/app/account/wallet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,21 @@ export function WalletLoginButton({ onError }: Props) {
}

return (
<Button fat fill className="w-full plain mt-4" color="purple-2" onClick={connectWeb3AndLogin}>
Continue With Ethereum
</Button>
<>
<Button
fat
fill
className="w-full plain mt-4"
color="purple-2"
onClick={(e: any) => {
e.preventDefault()
setTimeout(() => {
connectWeb3AndLogin()
}, 0)
}}
>
Continue With Ethereum
</Button>
</>
)
}
33 changes: 33 additions & 0 deletions devcon-app/src/components/wallet.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
'use client'

import { Button } from 'lib/components/button'
import { useAppKit } from '@reown/appkit/react'

export function TestWalletConnections() {
const { open } = useAppKit()

return (
<>
<p>
<w3m-button />
</p>
<p>
<Button
fat
fill
className="w-full plain mt-4"
color="purple-2"
onClick={(e: any) => {
e.preventDefault()
// Add a small delay to avoid cross-origin issues
setTimeout(() => {
open()
}, 0)
}}
>
Continue With Ethereum
</Button>
</p>
</>
)
}
12 changes: 12 additions & 0 deletions devcon-app/src/pages/wallet.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { TestWalletConnections } from 'components/wallet'

const Index = () => {
return (
<div>
<h1>Wallet Test</h1>
<TestWalletConnections />
</div>
)
}

export default Index

0 comments on commit 350f94a

Please sign in to comment.