Commit 6926f9a4 authored by Moody Salem's avatar Moody Salem

fix(flatMap): don't use the native flatMap function, bump release plugin version

parent 7dec5809
...@@ -24,7 +24,7 @@ jobs: ...@@ -24,7 +24,7 @@ jobs:
- name: Bump version and push tag - name: Bump version and push tag
id: github_tag_action id: github_tag_action
uses: mathieudutour/github-tag-action@v4.2 uses: mathieudutour/github-tag-action@v4.3
with: with:
github_token: ${{ secrets.GITHUB_TOKEN }} github_token: ${{ secrets.GITHUB_TOKEN }}
release_branches: .* release_branches: .*
......
...@@ -13,6 +13,7 @@ import { RowBetween, RowFixed } from '../Row' ...@@ -13,6 +13,7 @@ import { RowBetween, RowFixed } from '../Row'
import SlippageTabs, { SlippageTabsProps } from '../SlippageTabs' import SlippageTabs, { SlippageTabsProps } from '../SlippageTabs'
import FormattedPriceImpact from './FormattedPriceImpact' import FormattedPriceImpact from './FormattedPriceImpact'
import TokenLogo from '../TokenLogo' import TokenLogo from '../TokenLogo'
import flatMap from 'lodash.flatmap'
export interface AdvancedSwapDetailsProps extends SlippageTabsProps { export interface AdvancedSwapDetailsProps extends SlippageTabsProps {
trade: Trade trade: Trade
...@@ -109,27 +110,28 @@ export function AdvancedSwapDetails({ trade, onDismiss, ...slippageTabProps }: A ...@@ -109,27 +110,28 @@ export function AdvancedSwapDetails({ trade, onDismiss, ...slippageTabProps }: A
justifyContent="space-evenly" justifyContent="space-evenly"
alignItems="center" alignItems="center"
> >
{trade.route.path {flatMap(
trade.route.path,
// add a null in-between each item // add a null in-between each item
.flatMap((token, i, array) => { (token, i, array) => {
const lastItem = i === array.length - 1 const lastItem = i === array.length - 1
return lastItem ? [token] : [token, null] return lastItem ? [token] : [token, null]
}) }
.map((token, i) => { ).map((token, i) => {
// use null as an indicator to insert chevrons // use null as an indicator to insert chevrons
if (token === null) { if (token === null) {
return <ChevronRight key={i} color={theme.text2} /> return <ChevronRight key={i} color={theme.text2} />
} else { } else {
return ( return (
<Flex my="0.5rem" alignItems="center" key={token.address} style={{ flexShrink: 0 }}> <Flex my="0.5rem" alignItems="center" key={token.address} style={{ flexShrink: 0 }}>
<TokenLogo address={token.address} size="1.5rem" /> <TokenLogo address={token.address} size="1.5rem" />
<TYPE.black fontSize={14} color={theme.text1} ml="0.5rem"> <TYPE.black fontSize={14} color={theme.text1} ml="0.5rem">
{token.symbol} {token.symbol}
</TYPE.black> </TYPE.black>
</Flex> </Flex>
) )
} }
})} })}
</Flex> </Flex>
</AutoColumn> </AutoColumn>
)} )}
......
...@@ -14,6 +14,7 @@ import { ...@@ -14,6 +14,7 @@ import {
SerializedToken, SerializedToken,
updateUserDarkMode updateUserDarkMode
} from './actions' } from './actions'
import flatMap from 'lodash.flatmap'
function serializeToken(token: Token): SerializedToken { function serializeToken(token: Token): SerializedToken {
return { return {
...@@ -165,10 +166,11 @@ export function useAllDummyPairs(): Pair[] { ...@@ -165,10 +166,11 @@ export function useAllDummyPairs(): Pair[] {
const generatedPairs: Pair[] = useMemo( const generatedPairs: Pair[] = useMemo(
() => () =>
Object.values(tokens) flatMap(
// select only tokens on the current chain Object.values(tokens)
.filter(token => token.chainId === chainId) // select only tokens on the current chain
.flatMap(token => { .filter(token => token.chainId === chainId),
token => {
// for each token on the current chain, // for each token on the current chain,
return ( return (
bases bases
...@@ -184,7 +186,8 @@ export function useAllDummyPairs(): Pair[] { ...@@ -184,7 +186,8 @@ export function useAllDummyPairs(): Pair[] {
}) })
.filter(pair => !!pair) as Pair[] .filter(pair => !!pair) as Pair[]
) )
}), }
),
[tokens, chainId] [tokens, chainId]
) )
......
...@@ -2818,6 +2818,18 @@ ...@@ -2818,6 +2818,18 @@
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA== integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
"@types/lodash.flatmap@^4.5.6":
version "4.5.6"
resolved "https://registry.yarnpkg.com/@types/lodash.flatmap/-/lodash.flatmap-4.5.6.tgz#5f1ea80cebe403f0fbfcc1b5ad75cd09dd8b5785"
integrity sha512-ELNrUL9q+MB7AACaHivWIsKDFDgYhHE3/svXhqvDJgONtn2c467Cy87nEb7CEDvfaGCPv91lPaW596I8s5oiNQ==
dependencies:
"@types/lodash" "*"
"@types/lodash@*":
version "4.14.153"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.153.tgz#5cb7dded0649f1df97938ac5ffc4f134e9e9df98"
integrity sha512-lYniGRiRfZf2gGAR9cfRC3Pi5+Q1ziJCKqPmjZocigrSJUVPWf7st1BtSJ8JOeK0FLXVndQ1IjUjTco9CXGo/Q==
"@types/lodash@4.14.149": "@types/lodash@4.14.149":
version "4.14.149" version "4.14.149"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.149.tgz#1342d63d948c6062838fbf961012f74d4e638440" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.149.tgz#1342d63d948c6062838fbf961012f74d4e638440"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment