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.765.0 #8805

Merged
merged 8 commits into from
Feb 12, 2025
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
2 changes: 1 addition & 1 deletion .env.base
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ REACT_APP_FEATURE_LIMIT_ORDERS=true
REACT_APP_FEATURE_NEW_WALLET_FLOW=true
REACT_APP_FEATURE_FOX_PAGE_FOX_WIF_HAT_SECTION=true
REACT_APP_FEATURE_NEW_LIMIT_FLOW=true
REACT_APP_FEATURE_THORCHAIN_SWAPPER_ACK=true
REACT_APP_FEATURE_THORCHAIN_SWAPPER_ACK=false

# absolute URL prefix
REACT_APP_ABSOLUTE_URL_PREFIX=https://app.shapeshift.com
Expand Down
1 change: 0 additions & 1 deletion src/assets/translations/de/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
"seeAll": "Alles ansehen",
"darkMode": "Dunkler Modus",
"darkTheme": "Dunkle Farben",
"lightTheme": "Helle Farben",
"rename": "Umbenennen",
"forget": "Vergessen?",
"pending": "Ausstehend",
Expand Down
1 change: 0 additions & 1 deletion src/assets/translations/en/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
"seeAll": "See All",
"darkMode": "Dark Mode",
"darkTheme": "Dark Theme",
"lightTheme": "Light Theme",
"rename": "Rename",
"forget": "Forget?",
"pending": "Pending",
Expand Down
1 change: 0 additions & 1 deletion src/assets/translations/es/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
"seeAll": "Ver Todo",
"darkMode": "Modo Oscuro",
"darkTheme": "Tema oscuro",
"lightTheme": "Tema claro",
"rename": "Renombrar",
"forget": "Olvidar?",
"pending": "Pendiente",
Expand Down
1 change: 0 additions & 1 deletion src/assets/translations/fr/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
"seeAll": "Tout voir",
"darkMode": "Mode Sombre",
"darkTheme": "Thème sombre",
"lightTheme": "Thème clair",
"rename": "Renommer",
"forget": "Oublier ?",
"pending": "En attente",
Expand Down
1 change: 0 additions & 1 deletion src/assets/translations/id/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"seeAll": "Lihat Semua",
"darkMode": "Mode Malam",
"darkTheme": "Tema gelap",
"lightTheme": "Tema Terang",
"rename": "Ganti Nama",
"forget": "Lupa?",
"pending": "Tertunda",
Expand Down
1 change: 0 additions & 1 deletion src/assets/translations/ja/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
"seeAll": "すべてを見る",
"darkMode": "ダークモード",
"darkTheme": "ダークテーマ",
"lightTheme": "ライトテーマ",
"rename": "名前の変更",
"forget": "お忘れですか?",
"pending": "保留中",
Expand Down
1 change: 0 additions & 1 deletion src/assets/translations/ko/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"seeAll": "전체 보기",
"darkMode": "다크 모드",
"darkTheme": "다크 모드",
"lightTheme": "라이트 모드",
"rename": "이름 바꾸기",
"forget": "삭제하시겠습니까?",
"pending": "보류 중",
Expand Down
1 change: 0 additions & 1 deletion src/assets/translations/pt/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
"seeAll": "Ver tudo",
"darkMode": "Modo noturno",
"darkTheme": "Tema Escuro",
"lightTheme": "Tema Claro",
"rename": "Renomear",
"forget": "Esqueceu?",
"pending": "Pendente",
Expand Down
1 change: 0 additions & 1 deletion src/assets/translations/ru/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
"seeAll": "Посмотреть все",
"darkMode": "Темный режим",
"darkTheme": "Темная тема",
"lightTheme": "Светлая тема",
"rename": "Переименовать",
"forget": "Забыл?",
"pending": "В ожидании",
Expand Down
1 change: 0 additions & 1 deletion src/assets/translations/tr/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
"seeAll": "Hepsini Gör",
"darkMode": "Karanlık Mod",
"darkTheme": "Karanlık Tema",
"lightTheme": "Açık Tema",
"rename": "İsim Değiştir",
"forget": "Unut?",
"pending": "Beklemede",
Expand Down
1 change: 0 additions & 1 deletion src/assets/translations/uk/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
"seeAll": "Переглянути все",
"darkMode": "Темний режим",
"darkTheme": "Темна тема",
"lightTheme": "Світла тема",
"rename": "Перейменувати",
"forget": "Забули?",
"pending": "Розглядається",
Expand Down
1 change: 0 additions & 1 deletion src/assets/translations/zh/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
"seeAll": "查看全部",
"darkMode": "深色模式",
"darkTheme": "深色主题",
"lightTheme": "浅色主题",
"rename": "重命名",
"forget": "忘记?",
"pending": "待处理",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const AssetMenuButton = ({
isLoading={isLoading}
{...buttonProps}
>
<Flex alignItems='center' gap={2} width='100%' overflow='hidden'>
<Flex alignItems='center' gap={2} width='100%' overflow='visible' mx={1}>
{icon}
<Text as='span' textOverflow='ellipsis' overflow='hidden'>
{asset?.symbol}
Expand Down
16 changes: 8 additions & 8 deletions src/components/FeeExplainer/FeeSliders.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -134,17 +134,17 @@ export const FeeSliders: React.FC<FeeSlidersProps> = ({
<SliderFilledTrack bg='blue.500' />
</SliderTrack>
<SliderThumb />
<SliderMark value={250000} {...labelStyles}>
250k
<SliderMark value={150000} {...labelStyles}>
150k
</SliderMark>
<SliderMark value={500000} {...labelStyles}>
500k
<SliderMark value={300000} {...labelStyles}>
300k
</SliderMark>
<SliderMark value={750000} {...labelStyles}>
750k
<SliderMark value={450000} {...labelStyles}>
450k
</SliderMark>
<SliderMark value={1000000} {...labelStyles}>
1MM
<SliderMark value={600000} {...labelStyles}>
600k
</SliderMark>
<SliderMark
value={
Expand Down
2 changes: 1 addition & 1 deletion src/components/FeeExplainer/common.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export const CHART_TRADE_SIZE_MAX_USD = 400000
export const CHART_TRADE_SIZE_MAX_FOX = 1100000 // let them go a bit past a millionexport const labelStyles = {
export const CHART_TRADE_SIZE_MAX_FOX = 700000 // let the user go a bit past the top bracket

export const labelStyles = {
fontSize: 'xs',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const DrawerContentWrapper = ({
}: DrawerContentWrapperProps) => {
return (
<>
<DrawerHeader>
<DrawerHeader pt='calc(env(safe-area-inset-top) + 1rem)'>
{title && <RawText as='h3'>{title}</RawText>}
{description && (
<RawText color='text.subtle' fontSize='md'>
Expand All @@ -25,7 +25,7 @@ export const DrawerContentWrapper = ({
)}
</DrawerHeader>
{body && <DrawerBody>{body}</DrawerBody>}
<DrawerFooter>{footer}</DrawerFooter>
<DrawerFooter pb='calc(env(safe-area-inset-bottom) + 1rem)'>{footer}</DrawerFooter>
</>
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const DrawerWrapper = ({ children, isOpen, onClose, variant }: DrawerWrap
<Drawer isOpen={isOpen} size='lg' placement='right' onClose={onClose} variant={variant}>
<DrawerOverlay zIndex='modal' />
<DrawerContent>
<DrawerCloseButton />
<DrawerCloseButton top='calc(env(safe-area-inset-top) + 1rem)' />
{children}
</DrawerContent>
</Drawer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,23 @@ const TableRow = forwardRef<TableRowProps, 'div'>(
))
}, [asset, isAccountActive, otherAccountIds, ref])

const toggleSize = useMemo(
() => ({
base: 'md',
md: 'lg',
}),
[],
)

return (
<>
<Tr opacity={isAccountActive ? '1' : '0.5'}>
<Td>
<Switch size='lg' isChecked={isAccountActive} onChange={handleToggleIsAccountActive} />
<Switch
size={toggleSize}
isChecked={isAccountActive}
onChange={handleToggleIsAccountActive}
/>
</Td>
<Td>
<RawText color='text.subtle'>{accountNumber}</RawText>
Expand Down Expand Up @@ -397,6 +409,14 @@ export const ImportAccounts = ({ chainId, onClose }: ImportAccountsProps) => {
})
}, [accounts, asset, handleToggleAccountIds])

const tableSize = useMemo(
() => ({
base: 'sm',
md: 'md',
}),
[],
)

if (!asset) {
console.error(`No fee asset found for chainId: ${chainId}`)
return null
Expand Down Expand Up @@ -430,7 +450,7 @@ export const ImportAccounts = ({ chainId, onClose }: ImportAccountsProps) => {
body={
<>
<TableContainer mb={4}>
<Table variant='simple'>
<Table variant='simple' size={tableSize}>
<Tbody>
{accountRows}
{(isFetching || isLoading || autoFetching) && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ export type SelectChainProps = {
onClose: () => void
}

const buttonsStackColumns = {
base: 2,
md: 3,
}

const ChainButton = ({
chainId,
onClick,
Expand Down Expand Up @@ -104,7 +109,7 @@ export const SelectChain = ({ onSelectChainId, onClose }: SelectChainProps) => {
placeholder={translate('accountManagement.selectChain.searchChains')}
inputGroupProps={inputGroupProps}
/>
<SimpleGrid columns={3} spacing={4}>
<SimpleGrid columns={buttonsStackColumns} spacing={4}>
{chainButtons}
</SimpleGrid>
</Stack>
Expand Down
9 changes: 7 additions & 2 deletions src/components/MobileWalletDialog/MobileWalletDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,14 @@ import { MobileWalletDialogRoutes } from './types'
type MobileWalletDialogProps = {
isOpen: boolean
onClose: () => void
defaultRoute?: MobileWalletDialogRoutes
}

export const MobileWalletDialog: React.FC<MobileWalletDialogProps> = ({ isOpen, onClose }) => {
export const MobileWalletDialog: React.FC<MobileWalletDialogProps> = ({
isOpen,
onClose,
defaultRoute = MobileWalletDialogRoutes.Saved,
}) => {
return (
<Dialog isOpen={isOpen} onClose={onClose} height='auto' isDisablingPropagation={false}>
<MemoryRouter>
Expand All @@ -37,7 +42,7 @@ export const MobileWalletDialog: React.FC<MobileWalletDialogProps> = ({ isOpen,
<Route path={MobileWalletDialogRoutes.Create}>
<CreateWalletRouter onClose={onClose} />
</Route>
<Redirect exact from='/' to={MobileWalletDialogRoutes.Saved} />
<Redirect exact from='/' to={defaultRoute} />
</Switch>
</AnimatePresence>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ import { addWallet } from 'context/WalletProvider/MobileWallet/mobileMessageHand
import type { RevocableWallet } from 'context/WalletProvider/MobileWallet/RevocableWallet'
import type { MobileLocationState } from 'context/WalletProvider/MobileWallet/types'
import { useWallet } from 'hooks/useWallet/useWallet'
import { preferences } from 'state/slices/preferencesSlice/preferencesSlice'
import { useAppDispatch } from 'state/store'

import { MobileWalletDialogRoutes } from '../../types'

Expand All @@ -55,6 +57,8 @@ export const CreateBackupConfirm = () => {
const { dispatch, getAdapter } = useWallet()
const localWallet = useLocalWallet()
const [isLoading, setIsLoading] = useState(false)
const appDispatch = useAppDispatch()
const { setWelcomeModal } = preferences.actions

const backgroundDottedSx = useMemo(
() => ({
Expand Down Expand Up @@ -162,12 +166,20 @@ export const CreateBackupConfirm = () => {
return
}

appDispatch(setWelcomeModal({ show: true }))
await handleWalletSelect(wallet)
await queryClient.invalidateQueries({ queryKey: ['listWallets'] })
history.push(MobileWalletDialogRoutes.CreateBackupSuccess)
wallet.revoke()
}
}, [location.state?.vault, handleWalletSelect, queryClient, history])
}, [
location.state?.vault,
handleWalletSelect,
queryClient,
history,
appDispatch,
setWelcomeModal,
])

const handleWordClick = useCallback(
(word: string) => {
Expand Down Expand Up @@ -214,8 +226,8 @@ export const CreateBackupConfirm = () => {
<DialogBackButton onClick={handleBack} />
</DialogHeaderLeft>
<DialogHeaderMiddle>
<Box minWidth='40px'>
<CarouselDots length={3} activeIndex={2} />
<Box minWidth='50px'>
<CarouselDots length={4} activeIndex={4} />
</Box>
</DialogHeaderMiddle>
<DialogHeaderRight>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
import { Box, Button, Icon, Text, VStack } from '@chakra-ui/react'
import { Button, Icon, Text, VStack } from '@chakra-ui/react'
import { useCallback } from 'react'
import { IoIosCheckmarkCircle } from 'react-icons/io'
import { useTranslate } from 'react-polyglot'
import { CarouselDots } from 'components/CarouselDots/CarouselDots'
import { DialogBody } from 'components/Modal/components/DialogBody'
import { DialogCloseButton } from 'components/Modal/components/DialogCloseButton'
import { DialogFooter } from 'components/Modal/components/DialogFooter'
import {
DialogHeader,
DialogHeaderMiddle,
DialogHeaderRight,
} from 'components/Modal/components/DialogHeader'
import { DialogHeader, DialogHeaderRight } from 'components/Modal/components/DialogHeader'
import { SlideTransition } from 'components/SlideTransition'

type CreateSuccessProps = {
Expand All @@ -26,11 +21,6 @@ export const CreateSuccess = ({ onClose }: CreateSuccessProps) => {
return (
<SlideTransition>
<DialogHeader>
<DialogHeaderMiddle>
<Box minWidth='40px'>
<CarouselDots length={3} activeIndex={3} />
</Box>
</DialogHeaderMiddle>
<DialogHeaderRight>
<DialogCloseButton />
</DialogHeaderRight>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ export const CreateWallet = () => {
<DialogBackButton onClick={handleBack} />
</DialogHeaderLeft>
<DialogHeaderMiddle>
<Box minWidth='40px'>
<CarouselDots length={3} activeIndex={1} />
<Box minWidth='50px'>
<CarouselDots length={4} activeIndex={1} />
</Box>
</DialogHeaderMiddle>
<DialogHeaderRight>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ export const KeepSafe = () => {
<DialogBackButton onClick={handleBack} />
</DialogHeaderLeft>
<DialogHeaderMiddle>
<Box minWidth='40px'>
<CarouselDots length={3} activeIndex={2} />
<Box minWidth='50px'>
<CarouselDots length={4} activeIndex={2} />
</Box>
</DialogHeaderMiddle>
<DialogHeaderRight>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ export const ConfirmDelete: React.FC<ConfirmDeleteProps> = ({ vault, onBack }) =
if (state.walletInfo?.deviceId === vault.id) {
disconnect()
}
vault.revoke()
onBack()
} catch (e) {
console.log(e)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,11 @@ export const ManualBackup = ({ showContinueButton = true }: ManualBackupProps) =
<DialogBackButton onClick={handleBack} />
</DialogHeaderLeft>
<DialogHeaderMiddle>
<Box minWidth='40px'>
<CarouselDots length={3} activeIndex={2} />
</Box>
{showContinueButton ? (
<Box minWidth='50px'>
<CarouselDots length={4} activeIndex={3} />
</Box>
) : null}
</DialogHeaderMiddle>
<DialogHeaderRight>
<DialogCloseButton />
Expand Down
Loading
Loading