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
7b3b7864
Unverified
Commit
7b3b7864
authored
Dec 07, 2022
by
lynn
Committed by
GitHub
Dec 07, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: remove border on last item in txn list on wallet dropdown (#5568)
* init * respond to jordan
parent
e35eefbe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
7 deletions
+19
-7
index.tsx
src/components/AccountDetailsV2/index.tsx
+12
-4
TransactionMenu.tsx
src/components/WalletDropdown/TransactionMenu.tsx
+7
-3
No files found.
src/components/AccountDetailsV2/index.tsx
View file @
7b3b7864
...
@@ -4,6 +4,7 @@ import { SupportedChainId } from 'constants/chains'
...
@@ -4,6 +4,7 @@ import { SupportedChainId } from 'constants/chains'
import
{
useMemo
}
from
'
react
'
import
{
useMemo
}
from
'
react
'
import
{
AlertTriangle
,
CheckCircle
}
from
'
react-feather
'
import
{
AlertTriangle
,
CheckCircle
}
from
'
react-feather
'
import
styled
from
'
styled-components/macro
'
import
styled
from
'
styled-components/macro
'
import
{
ExternalLink
}
from
'
theme
'
import
{
colors
}
from
'
theme/colors
'
import
{
colors
}
from
'
theme/colors
'
import
{
TransactionDetails
}
from
'
../../state/transactions/types
'
import
{
TransactionDetails
}
from
'
../../state/transactions/types
'
...
@@ -17,13 +18,14 @@ export enum TransactionState {
...
@@ -17,13 +18,14 @@ export enum TransactionState {
Failed
,
Failed
,
}
}
const
Grid
=
styled
.
a
`
const
Grid
=
styled
(
ExternalLink
)
<
{
isLastTransactionInList
?:
boolean
}
>
`
cursor: pointer;
cursor: pointer;
display: grid;
display: grid;
grid-template-columns: 44px auto 24px;
grid-template-columns: 44px auto 24px;
width: 100%;
width: 100%;
text-decoration: none;
text-decoration: none;
border-bottom:
${({
theme
})
=>
`1px solid
${
theme
.
backgroundOutline
}
`
}
;
border-bottom:
${({
theme
,
isLastTransactionInList
})
=>
isLastTransactionInList
?
'
none
'
:
`1px solid
${
theme
.
backgroundOutline
}
`
}
;
padding: 12px;
padding: 12px;
&:hover {
&:hover {
...
@@ -46,7 +48,13 @@ const IconStyleWrap = styled.span`
...
@@ -46,7 +48,13 @@ const IconStyleWrap = styled.span`
height: 16px;
height: 16px;
`
`
export
const
TransactionSummary
=
({
transactionDetails
}:
{
transactionDetails
:
TransactionDetails
})
=>
{
export
const
TransactionSummary
=
({
transactionDetails
,
isLastTransactionInList
=
false
,
}:
{
transactionDetails
:
TransactionDetails
isLastTransactionInList
?:
boolean
})
=>
{
const
{
chainId
=
1
}
=
useWeb3React
()
const
{
chainId
=
1
}
=
useWeb3React
()
const
tx
=
transactionDetails
const
tx
=
transactionDetails
const
{
explorer
}
=
getChainInfoOrDefault
(
chainId
?
chainId
:
SupportedChainId
.
MAINNET
)
const
{
explorer
}
=
getChainInfoOrDefault
(
chainId
?
chainId
:
SupportedChainId
.
MAINNET
)
...
@@ -67,7 +75,7 @@ export const TransactionSummary = ({ transactionDetails }: { transactionDetails:
...
@@ -67,7 +75,7 @@ export const TransactionSummary = ({ transactionDetails }: { transactionDetails:
const
link
=
`
${
explorer
}
tx/
${
hash
}
`
const
link
=
`
${
explorer
}
tx/
${
hash
}
`
return
chainId
?
(
return
chainId
?
(
<
Grid
href=
{
link
}
target=
"_blank"
>
<
Grid
href=
{
link
}
target=
"_blank"
isLastTransactionInList=
{
isLastTransactionInList
}
>
<
LogoView
info=
{
info
}
/>
<
LogoView
info=
{
info
}
/>
<
TextContainer
as=
"span"
>
<
TextContainer
as=
"span"
>
<
TransactionBody
info=
{
info
}
transactionState=
{
transactionState
}
/>
<
TransactionBody
info=
{
info
}
transactionState=
{
transactionState
}
/>
...
...
src/components/WalletDropdown/TransactionMenu.tsx
View file @
7b3b7864
...
@@ -44,8 +44,12 @@ const TransactionList = ({ transactionInformation }: { transactionInformation: T
...
@@ -44,8 +44,12 @@ const TransactionList = ({ transactionInformation }: { transactionInformation: T
return
(
return
(
<
TransactionListWrapper
key=
{
title
}
>
<
TransactionListWrapper
key=
{
title
}
>
<
TransactionTitle
>
{
title
}
</
TransactionTitle
>
<
TransactionTitle
>
{
title
}
</
TransactionTitle
>
{
transactions
.
map
((
transactionDetails
)
=>
(
{
transactions
.
map
((
transactionDetails
,
index
)
=>
(
<
TransactionSummary
key=
{
transactionDetails
.
hash
}
transactionDetails=
{
transactionDetails
}
/>
<
TransactionSummary
key=
{
transactionDetails
.
hash
}
transactionDetails=
{
transactionDetails
}
isLastTransactionInList=
{
index
===
transactions
.
length
-
1
}
/>
))
}
))
}
</
TransactionListWrapper
>
</
TransactionListWrapper
>
)
)
...
@@ -154,7 +158,7 @@ export const TransactionHistoryMenu = ({ onClose }: { onClose: () => void }) =>
...
@@ -154,7 +158,7 @@ export const TransactionHistoryMenu = ({ onClose }: { onClose: () => void }) =>
<
Divider
/>
<
Divider
/>
{
transactionGroupsInformation
.
length
>
0
?
(
{
transactionGroupsInformation
.
length
>
0
?
(
<>
<>
{
transactionGroupsInformation
.
map
((
transactionInformation
,
index
)
=>
(
{
transactionGroupsInformation
.
map
((
transactionInformation
)
=>
(
<
TransactionList
key=
{
transactionInformation
.
title
}
transactionInformation=
{
transactionInformation
}
/>
<
TransactionList
key=
{
transactionInformation
.
title
}
transactionInformation=
{
transactionInformation
}
/>
))
}
))
}
</>
</>
...
...
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