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
3504d596
Unverified
Commit
3504d596
authored
Dec 26, 2023
by
tom goriunov
Committed by
GitHub
Dec 26, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1450 from blockscout/new-tooltip-for-connect-wallet-button
Add new text for `connect wallet` button tooltip
parents
af9693d7
4bc4e408
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
8 deletions
+24
-8
WalletMenuDesktop.tsx
ui/snippets/walletMenu/WalletMenuDesktop.tsx
+3
-1
WalletMenuMobile.tsx
ui/snippets/walletMenu/WalletMenuMobile.tsx
+3
-1
WalletTooltip.tsx
ui/snippets/walletMenu/WalletTooltip.tsx
+18
-6
No files found.
ui/snippets/walletMenu/WalletMenuDesktop.tsx
View file @
3504d596
...
...
@@ -2,6 +2,7 @@ import type { ButtonProps } from '@chakra-ui/react';
import
{
Popover
,
PopoverContent
,
PopoverBody
,
PopoverTrigger
,
Button
,
Box
,
useBoolean
}
from
'
@chakra-ui/react
'
;
import
React
from
'
react
'
;
import
useIsMobile
from
'
lib/hooks/useIsMobile
'
;
import
AddressIdenticon
from
'
ui/shared/entities/address/AddressIdenticon
'
;
import
HashStringShorten
from
'
ui/shared/HashStringShorten
'
;
import
useWallet
from
'
ui/snippets/walletMenu/useWallet
'
;
...
...
@@ -18,6 +19,7 @@ const WalletMenuDesktop = ({ isHomePage }: Props) => {
const
{
isWalletConnected
,
address
,
connect
,
disconnect
,
isModalOpening
,
isModalOpen
}
=
useWallet
();
const
{
themedBackground
,
themedBorderColor
,
themedColor
}
=
useMenuButtonColors
();
const
[
isPopoverOpen
,
setIsPopoverOpen
]
=
useBoolean
(
false
);
const
isMobile
=
useIsMobile
();
const
variant
=
React
.
useMemo
(()
=>
{
if
(
isWalletConnected
)
{
...
...
@@ -55,7 +57,7 @@ const WalletMenuDesktop = ({ isHomePage }: Props) => {
isOpen=
{
isPopoverOpen
}
onClose=
{
setIsPopoverOpen
.
off
}
>
<
WalletTooltip
isDisabled=
{
isWalletConnected
}
>
<
WalletTooltip
isDisabled=
{
isWalletConnected
||
isMobile
===
undefined
||
isMobile
}
>
<
Box
ml=
{
2
}
>
<
PopoverTrigger
>
<
Button
...
...
ui/snippets/walletMenu/WalletMenuMobile.tsx
View file @
3504d596
...
...
@@ -2,6 +2,7 @@ import { Drawer, DrawerOverlay, DrawerContent, DrawerBody, useDisclosure, IconBu
import
React
from
'
react
'
;
import
walletIcon
from
'
icons/wallet.svg
'
;
import
useIsMobile
from
'
lib/hooks/useIsMobile
'
;
import
AddressIdenticon
from
'
ui/shared/entities/address/AddressIdenticon
'
;
import
useWallet
from
'
ui/snippets/walletMenu/useWallet
'
;
import
WalletMenuContent
from
'
ui/snippets/walletMenu/WalletMenuContent
'
;
...
...
@@ -13,10 +14,11 @@ const WalletMenuMobile = () => {
const
{
isOpen
,
onOpen
,
onClose
}
=
useDisclosure
();
const
{
isWalletConnected
,
address
,
connect
,
disconnect
,
isModalOpening
,
isModalOpen
}
=
useWallet
();
const
{
themedBackground
,
themedBorderColor
,
themedColor
}
=
useMenuButtonColors
();
const
isMobile
=
useIsMobile
();
return
(
<>
<
WalletTooltip
isDisabled=
{
isWalletConnected
}
isMobile
>
<
WalletTooltip
isDisabled=
{
isWalletConnected
||
isMobile
===
undefined
||
!
isMobile
}
isMobile
>
<
IconButton
aria
-
label=
"wallet menu"
icon=
{
isWalletConnected
?
...
...
ui/snippets/walletMenu/WalletTooltip.tsx
View file @
3504d596
import
{
Tooltip
,
useBoolean
,
useOutsideClick
}
from
'
@chakra-ui/react
'
;
import
{
useRouter
}
from
'
next/router
'
;
import
React
from
'
react
'
;
type
Props
=
{
...
...
@@ -8,22 +9,33 @@ type Props = {
};
const
WalletTooltip
=
({
children
,
isDisabled
,
isMobile
}:
Props
)
=>
{
const
router
=
useRouter
();
const
[
isTooltipShown
,
setIsTooltipShown
]
=
useBoolean
(
false
);
const
ref
=
React
.
useRef
(
null
);
useOutsideClick
({
ref
,
handler
:
setIsTooltipShown
.
off
});
const
{
defaultLabel
,
label
,
localStorageKey
}
=
React
.
useMemo
(()
=>
{
const
isAppPage
=
router
.
pathname
===
'
/apps/[id]
'
;
const
defaultLabel
=
<
span
>
Your wallet is used to interact with
<
br
/>
apps and contracts in the explorer
</
span
>;
const
label
=
isAppPage
?
<
span
>
Connect once to use your wallet with
<
br
/>
all apps in the DAppscout marketplace!
</
span
>
:
defaultLabel
;
const
localStorageKey
=
`
${
isAppPage
?
'
dapp-
'
:
''
}
wallet-connect-tooltip-shown`
;
return
{
defaultLabel
,
label
,
localStorageKey
};
},
[
router
.
pathname
]);
React
.
useEffect
(()
=>
{
const
key
=
`wallet-connect-tooltip-shown-
${
isMobile
?
'
mobile
'
:
'
desktop
'
}
`
;
const
wasShown
=
window
.
localStorage
.
getItem
(
key
);
if
(
!
wasShown
)
{
const
wasShown
=
window
.
localStorage
.
getItem
(
localStorageKey
);
if
(
!
isDisabled
&&
!
wasShown
)
{
setIsTooltipShown
.
on
();
window
.
localStorage
.
setItem
(
key
,
'
true
'
);
window
.
localStorage
.
setItem
(
localStorageKey
,
'
true
'
);
setTimeout
(()
=>
setIsTooltipShown
.
off
(),
3000
);
}
},
[
setIsTooltipShown
,
isMobile
]);
},
[
setIsTooltipShown
,
localStorageKey
,
isDisabled
]);
return
(
<
Tooltip
label=
{
<
span
>
Your wallet is used to interact with
<
br
/>
apps and contracts in the explorer
</
span
>
}
label=
{
isTooltipShown
?
label
:
defaultLabel
}
textAlign=
"center"
padding=
{
2
}
isDisabled=
{
isDisabled
}
...
...
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