From 8cde7b98e37ff584f07852812239c45cf09a4006 Mon Sep 17 00:00:00 2001 From: Apotheosis <0xapotheosis@gmail.com> Date: Tue, 11 Feb 2025 21:33:55 +1100 Subject: [PATCH 1/8] fix: make dark theme toggle make sense (#8787) --- src/assets/translations/de/main.json | 1 - src/assets/translations/en/main.json | 1 - src/assets/translations/es/main.json | 1 - src/assets/translations/fr/main.json | 1 - src/assets/translations/id/main.json | 1 - src/assets/translations/ja/main.json | 1 - src/assets/translations/ko/main.json | 1 - src/assets/translations/pt/main.json | 1 - src/assets/translations/ru/main.json | 1 - src/assets/translations/tr/main.json | 1 - src/assets/translations/uk/main.json | 1 - src/assets/translations/zh/main.json | 1 - src/components/Modals/Settings/SettingsList.tsx | 13 +++++-------- 13 files changed, 5 insertions(+), 20 deletions(-) diff --git a/src/assets/translations/de/main.json b/src/assets/translations/de/main.json index c9c1a9894ee..e7180838064 100644 --- a/src/assets/translations/de/main.json +++ b/src/assets/translations/de/main.json @@ -62,7 +62,6 @@ "seeAll": "Alles ansehen", "darkMode": "Dunkler Modus", "darkTheme": "Dunkle Farben", - "lightTheme": "Helle Farben", "rename": "Umbenennen", "forget": "Vergessen?", "pending": "Ausstehend", diff --git a/src/assets/translations/en/main.json b/src/assets/translations/en/main.json index 8c11d2944c2..53d404d127f 100644 --- a/src/assets/translations/en/main.json +++ b/src/assets/translations/en/main.json @@ -64,7 +64,6 @@ "seeAll": "See All", "darkMode": "Dark Mode", "darkTheme": "Dark Theme", - "lightTheme": "Light Theme", "rename": "Rename", "forget": "Forget?", "pending": "Pending", diff --git a/src/assets/translations/es/main.json b/src/assets/translations/es/main.json index 35a68031367..d487feb3f18 100644 --- a/src/assets/translations/es/main.json +++ b/src/assets/translations/es/main.json @@ -62,7 +62,6 @@ "seeAll": "Ver Todo", "darkMode": "Modo Oscuro", "darkTheme": "Tema oscuro", - "lightTheme": "Tema claro", "rename": "Renombrar", "forget": "Olvidar?", "pending": "Pendiente", diff --git a/src/assets/translations/fr/main.json b/src/assets/translations/fr/main.json index 950d1f67fb3..5be3c6bd5f0 100644 --- a/src/assets/translations/fr/main.json +++ b/src/assets/translations/fr/main.json @@ -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", diff --git a/src/assets/translations/id/main.json b/src/assets/translations/id/main.json index d623c3afc72..993406ea7a2 100644 --- a/src/assets/translations/id/main.json +++ b/src/assets/translations/id/main.json @@ -27,7 +27,6 @@ "seeAll": "Lihat Semua", "darkMode": "Mode Malam", "darkTheme": "Tema gelap", - "lightTheme": "Tema Terang", "rename": "Ganti Nama", "forget": "Lupa?", "pending": "Tertunda", diff --git a/src/assets/translations/ja/main.json b/src/assets/translations/ja/main.json index a80f363a092..9c69ed90cee 100644 --- a/src/assets/translations/ja/main.json +++ b/src/assets/translations/ja/main.json @@ -62,7 +62,6 @@ "seeAll": "すべてを見る", "darkMode": "ダークモード", "darkTheme": "ダークテーマ", - "lightTheme": "ライトテーマ", "rename": "名前の変更", "forget": "お忘れですか？", "pending": "保留中", diff --git a/src/assets/translations/ko/main.json b/src/assets/translations/ko/main.json index db983bf9181..60dfc2bd751 100644 --- a/src/assets/translations/ko/main.json +++ b/src/assets/translations/ko/main.json @@ -27,7 +27,6 @@ "seeAll": "전체 보기", "darkMode": "다크 모드", "darkTheme": "다크 모드", - "lightTheme": "라이트 모드", "rename": "이름 바꾸기", "forget": "삭제하시겠습니까?", "pending": "보류 중", diff --git a/src/assets/translations/pt/main.json b/src/assets/translations/pt/main.json index 46a912cece5..63cbac59f06 100644 --- a/src/assets/translations/pt/main.json +++ b/src/assets/translations/pt/main.json @@ -62,7 +62,6 @@ "seeAll": "Ver tudo", "darkMode": "Modo noturno", "darkTheme": "Tema Escuro", - "lightTheme": "Tema Claro", "rename": "Renomear", "forget": "Esqueceu?", "pending": "Pendente", diff --git a/src/assets/translations/ru/main.json b/src/assets/translations/ru/main.json index b074c2c1db7..1c9e6b174c2 100644 --- a/src/assets/translations/ru/main.json +++ b/src/assets/translations/ru/main.json @@ -62,7 +62,6 @@ "seeAll": "Посмотреть все", "darkMode": "Темный режим", "darkTheme": "Темная тема", - "lightTheme": "Светлая тема", "rename": "Переименовать", "forget": "Забыл?", "pending": "В ожидании", diff --git a/src/assets/translations/tr/main.json b/src/assets/translations/tr/main.json index 5a5f0951297..6f7d317bcfd 100644 --- a/src/assets/translations/tr/main.json +++ b/src/assets/translations/tr/main.json @@ -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", diff --git a/src/assets/translations/uk/main.json b/src/assets/translations/uk/main.json index 57b5d4ac2d8..9b38fc65d7a 100644 --- a/src/assets/translations/uk/main.json +++ b/src/assets/translations/uk/main.json @@ -62,7 +62,6 @@ "seeAll": "Переглянути все", "darkMode": "Темний режим", "darkTheme": "Темна тема", - "lightTheme": "Світла тема", "rename": "Перейменувати", "forget": "Забули?", "pending": "Розглядається", diff --git a/src/assets/translations/zh/main.json b/src/assets/translations/zh/main.json index 072c75833a4..85fae709a45 100644 --- a/src/assets/translations/zh/main.json +++ b/src/assets/translations/zh/main.json @@ -62,7 +62,6 @@ "seeAll": "查看全部", "darkMode": "深色模式", "darkTheme": "深色主题", - "lightTheme": "浅色主题", "rename": "重命名", "forget": "忘记？", "pending": "待处理", diff --git a/src/components/Modals/Settings/SettingsList.tsx b/src/components/Modals/Settings/SettingsList.tsx index ab8b94558ed..3be5bf640c9 100644 --- a/src/components/Modals/Settings/SettingsList.tsx +++ b/src/components/Modals/Settings/SettingsList.tsx @@ -1,4 +1,4 @@ -import { MoonIcon, SunIcon } from '@chakra-ui/icons' +import { MoonIcon } from '@chakra-ui/icons' import { Divider, Flex, @@ -58,7 +58,7 @@ export const SettingsList: FC = ({ appHistory }) => { const settings = useModal('settings') const { toggleColorMode } = useColorMode() const [clickCount, setClickCount] = useState(0) - const isLightMode = useColorModeValue(true, false) + const isDarkMode = useColorModeValue(false, true) const selectedLocale = useAppSelector(selectSelectedLocale) const selectedCurrency = useAppSelector(selectSelectedCurrency) const selectedCurrencyFormat = useAppSelector(selectCurrencyFormat) @@ -109,10 +109,7 @@ export const SettingsList: FC = ({ appHistory }) => { [history], ) - const themeColorIcon = useMemo( - () => , - [isLightMode], - ) + const themeColorIcon = useMemo(() => , []) const handleCurrencyClick = useCallback( () => history.push(SettingsRoutes.FiatCurrencies), @@ -146,11 +143,11 @@ export const SettingsList: FC = ({ appHistory }) => { - + <> From 25c9346c8c07f25b1e23d0b891917c9afebd6f79 Mon Sep 17 00:00:00 2001 From: Apotheosis <0xapotheosis@gmail.com> Date: Tue, 11 Feb 2025 21:45:03 +1100 Subject: [PATCH 2/8] fix: chain icon clipping (#8788) --- src/components/AssetSelection/components/AssetMenuButton.tsx | 2 +- src/components/TradeAssetSearch/TradeAssetSearch.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/AssetSelection/components/AssetMenuButton.tsx b/src/components/AssetSelection/components/AssetMenuButton.tsx index 25be097ba2f..a6092dd4909 100644 --- a/src/components/AssetSelection/components/AssetMenuButton.tsx +++ b/src/components/AssetSelection/components/AssetMenuButton.tsx @@ -51,7 +51,7 @@ export const AssetMenuButton = ({ isLoading={isLoading} {...buttonProps} > - + {icon} {asset?.symbol} diff --git a/src/components/TradeAssetSearch/TradeAssetSearch.tsx b/src/components/TradeAssetSearch/TradeAssetSearch.tsx index 1552e660542..ef0022e18d7 100644 --- a/src/components/TradeAssetSearch/TradeAssetSearch.tsx +++ b/src/components/TradeAssetSearch/TradeAssetSearch.tsx @@ -36,7 +36,7 @@ const assetButtonProps = { pr: 3, py: 1.5, size: 'sm', - borderRadius: 'full', + borderRadius: '2xl', height: 'auto', } From 4946b9b407ed555e6b519a062e717d8a39b43500 Mon Sep 17 00:00:00 2001 From: Apotheosis <0xapotheosis@gmail.com> Date: Wed, 12 Feb 2025 07:21:56 +1100 Subject: [PATCH 3/8] chore: update fox power graph params (#8789) --- src/components/FeeExplainer/FeeSliders.tsx | 16 ++++++++-------- src/components/FeeExplainer/common.tsx | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/FeeExplainer/FeeSliders.tsx b/src/components/FeeExplainer/FeeSliders.tsx index c9522656dc2..8a2141d354e 100644 --- a/src/components/FeeExplainer/FeeSliders.tsx +++ b/src/components/FeeExplainer/FeeSliders.tsx @@ -134,17 +134,17 @@ export const FeeSliders: React.FC = ({ - - 250k + + 150k - - 500k + + 300k - - 750k + + 450k - - 1MM + + 600k Date: Tue, 11 Feb 2025 23:47:48 +0100 Subject: [PATCH 4/8] chore: cleanup portals spew (#8792) --- src/lib/market-service/portals/portals.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/market-service/portals/portals.ts b/src/lib/market-service/portals/portals.ts index 680d40afede..b3e784ce334 100644 --- a/src/lib/market-service/portals/portals.ts +++ b/src/lib/market-service/portals/portals.ts @@ -120,7 +120,6 @@ export class PortalsMarketService implements MarketService { const network = CHAIN_ID_TO_PORTALS_NETWORK[chainId] if (!network) { - console.error(`Unsupported chainId: ${chainId}`) return null } From 108bdca61183004f6521e92ac4249ef45c949b0b Mon Sep 17 00:00:00 2001 From: NeOMakinG <14963751+NeOMakinG@users.noreply.github.com> Date: Wed, 12 Feb 2025 07:08:21 +0800 Subject: [PATCH 5/8] fix: wallet mobile drawer create flow dots and delete error (#8793) * fix: new mobile flow dots * fix: delete wallet error * chore: trigger CI --- .../routes/CreateWallet/CreateBackupConfirm.tsx | 4 ++-- .../routes/CreateWallet/CreateSuccess.tsx | 14 ++------------ .../routes/CreateWallet/CreateWallet.tsx | 4 ++-- .../routes/CreateWallet/KeepSafe.tsx | 4 ++-- .../routes/DeleteWallet/Confirm.tsx | 1 - .../routes/ManualBackup/ManualBackup.tsx | 8 +++++--- 6 files changed, 13 insertions(+), 22 deletions(-) diff --git a/src/components/MobileWalletDialog/routes/CreateWallet/CreateBackupConfirm.tsx b/src/components/MobileWalletDialog/routes/CreateWallet/CreateBackupConfirm.tsx index 9a6f670b01a..8fed687cb1f 100644 --- a/src/components/MobileWalletDialog/routes/CreateWallet/CreateBackupConfirm.tsx +++ b/src/components/MobileWalletDialog/routes/CreateWallet/CreateBackupConfirm.tsx @@ -214,8 +214,8 @@ export const CreateBackupConfirm = () => { - - + + diff --git a/src/components/MobileWalletDialog/routes/CreateWallet/CreateSuccess.tsx b/src/components/MobileWalletDialog/routes/CreateWallet/CreateSuccess.tsx index d130045f015..86b3c6b8cd6 100644 --- a/src/components/MobileWalletDialog/routes/CreateWallet/CreateSuccess.tsx +++ b/src/components/MobileWalletDialog/routes/CreateWallet/CreateSuccess.tsx @@ -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 = { @@ -26,11 +21,6 @@ export const CreateSuccess = ({ onClose }: CreateSuccessProps) => { return ( - - - - - diff --git a/src/components/MobileWalletDialog/routes/CreateWallet/CreateWallet.tsx b/src/components/MobileWalletDialog/routes/CreateWallet/CreateWallet.tsx index 7d1a11c1b45..9a91413bb27 100644 --- a/src/components/MobileWalletDialog/routes/CreateWallet/CreateWallet.tsx +++ b/src/components/MobileWalletDialog/routes/CreateWallet/CreateWallet.tsx @@ -79,8 +79,8 @@ export const CreateWallet = () => { - - + + diff --git a/src/components/MobileWalletDialog/routes/CreateWallet/KeepSafe.tsx b/src/components/MobileWalletDialog/routes/CreateWallet/KeepSafe.tsx index 06fa46207d5..763c6c28d3c 100644 --- a/src/components/MobileWalletDialog/routes/CreateWallet/KeepSafe.tsx +++ b/src/components/MobileWalletDialog/routes/CreateWallet/KeepSafe.tsx @@ -42,8 +42,8 @@ export const KeepSafe = () => { - - + + diff --git a/src/components/MobileWalletDialog/routes/DeleteWallet/Confirm.tsx b/src/components/MobileWalletDialog/routes/DeleteWallet/Confirm.tsx index 5b37c0a975d..26695d5dcd2 100644 --- a/src/components/MobileWalletDialog/routes/DeleteWallet/Confirm.tsx +++ b/src/components/MobileWalletDialog/routes/DeleteWallet/Confirm.tsx @@ -35,7 +35,6 @@ export const ConfirmDelete: React.FC = ({ vault, onBack }) = if (state.walletInfo?.deviceId === vault.id) { disconnect() } - vault.revoke() onBack() } catch (e) { console.log(e) diff --git a/src/components/MobileWalletDialog/routes/ManualBackup/ManualBackup.tsx b/src/components/MobileWalletDialog/routes/ManualBackup/ManualBackup.tsx index 09aa1021c73..9b059dd02eb 100644 --- a/src/components/MobileWalletDialog/routes/ManualBackup/ManualBackup.tsx +++ b/src/components/MobileWalletDialog/routes/ManualBackup/ManualBackup.tsx @@ -110,9 +110,11 @@ export const ManualBackup = ({ showContinueButton = true }: ManualBackupProps) = - - - + {showContinueButton ? ( + + + + ) : null} From 0d3a2e697ece92d9a72b22e3295cf13c2ccc4524 Mon Sep 17 00:00:00 2001 From: NeOMakinG <14963751+NeOMakinG@users.noreply.github.com> Date: Wed, 12 Feb 2025 07:18:20 +0800 Subject: [PATCH 6/8] fix: turn off swapper thorchain ack flag (#8797) --- .env.base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.base b/.env.base index 057810494d5..f635f9d593a 100644 --- a/.env.base +++ b/.env.base @@ -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 From 1b22db6cd2017d2f69bf54a3077b0ea07001d82b Mon Sep 17 00:00:00 2001 From: NeOMakinG <14963751+NeOMakinG@users.noreply.github.com> Date: Wed, 12 Feb 2025 07:34:25 +0800 Subject: [PATCH 7/8] fix: add mobile dialog on mobile home page (#8796) * fix: add mobile dialog on mobile home page * feat: welcome modal --- .../MobileWalletDialog/MobileWalletDialog.tsx | 9 ++++-- .../CreateWallet/CreateBackupConfirm.tsx | 14 ++++++++- src/pages/ConnectWallet/MobileConnect.tsx | 30 ++++++++++++++----- 3 files changed, 43 insertions(+), 10 deletions(-) diff --git a/src/components/MobileWalletDialog/MobileWalletDialog.tsx b/src/components/MobileWalletDialog/MobileWalletDialog.tsx index 8c3573881ef..5339bcc0461 100644 --- a/src/components/MobileWalletDialog/MobileWalletDialog.tsx +++ b/src/components/MobileWalletDialog/MobileWalletDialog.tsx @@ -12,9 +12,14 @@ import { MobileWalletDialogRoutes } from './types' type MobileWalletDialogProps = { isOpen: boolean onClose: () => void + defaultRoute?: MobileWalletDialogRoutes } -export const MobileWalletDialog: React.FC = ({ isOpen, onClose }) => { +export const MobileWalletDialog: React.FC = ({ + isOpen, + onClose, + defaultRoute = MobileWalletDialogRoutes.Saved, +}) => { return ( @@ -37,7 +42,7 @@ export const MobileWalletDialog: React.FC = ({ isOpen, - + )} diff --git a/src/components/MobileWalletDialog/routes/CreateWallet/CreateBackupConfirm.tsx b/src/components/MobileWalletDialog/routes/CreateWallet/CreateBackupConfirm.tsx index 8fed687cb1f..a402dec4bce 100644 --- a/src/components/MobileWalletDialog/routes/CreateWallet/CreateBackupConfirm.tsx +++ b/src/components/MobileWalletDialog/routes/CreateWallet/CreateBackupConfirm.tsx @@ -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' @@ -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( () => ({ @@ -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) => { diff --git a/src/pages/ConnectWallet/MobileConnect.tsx b/src/pages/ConnectWallet/MobileConnect.tsx index 35e13fdc161..520b577fd40 100644 --- a/src/pages/ConnectWallet/MobileConnect.tsx +++ b/src/pages/ConnectWallet/MobileConnect.tsx @@ -12,6 +12,7 @@ import { keyframes, Link, Stack, + useDisclosure, } from '@chakra-ui/react' import { AnimatePresence, motion } from 'framer-motion' import { useCallback, useEffect, useMemo, useState } from 'react' @@ -23,6 +24,8 @@ import OrangeFox from 'assets/orange-fox.svg' import { CircularProgress } from 'components/CircularProgress/CircularProgress' import { FadeTransition } from 'components/FadeTransition' import { LanguageSelector } from 'components/LanguageSelector' +import { MobileWalletDialog } from 'components/MobileWalletDialog/MobileWalletDialog' +import { MobileWalletDialogRoutes } from 'components/MobileWalletDialog/types' import { SlideTransitionY } from 'components/SlideTransitionY' import { RawText, Text } from 'components/Text' import { WalletActions } from 'context/WalletProvider/actions' @@ -61,7 +64,7 @@ const BodyText: React.FC = props => ( ) export const MobileConnect = () => { - const { create, importWallet, dispatch, state } = useWallet() + const { importWallet, dispatch, state } = useWallet() const translate = useTranslate() const [wallets, setWallets] = useState([]) const [error, setError] = useState(null) @@ -70,11 +73,15 @@ export const MobileConnect = () => { const scaleFadeAnimation = `${scaleFade} 0.6s cubic-bezier(0.76, 0, 0.24, 1)` const hasWallet = Boolean(state.walletInfo?.deviceId) const history = useHistory() + const { isOpen, onClose, onOpen } = useDisclosure() + const [defaultRoute, setDefaultRoute] = useState( + MobileWalletDialogRoutes.Saved, + ) - const handleCreate = useCallback(() => { - dispatch({ type: WalletActions.SET_WALLET_MODAL, payload: true }) - create(KeyManager.Mobile) - }, [create, dispatch]) + const handleOpenCreateWallet = useCallback(() => { + setDefaultRoute(MobileWalletDialogRoutes.Create) + onOpen() + }, [onOpen]) const handleImport = useCallback(() => { dispatch({ type: WalletActions.SET_WALLET_MODAL, payload: true }) @@ -148,7 +155,7 @@ export const MobileConnect = () => { {translate('connectWalletPage.mobileWelcomeBody')} -