varnitgoyal95/address-verification-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NTP-23488 | Feedback from refactor double scrollview (#1049)

Browse Source
This commit is contained in:
Mantri Ramkishor
2025-01-06 13:58:01 +05:30
committed by GitHub
parent 4af4fb8ca4
commit e3e5c31c57
6 changed files with 82 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/app/build.gradle
View File

@@ -113,8 +113,8 @@ def jscFlavor = 'org.webkit:android-jsc:+'
def enableHermes = project.ext.react.get("enableHermes", false);
def VERSION_CODE = 228
def VERSION_NAME = "2.16.5"
def VERSION_CODE = 229
def VERSION_NAME = "2.16.6"
android {
namespace "com.avapp"

4
package.json
View File

@@ -1,7 +1,7 @@
{
"name": "AV_APP",
"version": "2.16.5",
"buildNumber": "228",
"version": "2.16.6",
"buildNumber": "229",
"private": true,
"scripts": {
"android:dev": "yarn move:dev && react-native run-android",

3
src/action/dataActions.ts
View File

@@ -94,6 +94,9 @@ export const syncCaseDetail =
.then((res) => {
const caseType = payload.caseType;
const interactionId = res.data?.referenceId;
addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.FA_FEEDBACK_SUCCESS, {
data: res?.data,
});
dispatch(
updateSingleCase({
data: res.data,

4
src/common/Constants.ts
View File

@@ -1345,6 +1345,10 @@ export const CLICKSTREAM_EVENT_NAMES = {
name: 'FA_UNSYNC_FEEDBACK_CAPTURE_SUCCESS',
description: 'Feedback capture success'
},
FA_FEEDBACK_SUCCESS: {
name: 'FA_FEEDBACK_SUCCESS',
description: 'Feedback capture success'
},
FA_ORIGINAL_IMAGE_UPLOADING: {
name: 'FA_ORIGINAL_IMAGE_UPLOADING',
description: 'Original image uploading'

82
src/components/form/Submit.tsx
View File

@@ -74,49 +74,47 @@ const Submit: React.FC<ISubmit> = (props) => {
}, []);
return (
<SafeAreaView>
<ScrollView>
<View
style={[GenericStyles.p16, GenericStyles.whiteBackground, getShadowStyle(5), styles.br8]}
>
{verifiedVisitedWidgets?.map((visited) => {
const sectionsArray = templateData?.widget?.[visited]?.sections;
<ScrollView contentContainerStyle={[GenericStyles.p12, GenericStyles.silverBackground]}>
<View
style={[GenericStyles.p16, GenericStyles.whiteBackground, getShadowStyle(5), styles.br8]}
>
{verifiedVisitedWidgets?.map((visited) => {
const sectionsArray = templateData?.widget?.[visited]?.sections;
return (
<View key={visited}>
{sectionsArray?.map((section: string) => (
<View key={section}>
{sections?.[section]?.questions?.map((question: string) => {
const answer =
data?.widgetContext?.[visited]?.sectionContext?.[section]?.questionContext?.[
question
];
return answer ? (
<View>
<Text>{questions[question].text}</Text>
<AnswerRender
visited={visited}
section={section}
caseId={caseId}
journey={journey}
answer={answer as unknown as IAnswer}
metaData={questions[question]?.metadata}
questionId={question}
/>
<SeparatorBorderComponent />
</View>
) : (
<></>
);
})}
</View>
))}
</View>
);
})}
</View>
</ScrollView>
</SafeAreaView>
return (
<View key={visited}>
{sectionsArray?.map((section: string) => (
<View key={section}>
{sections?.[section]?.questions?.map((question: string) => {
const answer =
data?.widgetContext?.[visited]?.sectionContext?.[section]?.questionContext?.[
question
];
return answer ? (
<View>
<Text>{questions[question].text}</Text>
<AnswerRender
visited={visited}
section={section}
caseId={caseId}
journey={journey}
answer={answer as unknown as IAnswer}
metaData={questions[question]?.metadata}
questionId={question}
/>
<SeparatorBorderComponent />
</View>
) : (
<></>
);
})}
</View>
))}
</View>
);
})}
</View>
</ScrollView>
);
};

65
src/components/form/index.tsx
View File

@@ -423,39 +423,36 @@ const Widget: React.FC<IWidget> = (props) => {
icon={Icon.close}
onBack={handleCloseIconPress}
/>
<ScrollView
keyboardShouldPersistTaps="handled"
contentContainerStyle={[
GenericStyles.p16,
GenericStyles.silverBackground,
name === CommonCaseWidgetId.END && GenericStyles.fill,
name !== CommonCaseWidgetId.END && styles.questionsToBottom,
]}
>
{name === CommonCaseWidgetId.END ? (
<Submit caseId={caseId} journey={journey} />
) : (
<>
{sections?.map((section: any, index: number) => {
return (
<View key={section + index} style={[GenericStyles.pt12, styles.br8]}>
<RenderQuestion
questionMap={sectionMap?.[section]?.questions}
journeyId={journey}
caseId={caseId}
sectionId={section}
widgetId={name}
control={control}
error={error}
name={name}
setValue={setValue}
/>
</View>
);
})}
</>
)}
</ScrollView>
{name === CommonCaseWidgetId.END ? (
<Submit caseId={caseId} journey={journey} />
) : (
<ScrollView
keyboardShouldPersistTaps="handled"
contentContainerStyle={[
GenericStyles.p16,
GenericStyles.silverBackground,
styles.questionsToBottom,
]}
>
{sections?.map((section: any, index: number) => {
return (
<View key={section + index} style={[GenericStyles.pt12, styles.br8]}>
<RenderQuestion
questionMap={sectionMap?.[section]?.questions}
journeyId={journey}
caseId={caseId}
sectionId={section}
widgetId={name}
control={control}
error={error}
name={name}
setValue={setValue}
/>
</View>
);
})}
</ScrollView>
)}
<View
style={[
GenericStyles.row,
@@ -477,7 +474,7 @@ const Widget: React.FC<IWidget> = (props) => {
style={[styles.autoFlex, styles.mH16]}
title={isLeaf ? 'Submit' : 'Next'}
showLoader={isLeaf && isSubmitting}
disabled={(isLeaf && isSubmitting)}
disabled={isLeaf && isSubmitting}
onPress={
isLeaf
? handleSubmit(submitJourneyWithGeoLocation, onError)