corrected light mode colors

functionland · Mar 23, 2024 · 544a08f · 544a08f
1 parent 013c9b3
commit 544a08f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/apps/box/src/components/Cards/ConnectedDevicesCard.tsx b/apps/box/src/components/Cards/ConnectedDevicesCard.tsx
@@ -13,6 +13,7 @@ import {
   FxTrashIcon,
   useToast,
   FxText,
+  useFxTheme,
 } from '@functionland/component-library';
 import { CardCarousel } from './fields/CardCarousel';
 import { EmptyCard } from './EmptyCard';
@@ -42,7 +43,7 @@ export const DeviceCard = ({
   const { name, capacity, folderInfo, status, associatedDevices, used, free } =
     data;
   const { queueToast } = useToast();
-
+  const { colors } = useFxTheme();
   return (
     <FxCard
       {...rest}
@@ -55,7 +56,7 @@ export const DeviceCard = ({
           <ActivityIndicator />
         ) : (
           onRefreshPress && (
-            <FxRefreshIcon color="white" onPress={onRefreshPress} />
+            <FxRefreshIcon fill={colors.content3} onPress={onRefreshPress} />
           )
         )}
       </FxBox>

diff --git a/apps/box/src/components/Cards/EarningCard.tsx b/apps/box/src/components/Cards/EarningCard.tsx
@@ -1,5 +1,11 @@
 import React from 'react';
-import { FxBox, FxCard, FxRefreshIcon } from '@functionland/component-library';
+import {
+  FxBox,
+  FxCard,
+  FxRefreshIcon,
+  FxText,
+  useFxTheme,
+} from '@functionland/component-library';
 import { BottomSheetModalMethods } from '@gorhom/bottom-sheet/lib/typescript/types';
 import { ActivityIndicator, Text, View, StyleSheet } from 'react-native';
 
@@ -16,7 +22,7 @@ export const EarningCard = ({
 }: EarningCardProps) => {
   const bottomSheetRef = React.useRef<BottomSheetModalMethods>(null);
   const { totalFula } = data;
-
+  const { colors } = useFxTheme();
   return (
     <FxCard
       {...rest}
@@ -29,22 +35,22 @@ export const EarningCard = ({
           <ActivityIndicator />
         ) : (
           onRefreshPress && (
-            <FxRefreshIcon color="white" onPress={onRefreshPress} />
+            <FxRefreshIcon fill={colors.content3} onPress={onRefreshPress} />
           )
         )}
       </FxBox>
       {totalFula !== undefined && (
         <FxCard.Row>
           <FxCard.Row.Title>Total fula</FxCard.Row.Title>
           <FxCard.Row.Data>
-            <View style={styles.totalFulaContainer}>
+            <FxBox style={styles.totalFulaContainer}>
               {totalFula === 'NaN' ? (
-                <Text>0</Text>
+                <FxText>0</FxText>
               ) : (
-                <Text style={styles.totalFula}>{totalFula}</Text>
+                <FxText style={styles.totalFula}>{totalFula}</FxText>
               )}
-              <Text style={styles.superscript}> (x10⁻¹⁸)</Text>
-            </View>
+              <FxText style={styles.superscript}> (x10⁻¹⁸)</FxText>
+            </FxBox>
           </FxCard.Row.Data>
         </FxCard.Row>
       )}

diff --git a/apps/box/src/screens/Settings/BloxLogs.screen.tsx b/apps/box/src/screens/Settings/BloxLogs.screen.tsx
@@ -9,6 +9,7 @@ import {
   FxTextInput,
   FxKeyboardAwareScrollView,
   FxText,
+  useFxTheme,
 } from '@functionland/component-library';
 import React from 'react';
 import { SubHeaderText } from '../../components/Text';
@@ -27,6 +28,7 @@ export const BloxLogsScreen = () => {
   const [fulaIsReady] = useUserProfileStore((state) => [state.fulaIsReady]);
   const [showOtherInput, setShowOtherInput] = React.useState<boolean>(false);
   const { queueToast } = useToast();
+  const { colors } = useFxTheme();
   const sanitizeLogData = (logString: string) => {
     // Regular expression to match non-printable characters except newlines
     // This regex matches characters in the control characters range (0x00-0x1F and 0x7F-0x9F) except for newline (0x0A)
@@ -141,16 +143,19 @@ export const BloxLogsScreen = () => {
       <FxSpacer marginTop="24" />
       <FxCard.Row>
         <FxCard.Title marginBottom="8">
-          Last {tailCount} lines of Log for {selectedValue}
+          Last {tailCount} lines of log for {selectedValue}
         </FxCard.Title>
         {loadingLogs ? (
           <ActivityIndicator />
         ) : (
           fetchContainerLogs && (
             <>
-              <FxCopyIcon color="white" onPress={() => copyToClipboard(log)} />
+              <FxCopyIcon
+                fill={colors.content3}
+                onPress={() => copyToClipboard(log)}
+              />
               <FxRefreshIcon
-                color="white"
+                fill={colors.content3}
                 onPress={() => fetchContainerLogs(selectedValue, tailCount)}
               />
             </>