Merge branch 'develop' into yomo-1944

Emurgo · Oct 3, 2024 · 3ad0903 · 3ad0903
2 parents b5a89f8 + b331af4
commit 3ad0903
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 54 deletions.
diff --git a/apps/wallet-mobile/src/WalletNavigator.tsx b/apps/wallet-mobile/src/WalletNavigator.tsx
@@ -149,6 +149,7 @@ const WalletTabNavigator = () => {
 
           <Tab.Screen
             name="portfolio"
+            initialParams={{screen: 'dashboard-portfolio'}}
             options={{
               tabBarIcon: ({focused}) =>
                 focused ? (

diff --git 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/...allet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx b/...allet-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/...et-mobile/src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/MnemonicInput.tsx b/...et-mobile/src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/MnemonicInput.tsx
@@ -314,7 +314,7 @@ const MnemonicWordInput = React.forwardRef<MnemonicWordInputRef, MnemonicWordInp
         }}
         onBlur={handleOnBlur}
         cursorColor={colors.primary_600} // only works for android
-        selectionColor={Platform.OS === 'android' ? colors.gray_100 : undefined} // on ios, selectionColor changes cursor and selection
+        selectionColor={Platform.OS === 'android' ? colors.input_selected : undefined} // on ios, selectionColor changes cursor and selection
         keyboardType={Platform.OS === 'android' ? 'visible-password' : undefined} // to hide keyboard suggestions on android
         keyboardAppearance={isDark ? 'dark' : 'light'} // ios feature
       />

diff --git 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/...obile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditPrice/EditPrice.tsx b/...obile/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/...s/StartOrderSwapScreen/CreateOrder/EditSlippage/EditSlippageScreen/EditSlippageScreen.tsx b/...s/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/apps/wallet-mobile/translations/messages/src/WalletNavigator.json b/apps/wallet-mobile/translations/messages/src/WalletNavigator.json
@@ -4,179 +4,179 @@
     "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
     }
   },
   {
     "id": "components.txhistory.txnavigationbuttons.sendButton",
     "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
     }
   },
   {
     "id": "components.txhistory.txnavigationbuttons.receiveButton",
     "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
     }
   },
   {
     "id": "components.common.navigation.dashboardButton",
     "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
     }
   },
   {
     "id": "components.common.navigation.delegateButton",
     "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
     }
   },
   {
     "id": "components.settings.walletsettingscreen.tabTitle",
     "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
     }
   },
   {
     "id": "global.staking",
     "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
     }
   },
   {
     "id": "components.common.navigation.nftGallery",
     "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
     }
   },
   {
     "id": "menu",
     "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
     }
   },
   {
     "id": "components.common.navigation.discover",
     "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
     }
   },
   {
     "id": "components.walletselection.walletselectionscreen.header",
     "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
     }
   },
   {
     "id": "global.portfolio",
     "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
     }
   }
 ]
diff --git 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
@@ -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
@@ -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