From ce49a14f13ffaa1308f40b67bc5007e4afeca2a5 Mon Sep 17 00:00:00 2001 From: yashmantri Date: Thu, 9 May 2024 18:06:45 +0530 Subject: [PATCH] TP-65182 | Feedback details section icons changes + ellipsis added --- .github/CODEOWNERS | 1 - src/assets/icons/SmsIcon.tsx | 31 ++------ src/components/formRenderingEngine/index.tsx | 73 ------------------- src/components/formRenderingEngine/types.ts | 0 src/hooks/useFetchDocument.ts | 2 +- src/screens/Dashboard/PerformanceMeter.tsx | 1 + .../feedback/FeedbackDetailItem.tsx | 2 +- .../caseDetails/feedback/FeedbackListItem.tsx | 32 ++++---- 8 files changed, 27 insertions(+), 115 deletions(-) delete mode 100644 src/components/formRenderingEngine/index.tsx delete mode 100644 src/components/formRenderingEngine/types.ts diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f28d05af..bc26c44f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -17,6 +17,5 @@ sr/screens/permissions @aman-singh_navi src/screens/profile @mantri-ramkishor_navi src/components/form @ashish-deo_navi @aman-chaturvedi_navi - src/components/formRenderingEngine @ashish-deo_navi @aman-chaturvedi_navi src/components/filters @mantri-ramkishor_navi @ashish-deo_navi src/services/* @shri-prakash_navi @varnit-goyal_navi diff --git a/src/assets/icons/SmsIcon.tsx b/src/assets/icons/SmsIcon.tsx index cbf08c43..9cf1f046 100644 --- a/src/assets/icons/SmsIcon.tsx +++ b/src/assets/icons/SmsIcon.tsx @@ -1,32 +1,15 @@ import * as React from 'react'; -import Svg, { Mask, Path, G } from 'react-native-svg'; +import Svg, { Mask, Path, G, Rect } from 'react-native-svg'; -function SmsIcon(props) { +function SmsIcon() { return ( - - - + + + - + diff --git a/src/components/formRenderingEngine/index.tsx b/src/components/formRenderingEngine/index.tsx deleted file mode 100644 index 0dd58acc..00000000 --- a/src/components/formRenderingEngine/index.tsx +++ /dev/null @@ -1,73 +0,0 @@ -import React, { useMemo } from 'react'; -import { Button, Pressable, Text, View } from 'react-native'; -import { useDispatch, useSelector } from 'react-redux'; -import { GenericStyles } from 'RN-UI-LIB/src/styles'; -import { increaseByOne } from '../../reducer/caseReducer'; -import { RootState } from '../../store/store'; -import { navigateToScreen } from '../utlis/navigationUtlis'; -import { EachJourney, Template } from './types'; - -interface RenderingEngine { - data: Template; - userData: { - id: string; - journeyOrder: Array; - interactions: { - caseVerdict: string; - journeysMap: { - [id: string]: { - formData: {}; - startWidget: string; - verdict: string; - addressId: string; - title: string; - completed: false; - isSynced: false; - }; - }; - }; - }; -} - -const RenderingEngine: React.FC = (props) => { - const dispatch = useDispatch(); - const journeyOrder = props?.userData?.journeyOrder; - const data = useSelector((state: RootState) => state.case.value); - - const handleNextContext = useMemo( - () => (journey: EachJourney) => { - navigateToScreen(journey.startWidget, { - journey: journey.id, - caseId: props.userData.id, - }); - }, - // eslint-disable-next-line react-hooks/exhaustive-deps - [] - ); - const JourneyRendering = useMemo( - () => - journeyOrder.map((eachJourney, index) => { - const journey = props.data.journeys[eachJourney]; - return ( - handleNextContext(journey)} key={index}> - {journey.name} - - ); - }), - [journeyOrder, handleNextContext, props] - ); - - const handlePress = () => { - dispatch(increaseByOne()); - }; - - return ( - - Rendering Engine {data} - {JourneyRendering} - - - ); -}; - -export default RenderingEngine; diff --git a/src/components/formRenderingEngine/types.ts b/src/components/formRenderingEngine/types.ts deleted file mode 100644 index e69de29b..00000000 diff --git a/src/hooks/useFetchDocument.ts b/src/hooks/useFetchDocument.ts index b1e2f6e2..13866da2 100644 --- a/src/hooks/useFetchDocument.ts +++ b/src/hooks/useFetchDocument.ts @@ -139,7 +139,7 @@ const useFetchDocument = ( return () => { apiInProgressReferenceIds.current = apiInProgressReferenceIds.current.filter( - (item) => item !== imageReferenceId + (item) => item !== imageDocument?.referenceId ); }; }, [retryForDocuments]); diff --git a/src/screens/Dashboard/PerformanceMeter.tsx b/src/screens/Dashboard/PerformanceMeter.tsx index ef3b8c0d..75032268 100644 --- a/src/screens/Dashboard/PerformanceMeter.tsx +++ b/src/screens/Dashboard/PerformanceMeter.tsx @@ -5,6 +5,7 @@ import { Pressable, LayoutAnimation, UIManager, + Platform, } from 'react-native'; import Text from '../../../RN-UI-LIB/src/components/Text'; import { COLORS } from '../../../RN-UI-LIB/src/styles/colors'; diff --git a/src/screens/caseDetails/feedback/FeedbackDetailItem.tsx b/src/screens/caseDetails/feedback/FeedbackDetailItem.tsx index a9329a5a..fc6f1b0c 100644 --- a/src/screens/caseDetails/feedback/FeedbackDetailItem.tsx +++ b/src/screens/caseDetails/feedback/FeedbackDetailItem.tsx @@ -45,7 +45,7 @@ export const feedbackTypeIcon: Record = { INHOUSE_FIELD_VISIT: , SELF_CALL: , CALL_BRIDGE: , - GEN_AI_BOT_FIELD: , + GEN_AI_BOT_FIELD: , }; const getAddress = (address?: Address) => { diff --git a/src/screens/caseDetails/feedback/FeedbackListItem.tsx b/src/screens/caseDetails/feedback/FeedbackListItem.tsx index 5511678a..2fcbbcda 100644 --- a/src/screens/caseDetails/feedback/FeedbackListItem.tsx +++ b/src/screens/caseDetails/feedback/FeedbackListItem.tsx @@ -14,8 +14,7 @@ import WhatsAppFeedbackShareIcon from '@assets/icons/WhatsAppFeedbackShareIcon'; import { useAppSelector } from '@hooks'; import { shareToWhatsapp } from '../../../services/FeedbackWhatsApp'; import { CaseDetailStackEnum } from '../CaseDetailStack'; -import { feedbackTypeIcon } from "@screens/caseDetails/feedback/FeedbackDetailItem"; -import Button from '../../../../RN-UI-LIB/src/components/Button'; +import { feedbackTypeIcon } from '@screens/caseDetails/feedback/FeedbackDetailItem'; interface IFeedbackListItem { feedbackItem: IFeedback | IUnSyncedFeedbackItem; @@ -67,21 +66,24 @@ const FeedbackListItem: React.FC = ({ {feedbackItem.type && feedbackTypeIcon[feedbackItem.type] ? ( - + {feedbackTypeIcon[feedbackItem.type]} ) : null} {sanitizeString(feedbackItem.interactionStatus)} @@ -132,7 +134,7 @@ const styles = StyleSheet.create({ color: COLORS.TEXT.DARK, }, capitalized: { - textTransform: "capitalize" + textTransform: 'capitalize', }, subText: { fontSize: 12, @@ -140,7 +142,7 @@ const styles = StyleSheet.create({ color: COLORS.TEXT.LIGHT, }, feedBox: { - flexBasis: '90%', + flexBasis: '94%', }, textBox: { marginLeft: 10,