Merge remote-tracking branch 'origin/develop' into feature/tx-review

Emurgo · Sep 25, 2024 · 65c1ce4 · 65c1ce4
2 parents 9a13ff9 + ab08361
commit 65c1ce4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/apps/wallet-mobile/src/WalletNavigator.tsx b/apps/wallet-mobile/src/WalletNavigator.tsx
@@ -297,7 +297,7 @@ const useStyles = () => {
 
   const colors = {
     active: color.text_primary_max,
-    inactive: color.text_gray_medium,
+    inactive: color.text_gray_low,
     background: color.bg_color_max,
     divider: color.gray_200,
   }

diff --git a/apps/wallet-mobile/src/components/Button/Button.tsx b/apps/wallet-mobile/src/components/Button/Button.tsx
@@ -37,7 +37,7 @@ export const Button = (props: ButtonProps) => {
     outlineOnLight,
     iconImage,
     withoutBackground,
-    shelleyTheme,
+    shelleyTheme = true,
     mainTheme,
     outlineShelley,
     textStyles,

diff --git a/...eatures/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenInfo/Overview/Overview.tsx b/...eatures/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenInfo/Overview/Overview.tsx
@@ -107,8 +107,6 @@ export const Overview = () => {
           </View>
 
           <Spacer height={16} />
-
-          <View style={styles.divider} />
         </View>
       </Accordion>
 
@@ -168,11 +166,6 @@ const useStyles = () => {
       ...atoms.font_semibold,
       color: color.gray_900,
     },
-    divider: {
-      ...atoms.flex_1,
-      height: 1,
-      backgroundColor: color.gray_200,
-    },
     copyButton: {
       ...atoms.flex_1,
       ...atoms.flex_row_reverse,

diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/LedgerTransportSwitch.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/LedgerTransportSwitch.tsx
@@ -31,6 +31,7 @@ const LedgerTransportSwitchView = ({onSelectUSB, onSelectBLE}: Props) => {
 
         <Button
           outlineOnLight
+          shelleyTheme
           onPress={() => request()}
           title={strings.bluetoothButton}
           testID="connectWithBLEButton"
@@ -42,6 +43,7 @@ const LedgerTransportSwitchView = ({onSelectUSB, onSelectBLE}: Props) => {
 
         <Button
           outlineOnLight
+          shelleyTheme
           onPress={onSelectUSB}
           title={strings.usbButton}
           disabled={!isUSBSupported || !HARDWARE_WALLETS.LEDGER_NANO.ENABLE_USB_TRANSPORT}