Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
frontend
Commits
f238ea85
Commit
f238ea85
authored
Jan 18, 2024
by
tom
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Connect wallet event sent twice
Fixes #1509
parent
d67d6621
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
35 deletions
+21
-35
ContractConnectWallet.tsx
ui/address/contract/ContractConnectWallet.tsx
+6
-28
WalletMenuDesktop.tsx
ui/snippets/walletMenu/WalletMenuDesktop.tsx
+1
-1
WalletMenuMobile.tsx
ui/snippets/walletMenu/WalletMenuMobile.tsx
+1
-1
useWallet.tsx
ui/snippets/walletMenu/useWallet.tsx
+13
-5
No files found.
ui/address/contract/ContractConnectWallet.tsx
View file @
f238ea85
import
{
Alert
,
Button
,
Flex
}
from
'
@chakra-ui/react
'
;
import
{
Alert
,
Button
,
Flex
}
from
'
@chakra-ui/react
'
;
import
{
useWeb3Modal
,
useWeb3ModalState
}
from
'
@web3modal/wagmi/react
'
;
import
React
from
'
react
'
;
import
React
from
'
react
'
;
import
{
useAccount
,
useDisconnect
}
from
'
wagmi
'
;
import
useIsMobile
from
'
lib/hooks/useIsMobile
'
;
import
useIsMobile
from
'
lib/hooks/useIsMobile
'
;
import
*
as
mixpanel
from
'
lib/mixpanel/index
'
;
import
AddressEntity
from
'
ui/shared/entities/address/AddressEntity
'
;
import
AddressEntity
from
'
ui/shared/entities/address/AddressEntity
'
;
import
useWallet
from
'
ui/snippets/walletMenu/useWallet
'
;
const
ContractConnectWallet
=
()
=>
{
const
ContractConnectWallet
=
()
=>
{
const
{
open
}
=
useWeb3Modal
();
const
{
isModalOpening
,
isModalOpen
,
connect
,
disconnect
,
address
,
isWalletConnected
}
=
useWallet
({
source
:
'
Smart contracts
'
});
const
{
open
:
isOpen
}
=
useWeb3ModalState
();
const
{
disconnect
}
=
useDisconnect
();
const
isMobile
=
useIsMobile
();
const
isMobile
=
useIsMobile
();
const
[
isModalOpening
,
setIsModalOpening
]
=
React
.
useState
(
false
);
const
handleConnect
=
React
.
useCallback
(
async
()
=>
{
setIsModalOpening
(
true
);
await
open
();
setIsModalOpening
(
false
);
mixpanel
.
logEvent
(
mixpanel
.
EventTypes
.
WALLET_CONNECT
,
{
Source
:
'
Smart contracts
'
,
Status
:
'
Started
'
});
},
[
open
]);
const
handleAccountConnected
=
React
.
useCallback
(({
isReconnected
}:
{
isReconnected
:
boolean
})
=>
{
!
isReconnected
&&
mixpanel
.
logEvent
(
mixpanel
.
EventTypes
.
WALLET_CONNECT
,
{
Source
:
'
Smart contracts
'
,
Status
:
'
Connected
'
});
},
[]);
const
handleDisconnect
=
React
.
useCallback
(()
=>
{
disconnect
();
},
[
disconnect
]);
const
{
address
,
isDisconnected
}
=
useAccount
({
onConnect
:
handleAccountConnected
});
const
content
=
(()
=>
{
const
content
=
(()
=>
{
if
(
isDisconnected
||
!
address
)
{
if
(
!
isWalletConnected
)
{
return
(
return
(
<>
<>
<
span
>
Disconnected
</
span
>
<
span
>
Disconnected
</
span
>
<
Button
<
Button
ml=
{
3
}
ml=
{
3
}
onClick=
{
handleC
onnect
}
onClick=
{
c
onnect
}
size=
"sm"
size=
"sm"
variant=
"outline"
variant=
"outline"
isLoading=
{
isModalOpening
||
isOpen
}
isLoading=
{
isModalOpening
||
is
Modal
Open
}
loadingText=
"Connect wallet"
loadingText=
"Connect wallet"
>
>
Connect wallet
Connect wallet
...
@@ -61,7 +39,7 @@ const ContractConnectWallet = () => {
...
@@ -61,7 +39,7 @@ const ContractConnectWallet = () => {
ml=
{
2
}
ml=
{
2
}
/>
/>
</
Flex
>
</
Flex
>
<
Button
onClick=
{
handleD
isconnect
}
size=
"sm"
variant=
"outline"
>
Disconnect
</
Button
>
<
Button
onClick=
{
d
isconnect
}
size=
"sm"
variant=
"outline"
>
Disconnect
</
Button
>
</
Flex
>
</
Flex
>
);
);
})();
})();
...
...
ui/snippets/walletMenu/WalletMenuDesktop.tsx
View file @
f238ea85
...
@@ -17,7 +17,7 @@ type Props = {
...
@@ -17,7 +17,7 @@ type Props = {
};
};
const
WalletMenuDesktop
=
({
isHomePage
}:
Props
)
=>
{
const
WalletMenuDesktop
=
({
isHomePage
}:
Props
)
=>
{
const
{
isWalletConnected
,
address
,
connect
,
disconnect
,
isModalOpening
,
isModalOpen
}
=
useWallet
();
const
{
isWalletConnected
,
address
,
connect
,
disconnect
,
isModalOpening
,
isModalOpen
}
=
useWallet
(
{
source
:
'
Header
'
}
);
const
{
themedBackground
,
themedBorderColor
,
themedColor
}
=
useMenuButtonColors
();
const
{
themedBackground
,
themedBorderColor
,
themedColor
}
=
useMenuButtonColors
();
const
[
isPopoverOpen
,
setIsPopoverOpen
]
=
useBoolean
(
false
);
const
[
isPopoverOpen
,
setIsPopoverOpen
]
=
useBoolean
(
false
);
const
isMobile
=
useIsMobile
();
const
isMobile
=
useIsMobile
();
...
...
ui/snippets/walletMenu/WalletMenuMobile.tsx
View file @
f238ea85
...
@@ -13,7 +13,7 @@ import WalletTooltip from './WalletTooltip';
...
@@ -13,7 +13,7 @@ import WalletTooltip from './WalletTooltip';
const
WalletMenuMobile
=
()
=>
{
const
WalletMenuMobile
=
()
=>
{
const
{
isOpen
,
onOpen
,
onClose
}
=
useDisclosure
();
const
{
isOpen
,
onOpen
,
onClose
}
=
useDisclosure
();
const
{
isWalletConnected
,
address
,
connect
,
disconnect
,
isModalOpening
,
isModalOpen
}
=
useWallet
();
const
{
isWalletConnected
,
address
,
connect
,
disconnect
,
isModalOpening
,
isModalOpen
}
=
useWallet
(
{
source
:
'
Header
'
}
);
const
{
themedBackground
,
themedBorderColor
,
themedColor
}
=
useMenuButtonColors
();
const
{
themedBackground
,
themedBorderColor
,
themedColor
}
=
useMenuButtonColors
();
const
isMobile
=
useIsMobile
();
const
isMobile
=
useIsMobile
();
...
...
ui/snippets/walletMenu/useWallet.tsx
View file @
f238ea85
...
@@ -4,12 +4,17 @@ import { useAccount, useDisconnect } from 'wagmi';
...
@@ -4,12 +4,17 @@ import { useAccount, useDisconnect } from 'wagmi';
import
*
as
mixpanel
from
'
lib/mixpanel/index
'
;
import
*
as
mixpanel
from
'
lib/mixpanel/index
'
;
export
default
function
useWallet
()
{
interface
Params
{
source
:
mixpanel
.
EventPayload
<
mixpanel
.
EventTypes
.
WALLET_CONNECT
>
[
'
Source
'
];
}
export
default
function
useWallet
({
source
}:
Params
)
{
const
{
open
}
=
useWeb3Modal
();
const
{
open
}
=
useWeb3Modal
();
const
{
open
:
isOpen
}
=
useWeb3ModalState
();
const
{
open
:
isOpen
}
=
useWeb3ModalState
();
const
{
disconnect
}
=
useDisconnect
();
const
{
disconnect
}
=
useDisconnect
();
const
[
isModalOpening
,
setIsModalOpening
]
=
React
.
useState
(
false
);
const
[
isModalOpening
,
setIsModalOpening
]
=
React
.
useState
(
false
);
const
[
isClientLoaded
,
setIsClientLoaded
]
=
React
.
useState
(
false
);
const
[
isClientLoaded
,
setIsClientLoaded
]
=
React
.
useState
(
false
);
const
isConnectionStarted
=
React
.
useRef
(
false
);
React
.
useEffect
(()
=>
{
React
.
useEffect
(()
=>
{
setIsClientLoaded
(
true
);
setIsClientLoaded
(
true
);
...
@@ -19,12 +24,15 @@ export default function useWallet() {
...
@@ -19,12 +24,15 @@ export default function useWallet() {
setIsModalOpening
(
true
);
setIsModalOpening
(
true
);
await
open
();
await
open
();
setIsModalOpening
(
false
);
setIsModalOpening
(
false
);
mixpanel
.
logEvent
(
mixpanel
.
EventTypes
.
WALLET_CONNECT
,
{
Source
:
'
Header
'
,
Status
:
'
Started
'
});
mixpanel
.
logEvent
(
mixpanel
.
EventTypes
.
WALLET_CONNECT
,
{
Source
:
source
,
Status
:
'
Started
'
});
},
[
open
]);
isConnectionStarted
.
current
=
true
;
},
[
open
,
source
]);
const
handleAccountConnected
=
React
.
useCallback
(({
isReconnected
}:
{
isReconnected
:
boolean
})
=>
{
const
handleAccountConnected
=
React
.
useCallback
(({
isReconnected
}:
{
isReconnected
:
boolean
})
=>
{
!
isReconnected
&&
mixpanel
.
logEvent
(
mixpanel
.
EventTypes
.
WALLET_CONNECT
,
{
Source
:
'
Header
'
,
Status
:
'
Connected
'
});
!
isReconnected
&&
isConnectionStarted
.
current
&&
},
[]);
mixpanel
.
logEvent
(
mixpanel
.
EventTypes
.
WALLET_CONNECT
,
{
Source
:
source
,
Status
:
'
Connected
'
});
isConnectionStarted
.
current
=
false
;
},
[
source
]);
const
handleDisconnect
=
React
.
useCallback
(()
=>
{
const
handleDisconnect
=
React
.
useCallback
(()
=>
{
disconnect
();
disconnect
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment