Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
interface
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
LuckySwap
interface
Commits
236a4dc1
Unverified
Commit
236a4dc1
authored
Mar 21, 2023
by
Jordan Frankfurt
Committed by
GitHub
Mar 21, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: add tax service discount to help menu (#6211)
parent
991d07ef
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
11 deletions
+29
-11
MenuDropdown.tsx
src/components/NavBar/MenuDropdown.tsx
+10
-1
TaxServiceBanner.tsx
src/components/TaxServiceModal/TaxServiceBanner.tsx
+14
-10
hooks.ts
src/state/application/hooks.ts
+4
-0
reducer.ts
src/state/application/reducer.ts
+1
-0
No files found.
src/components/NavBar/MenuDropdown.tsx
View file @
236a4dc1
...
@@ -19,7 +19,7 @@ import { NavLink, NavLinkProps } from 'react-router-dom'
...
@@ -19,7 +19,7 @@ import { NavLink, NavLinkProps } from 'react-router-dom'
import
styled
from
'
styled-components/macro
'
import
styled
from
'
styled-components/macro
'
import
{
isDevelopmentEnv
,
isStagingEnv
}
from
'
utils/env
'
import
{
isDevelopmentEnv
,
isStagingEnv
}
from
'
utils/env
'
import
{
useToggleModal
}
from
'
../../state/application/hooks
'
import
{
useToggleModal
,
useToggleTaxServiceModal
}
from
'
../../state/application/hooks
'
import
{
ApplicationModal
}
from
'
../../state/application/reducer
'
import
{
ApplicationModal
}
from
'
../../state/application/reducer
'
import
*
as
styles
from
'
./MenuDropdown.css
'
import
*
as
styles
from
'
./MenuDropdown.css
'
import
{
NavDropdown
}
from
'
./NavDropdown
'
import
{
NavDropdown
}
from
'
./NavDropdown
'
...
@@ -123,6 +123,7 @@ export const MenuDropdown = () => {
...
@@ -123,6 +123,7 @@ export const MenuDropdown = () => {
const
openFeatureFlagsModal
=
useToggleModal
(
ApplicationModal
.
FEATURE_FLAGS
)
const
openFeatureFlagsModal
=
useToggleModal
(
ApplicationModal
.
FEATURE_FLAGS
)
const
ref
=
useRef
<
HTMLDivElement
>
(
null
)
const
ref
=
useRef
<
HTMLDivElement
>
(
null
)
useOnClickOutside
(
ref
,
isOpen
?
toggleOpen
:
undefined
)
useOnClickOutside
(
ref
,
isOpen
?
toggleOpen
:
undefined
)
const
toggleTaxServiceModal
=
useToggleTaxServiceModal
()
return
(
return
(
<>
<>
...
@@ -163,6 +164,14 @@ export const MenuDropdown = () => {
...
@@ -163,6 +164,14 @@ export const MenuDropdown = () => {
<
SecondaryLinkedText
href=
"https://help.uniswap.org/en/"
>
<
SecondaryLinkedText
href=
"https://help.uniswap.org/en/"
>
<
Trans
>
Help center
</
Trans
>
↗
<
Trans
>
Help center
</
Trans
>
↗
</
SecondaryLinkedText
>
</
SecondaryLinkedText
>
<
SecondaryLinkedText
onClick=
{
()
=>
{
toggleTaxServiceModal
()
toggleOpen
()
}
}
>
<
Trans
>
Save on Tax Services
</
Trans
>
↗
</
SecondaryLinkedText
>
<
SecondaryLinkedText
href=
"https://docs.uniswap.org/"
>
<
SecondaryLinkedText
href=
"https://docs.uniswap.org/"
>
<
Trans
>
Documentation
</
Trans
>
↗
<
Trans
>
Documentation
</
Trans
>
↗
</
SecondaryLinkedText
>
</
SecondaryLinkedText
>
...
...
src/components/TaxServiceModal/TaxServiceBanner.tsx
View file @
236a4dc1
...
@@ -5,6 +5,8 @@ import { ButtonEmphasis, ButtonSize, ThemeButton } from 'components/Button'
...
@@ -5,6 +5,8 @@ import { ButtonEmphasis, ButtonSize, ThemeButton } from 'components/Button'
import
{
bodySmall
,
subhead
}
from
'
nft/css/common.css
'
import
{
bodySmall
,
subhead
}
from
'
nft/css/common.css
'
import
{
useCallback
,
useState
}
from
'
react
'
import
{
useCallback
,
useState
}
from
'
react
'
import
{
X
}
from
'
react-feather
'
import
{
X
}
from
'
react-feather
'
import
{
useModalIsOpen
,
useToggleTaxServiceModal
}
from
'
state/application/hooks
'
import
{
ApplicationModal
}
from
'
state/application/reducer
'
import
{
useTaxServiceDismissal
}
from
'
state/user/hooks
'
import
{
useTaxServiceDismissal
}
from
'
state/user/hooks
'
import
{
useIsDarkMode
}
from
'
state/user/hooks
'
import
{
useIsDarkMode
}
from
'
state/user/hooks
'
import
styled
from
'
styled-components/macro
'
import
styled
from
'
styled-components/macro
'
...
@@ -117,7 +119,9 @@ const MAX_RENDER_COUNT = 1
...
@@ -117,7 +119,9 @@ const MAX_RENDER_COUNT = 1
export
default
function
TaxServiceBanner
()
{
export
default
function
TaxServiceBanner
()
{
const
isDarkMode
=
useIsDarkMode
()
const
isDarkMode
=
useIsDarkMode
()
const
[
dismissals
,
addTaxServiceDismissal
]
=
useTaxServiceDismissal
()
const
[
dismissals
,
addTaxServiceDismissal
]
=
useTaxServiceDismissal
()
const
[
modalOpen
,
setModalOpen
]
=
useState
(
false
)
const
modalOpen
=
useModalIsOpen
(
ApplicationModal
.
TAX_SERVICE
)
const
toggleTaxServiceModal
=
useToggleTaxServiceModal
()
const
sessionStorageTaxServiceDismissed
=
sessionStorage
.
getItem
(
TAX_SERVICE_DISMISSED
)
const
sessionStorageTaxServiceDismissed
=
sessionStorage
.
getItem
(
TAX_SERVICE_DISMISSED
)
if
(
!
sessionStorageTaxServiceDismissed
)
{
if
(
!
sessionStorageTaxServiceDismissed
)
{
...
@@ -126,9 +130,6 @@ export default function TaxServiceBanner() {
...
@@ -126,9 +130,6 @@ export default function TaxServiceBanner() {
const
[
bannerOpen
,
setBannerOpen
]
=
useState
(
const
[
bannerOpen
,
setBannerOpen
]
=
useState
(
sessionStorageTaxServiceDismissed
!==
'
true
'
&&
(
dismissals
===
undefined
||
dismissals
<
MAX_RENDER_COUNT
)
sessionStorageTaxServiceDismissed
!==
'
true
'
&&
(
dismissals
===
undefined
||
dismissals
<
MAX_RENDER_COUNT
)
)
)
const
onDismiss
=
useCallback
(()
=>
{
setModalOpen
(
false
)
},
[])
const
handleClose
=
useCallback
(()
=>
{
const
handleClose
=
useCallback
(()
=>
{
sessionStorage
.
setItem
(
TAX_SERVICE_DISMISSED
,
'
true
'
)
sessionStorage
.
setItem
(
TAX_SERVICE_DISMISSED
,
'
true
'
)
...
@@ -136,11 +137,14 @@ export default function TaxServiceBanner() {
...
@@ -136,11 +137,14 @@ export default function TaxServiceBanner() {
dismissals
===
undefined
?
addTaxServiceDismissal
(
1
)
:
addTaxServiceDismissal
(
dismissals
+
1
)
dismissals
===
undefined
?
addTaxServiceDismissal
(
1
)
:
addTaxServiceDismissal
(
dismissals
+
1
)
},
[
addTaxServiceDismissal
,
dismissals
])
},
[
addTaxServiceDismissal
,
dismissals
])
const
handleLearnMoreClick
=
useCallback
((
e
:
any
)
=>
{
const
handleLearnMoreClick
=
useCallback
(
(
e
:
any
)
=>
{
e
.
preventDefault
()
e
.
preventDefault
()
e
.
stopPropagation
()
e
.
stopPropagation
()
setModalOpen
(
true
)
toggleTaxServiceModal
()
},
[])
},
[
toggleTaxServiceModal
]
)
return
(
return
(
<
PopupContainer
show=
{
bannerOpen
}
isDarkMode=
{
isDarkMode
}
>
<
PopupContainer
show=
{
bannerOpen
}
isDarkMode=
{
isDarkMode
}
>
...
@@ -175,7 +179,7 @@ export default function TaxServiceBanner() {
...
@@ -175,7 +179,7 @@ export default function TaxServiceBanner() {
</
Button
>
</
Button
>
</
TraceEvent
>
</
TraceEvent
>
</
InnerContainer
>
</
InnerContainer
>
<
TaxServiceModal
isOpen=
{
modalOpen
}
onDismiss=
{
onDismiss
}
/>
<
TaxServiceModal
isOpen=
{
modalOpen
}
onDismiss=
{
toggleTaxServiceModal
}
/>
</
PopupContainer
>
</
PopupContainer
>
)
)
}
}
src/state/application/hooks.ts
View file @
236a4dc1
...
@@ -122,6 +122,10 @@ export function useToggleSelfClaimModal(): () => void {
...
@@ -122,6 +122,10 @@ export function useToggleSelfClaimModal(): () => void {
return
useToggleModal
(
ApplicationModal
.
SELF_CLAIM
)
return
useToggleModal
(
ApplicationModal
.
SELF_CLAIM
)
}
}
export
function
useToggleTaxServiceModal
():
()
=>
void
{
return
useToggleModal
(
ApplicationModal
.
TAX_SERVICE
)
}
export
function
useToggleDelegateModal
():
()
=>
void
{
export
function
useToggleDelegateModal
():
()
=>
void
{
return
useToggleModal
(
ApplicationModal
.
DELEGATE
)
return
useToggleModal
(
ApplicationModal
.
DELEGATE
)
}
}
...
...
src/state/application/reducer.ts
View file @
236a4dc1
...
@@ -30,6 +30,7 @@ export enum ApplicationModal {
...
@@ -30,6 +30,7 @@ export enum ApplicationModal {
SELF_CLAIM
,
SELF_CLAIM
,
SETTINGS
,
SETTINGS
,
SHARE
,
SHARE
,
TAX_SERVICE
,
TIME_SELECTOR
,
TIME_SELECTOR
,
VOTE
,
VOTE
,
WALLET
,
WALLET
,
...
...
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