From ef59d2cff7ead04422aae643a6c6d21dfbefddd3 Mon Sep 17 00:00:00 2001 From: jorbuedo Date: Wed, 2 Oct 2024 15:46:28 +0200 Subject: [PATCH 1/2] fix(wallet-mobile): navigating from the tabbar to portfolio goes to initial screen (#3669) --- apps/wallet-mobile/src/WalletNavigator.tsx | 1 + .../messages/src/WalletNavigator.json | 96 +++++++++---------- 2 files changed, 49 insertions(+), 48 deletions(-) diff --git a/apps/wallet-mobile/src/WalletNavigator.tsx b/apps/wallet-mobile/src/WalletNavigator.tsx index fc617478db..31169b7b74 100644 --- a/apps/wallet-mobile/src/WalletNavigator.tsx +++ b/apps/wallet-mobile/src/WalletNavigator.tsx @@ -149,6 +149,7 @@ const WalletTabNavigator = () => { focused ? ( diff --git a/apps/wallet-mobile/translations/messages/src/WalletNavigator.json b/apps/wallet-mobile/translations/messages/src/WalletNavigator.json index b8cde09ac5..71382422a2 100644 --- a/apps/wallet-mobile/translations/messages/src/WalletNavigator.json +++ b/apps/wallet-mobile/translations/messages/src/WalletNavigator.json @@ -4,14 +4,14 @@ "defaultMessage": "!!!Transactions", "file": "src/WalletNavigator.tsx", "start": { - "line": 305, + "line": 308, "column": 22, - "index": 10584 + "index": 10768 }, "end": { - "line": 308, + "line": 311, "column": 3, - "index": 10687 + "index": 10871 } }, { @@ -19,14 +19,14 @@ "defaultMessage": "!!!Send", "file": "src/WalletNavigator.tsx", "start": { - "line": 309, + "line": 312, "column": 14, - "index": 10703 + "index": 10887 }, "end": { - "line": 312, + "line": 315, "column": 3, - "index": 10802 + "index": 10986 } }, { @@ -34,14 +34,14 @@ "defaultMessage": "!!!Receive", "file": "src/WalletNavigator.tsx", "start": { - "line": 313, + "line": 316, "column": 17, - "index": 10821 + "index": 11005 }, "end": { - "line": 316, + "line": 319, "column": 3, - "index": 10926 + "index": 11110 } }, { @@ -49,14 +49,14 @@ "defaultMessage": "!!!Dashboard", "file": "src/WalletNavigator.tsx", "start": { - "line": 317, + "line": 320, "column": 19, - "index": 10947 + "index": 11131 }, "end": { - "line": 320, + "line": 323, "column": 3, - "index": 11044 + "index": 11228 } }, { @@ -64,14 +64,14 @@ "defaultMessage": "!!!Delegate", "file": "src/WalletNavigator.tsx", "start": { - "line": 321, + "line": 324, "column": 18, - "index": 11064 + "index": 11248 }, "end": { - "line": 324, + "line": 327, "column": 3, - "index": 11159 + "index": 11343 } }, { @@ -79,14 +79,14 @@ "defaultMessage": "!!!Wallet", "file": "src/WalletNavigator.tsx", "start": { - "line": 325, + "line": 328, "column": 16, - "index": 11177 + "index": 11361 }, "end": { - "line": 328, + "line": 331, "column": 3, - "index": 11275 + "index": 11459 } }, { @@ -94,14 +94,14 @@ "defaultMessage": "!!!Staking", "file": "src/WalletNavigator.tsx", "start": { - "line": 329, + "line": 332, "column": 17, - "index": 11294 + "index": 11478 }, "end": { - "line": 332, + "line": 335, "column": 3, - "index": 11359 + "index": 11543 } }, { @@ -109,14 +109,14 @@ "defaultMessage": "!!!NFT Gallery", "file": "src/WalletNavigator.tsx", "start": { - "line": 333, + "line": 336, "column": 14, - "index": 11375 + "index": 11559 }, "end": { - "line": 336, + "line": 339, "column": 3, - "index": 11469 + "index": 11653 } }, { @@ -124,14 +124,14 @@ "defaultMessage": "!!!Menu", "file": "src/WalletNavigator.tsx", "start": { - "line": 337, + "line": 340, "column": 14, - "index": 11485 + "index": 11669 }, "end": { - "line": 340, + "line": 343, "column": 3, - "index": 11537 + "index": 11721 } }, { @@ -139,14 +139,14 @@ "defaultMessage": "!!!Discover", "file": "src/WalletNavigator.tsx", "start": { - "line": 341, + "line": 344, "column": 18, - "index": 11557 + "index": 11741 }, "end": { - "line": 344, + "line": 347, "column": 3, - "index": 11646 + "index": 11830 } }, { @@ -154,14 +154,14 @@ "defaultMessage": "!!!My wallets", "file": "src/WalletNavigator.tsx", "start": { - "line": 345, + "line": 348, "column": 31, - "index": 11679 + "index": 11863 }, "end": { - "line": 348, + "line": 351, "column": 3, - "index": 11788 + "index": 11972 } }, { @@ -169,14 +169,14 @@ "defaultMessage": "!!!Portfolio", "file": "src/WalletNavigator.tsx", "start": { - "line": 349, + "line": 352, "column": 19, - "index": 11809 + "index": 11993 }, "end": { - "line": 352, + "line": 355, "column": 3, - "index": 11878 + "index": 12062 } } ] \ No newline at end of file From b331af42eb926063278a2e708cd77879a5d86cc5 Mon Sep 17 00:00:00 2001 From: jorbuedo Date: Wed, 2 Oct 2024 15:48:45 +0200 Subject: [PATCH 2/2] feature(theme): input selected color (#3670) --- .../src/features/Exchange/common/AmountCard/AmountCard.tsx | 2 +- .../useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx | 2 +- .../useCases/RestoreWallet/MnemonicInput/MnemonicInput.tsx | 2 +- .../src/features/Swap/common/AmountCard/AmountCard.tsx | 2 +- .../StartOrderSwapScreen/CreateOrder/EditPrice/EditPrice.tsx | 2 +- .../EditSlippage/EditSlippageScreen/EditSlippageScreen.tsx | 2 +- packages/theme/src/themed-palettes/black.ts | 2 ++ packages/theme/src/themed-palettes/light.ts | 2 ++ packages/theme/src/types.ts | 2 ++ 9 files changed, 12 insertions(+), 6 deletions(-) diff --git a/apps/wallet-mobile/src/features/Exchange/common/AmountCard/AmountCard.tsx b/apps/wallet-mobile/src/features/Exchange/common/AmountCard/AmountCard.tsx index f75cdbb42c..24e487d36b 100644 --- a/apps/wallet-mobile/src/features/Exchange/common/AmountCard/AmountCard.tsx +++ b/apps/wallet-mobile/src/features/Exchange/common/AmountCard/AmountCard.tsx @@ -196,7 +196,7 @@ const useStyles = () => { }) const colors = { placeholder: color.gray_600, - focused: color.gray_600, + focused: color.input_selected, blur: color.gray_900, } return {styles, colors} as const diff --git a/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx b/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx index d9ccd5ae9e..44d0d8578c 100644 --- a/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx +++ b/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx @@ -274,7 +274,7 @@ const useStyles = () => { }) const colors = { black: color.gray_max, - selected: color.text_gray_medium, + selected: color.input_selected, } return {styles, colors} as const } diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/MnemonicInput.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/MnemonicInput.tsx index 5af388f3db..71d088a171 100644 --- a/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/MnemonicInput.tsx +++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/MnemonicInput.tsx @@ -314,7 +314,7 @@ const MnemonicWordInput = React.forwardRef diff --git a/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx b/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx index b260b05ce3..1ae9968fc4 100644 --- a/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx +++ b/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx @@ -227,7 +227,7 @@ const useStyles = () => { const colors = { placeholder: color.gray_600, - focused: color.gray_900, + focused: color.input_selected, blur: color.black_static, noSelected: color.gray_400, gray: color.gray_max, diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditPrice/EditPrice.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditPrice/EditPrice.tsx index 4ecf57a3c6..27b3a971d1 100644 --- a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditPrice/EditPrice.tsx +++ b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditPrice/EditPrice.tsx @@ -137,7 +137,7 @@ const useStyles = () => { }, }) const colors = { - cursor: color.text_gray_medium, + cursor: color.input_selected, } return {styles, colors} as const } diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditSlippage/EditSlippageScreen/EditSlippageScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditSlippage/EditSlippageScreen/EditSlippageScreen.tsx index a5fd0e2951..e6cdeabadf 100644 --- a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditSlippage/EditSlippageScreen/EditSlippageScreen.tsx +++ b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditSlippage/EditSlippageScreen/EditSlippageScreen.tsx @@ -215,7 +215,7 @@ const useStyles = () => { const colors = { background: color.gray_100, - cursor: color.text_gray_medium, + cursor: color.input_selected, } return {styles, colors} diff --git a/packages/theme/src/themed-palettes/black.ts b/packages/theme/src/themed-palettes/black.ts index 7f151d2019..d086fe85fc 100644 --- a/packages/theme/src/themed-palettes/black.ts +++ b/packages/theme/src/themed-palettes/black.ts @@ -30,6 +30,8 @@ export const black: ThemedPalette = { el_gray_min: darkPalette.gray_400, // input stroke, disabled state for most components el_secondary: darkPalette.secondary_600, // success state + input_selected: `${darkPalette.primary_200}${opacity._80}`, + mobile_overlay: `${darkPalette.black_static}${opacity._64}`, // mobile bottom sheet overlay mobile_bg_blur: `${darkPalette.gray_50}${opacity._80}`, // mobile bottom sheet background diff --git a/packages/theme/src/themed-palettes/light.ts b/packages/theme/src/themed-palettes/light.ts index da05dbf651..fd1034739f 100644 --- a/packages/theme/src/themed-palettes/light.ts +++ b/packages/theme/src/themed-palettes/light.ts @@ -30,6 +30,8 @@ export const light: ThemedPalette = { el_gray_min: lightPalette.gray_400, // icons, shapes, lines in buttons, chips, tabs, checkboxes, readio, switch el_secondary: lightPalette.secondary_400, // success state + input_selected: `${lightPalette.primary_200}${opacity._80}`, + mobile_overlay: `${lightPalette.black_static}${opacity._40}`, // mobile bottom sheet overlay mobile_bg_blur: `${lightPalette.white_static}${opacity._80}`, // mobile bottom sheet background diff --git a/packages/theme/src/types.ts b/packages/theme/src/types.ts index a8031ec031..fa8554796a 100644 --- a/packages/theme/src/types.ts +++ b/packages/theme/src/types.ts @@ -104,6 +104,8 @@ export type ThemedPalette = BasePalette & { el_gray_min: HexColor el_secondary: HexColor + input_selected: HexColor + web_overlay: HexColor web_bg_sidebar_active: HexColor web_bg_sidebar_inactive: HexColor