fln-espranza 0.0.27 → 0.0.29

package/components/EOption.tsx

@@ -48,7 +48,7 @@ const EOption = ({
       activeOpacity={0.7}
       {...props}
     >
-      {imageSource !== "" && (
+      {imageSource ? (
         <View
           style={[
             tw`${MediaContainerStyle}`,
@@ -80,7 +80,9 @@ const EOption = ({
             resizeMode="contain"
           />
         </View>
-      )}
+      )
+            : <></>
+    }
       {text ? (
         <EText
           size={"base"}

package/components/ETimeLineCard.tsx

@@ -1,25 +1,22 @@
 import React from 'react'
 import { Dimensions, TouchableOpacity, View } from 'react-native'
-import { ChevronRightIcon } from 'react-native-heroicons/solid';
 import tw from '../lib/tailwind'
 import { Colors } from '../utils/Color';
 import EBadge from './EBadge'
-import EButton from './EButton';
-import EDateAndTimeCard from './EDateAndTimeCard'
 import EText from './EText';
-import EIconAdd from './icons/EIconAdd';
+import EIconChevronRight from './icons/EIconChevronRight';
 
 interface IProps {
   title: string;
   description: string;
   completed: boolean;
-  anotherButton?: boolean;
   onPress?: () => void;
-  onAnotherButtonPress?: () => void;
+  buttonText?: string;
   disabled: boolean;
+  badgeText?: string;
 }
 
-export default function ETimeLineCard({ title, description, completed, anotherButton, disabled, onPress, onAnotherButtonPress }: IProps) {
+export default function ETimeLineCard({ title, description, completed, disabled, onPress, buttonText, badgeText }: IProps) {
   return (
     <TouchableOpacity
       onPress={() => onPress && onPress()}
@@ -43,29 +40,26 @@ export default function ETimeLineCard({ title, description, completed, anotherBu
           </EText>
         </View>
         <View style={tw`ml-4`}>
-          <ChevronRightIcon style={[tw``, { color: Colors['text-body'] }]} size={16} />
+          <EBadge
+            completed={completed}
+            text={
+              badgeText ? badgeText : completed ? "Complete" : "Pending"}
+            color={completed ? Colors['primary-base'] : Colors.warning}
+          />
         </View>
       </View>
 
-      <View style={tw`mt-6 flex-row items-center justify-between`}>
-        <EBadge
-          completed={completed}
-          text={completed ? "Complete" : "Pending"}
-          color={completed ? Colors['primary-base'] : Colors.warning}
-        />
-
-        {
-          anotherButton ? (
-            <TouchableOpacity style={tw`flex-row`} onPress={onAnotherButtonPress}>
+      {
+        !disabled ? (
+          <View style={tw`mt-6 flex-row items-center justify-between`}>
+            <TouchableOpacity style={tw`flex-row`} onPress={onPress}>
               <EText size="sm" style={[tw`ml-2 font-semibold`, { color: Colors['primary-base'] }]}>
-                Another Assessment
+                {buttonText}
               </EText>
-              <EIconAdd size={20} style={[tw`ml-2`, { color: Colors['primary-base'] }]} />
+              <EIconChevronRight size={20} style={[tw`ml-2`, { color: Colors['primary-base'] }]} />
             </TouchableOpacity>
-
-          ) : <></>
-        }
-      </View>
+          </View>) : <></>
+      }
     </TouchableOpacity>
   )
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fln-espranza",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "All components used inside FLN Project of Espranza Innovations",
   "main": "index.ts",
   "scripts": {