Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: release v1.642.0 #7390

Merged
merged 2 commits into from
Jul 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .env.app
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# feature flags
REACT_APP_FEATURE_CHATWOOT=true
REACT_APP_FEATURE_LIFI_SWAP=false

# mixpanel
REACT_APP_MIXPANEL_TOKEN=9d304465fc72224aead9e027e7c24356
Expand Down
2 changes: 1 addition & 1 deletion .env.base
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ REACT_APP_FEATURE_READ_ONLY_ASSETS=true
REACT_APP_FEATURE_COWSWAP=true
REACT_APP_FEATURE_COWSWAP_GNOSIS=true
REACT_APP_FEATURE_COWSWAP_ARBITRUM=false
REACT_APP_FEATURE_LIFI_SWAP=false
REACT_APP_FEATURE_LIFI_SWAP=true
REACT_APP_FEATURE_ONE_INCH=false
REACT_APP_FEATURE_THOR_SWAP=true
REACT_APP_FEATURE_THOR_SWAP_STREAMING_SWAPS=true
Expand Down
1 change: 0 additions & 1 deletion .env.private
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# feature flags
REACT_APP_FEATURE_MIXPANEL=false
REACT_APP_FEATURE_CHATWOOT=false
REACT_APP_FEATURE_LIFI_SWAP=false

# unchained
REACT_APP_UNCHAINED_ETHEREUM_HTTP_URL=https://api.ethereum.shapeshift.com
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

81 changes: 44 additions & 37 deletions scripts/generateAssetData/colorMap/color-map.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Box, Button, Card, Icon, Link, Switch, Tooltip, VStack } from '@chakra-ui/react'
import type { TradeQuoteStep } from '@shapeshiftoss/swapper'
import { SwapperName } from '@shapeshiftoss/swapper'
import { useCallback, useMemo } from 'react'
import { FaInfoCircle } from 'react-icons/fa'
import { useTranslate } from 'react-polyglot'
Expand Down Expand Up @@ -76,7 +77,12 @@ const ApprovalStepPending = ({
number: { toCrypto },
} = useLocaleFormatter()

const [isExactAllowance, toggleIsExactAllowance] = useToggle(false)
const isLifiStep = useMemo(() => {
return tradeQuoteStep.source.startsWith(SwapperName.LIFI)
}, [tradeQuoteStep.source])

// Default to exact allowance for LiFi due to contract vulnerabilities
const [isExactAllowance, toggleIsExactAllowance] = useToggle(isLifiStep ? true : false)

const {
state,
Expand Down Expand Up @@ -163,7 +169,7 @@ const ApprovalStepPending = ({
size='sm'
mx={2}
isChecked={isExactAllowance}
disabled={!canAttemptApproval}
disabled={!canAttemptApproval || isLifiStep}
onChange={toggleIsExactAllowance}
/>
<Text
Expand Down Expand Up @@ -193,6 +199,7 @@ const ApprovalStepPending = ({
isActive,
isAllowanceApprovalLoading,
isExactAllowance,
isLifiStep,
toggleIsExactAllowance,
translate,
])
Expand Down
1,182 changes: 611 additions & 571 deletions src/lib/asset-service/service/generatedAssetData.json

Large diffs are not rendered by default.

21,012 changes: 10,507 additions & 10,505 deletions src/lib/asset-service/service/relatedAssetIndex.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/state/migrations/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,5 @@ export const migrations = {
73: clearAssets,
74: clearAssets,
75: clearAssets,
76: clearAssets,
}
Loading