@abihealth/goapp-react-native 1.23.0 → 1.24.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [1.24.0](https://github.com/abiglobalhealth/react-native-sdk/compare/goapp-react-native-v1.23.0...goapp-react-native-v1.24.0) (2025-04-30)
+
+
+### Features
+
+* add initial delivery address prop to DeliveryAddressScreen ([#178](https://github.com/abiglobalhealth/react-native-sdk/issues/178)) ([d00dc18](https://github.com/abiglobalhealth/react-native-sdk/commit/d00dc1803b793b0ae6be21a03179e10ad715dfed))
+* add onConsultationEnded event handler to RatingScreen and update related components ([#180](https://github.com/abiglobalhealth/react-native-sdk/issues/180)) ([923ae9e](https://github.com/abiglobalhealth/react-native-sdk/commit/923ae9e3c270a74968297abb81f9e4ae82000211))
+* enhance customizable container styles ([#182](https://github.com/abiglobalhealth/react-native-sdk/issues/182)) ([0890d1a](https://github.com/abiglobalhealth/react-native-sdk/commit/0890d1a606a1d9b344be17e200eca37cf2ed3245))
+* integrate CustomAnimation component ([#179](https://github.com/abiglobalhealth/react-native-sdk/issues/179)) ([1940c54](https://github.com/abiglobalhealth/react-native-sdk/commit/1940c54aba3a8959f95d9fa744e12a203309b5a7))
+
 ## [1.23.0](https://github.com/abiglobalhealth/react-native-sdk/compare/goapp-react-native-v1.22.0...goapp-react-native-v1.23.0) (2025-04-23)
 
 

package/dist/common/components/CustomAnimation.d.ts

@@ -0,0 +1,7 @@
+import { ReactNode } from 'react';
+interface CustomAnimationProps {
+    animation?: ReactNode;
+    fallback: ReactNode;
+}
+export declare const CustomAnimation: ({ animation, fallback }: CustomAnimationProps) => ReactNode;
+export {};

package/dist/common/components/CustomAnimation.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CustomAnimation = void 0;
+var CustomAnimation = function (_a) {
+    var animation = _a.animation, fallback = _a.fallback;
+    if (animation === null)
+        return null;
+    if (animation)
+        return animation;
+    return fallback;
+};
+exports.CustomAnimation = CustomAnimation;

package/dist/common/helpers/eventHandler.d.ts

@@ -10,6 +10,7 @@ export interface EventHandlers {
     onDeliveryAddressSubmitted?: EventCallback;
     onPrescriptionSubmitted?: EventCallback;
     onSummaryGenerated?: EventCallback;
+    onConsultationEnded?: EventCallback;
 }
 export declare const mapConsultationStatusToEvent: (consultation: Consultation) => CONSULTATION_EVENT;
 export declare const handleEvent: (consultation: Consultation, eventHandlers?: EventHandlers) => void;

package/dist/common/screens/MatchingScreen.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MatchingScreen = void 0;
 var animation_1 = require("../animations/FindingAnimation/animation");
 var CancelConsultationButton_1 = require("../components/CancelConsultationButton");
+var CustomAnimation_1 = require("../components/CustomAnimation");
 var ConsultationHeader_1 = require("../components/headers/ConsultationHeader");
 var ScreenWrapper_1 = require("../components/ScreenWrapper");
 var Text_1 = require("../components/Text");
@@ -20,15 +21,17 @@ var MatchingScreen = function () {
     var styles = getStyles(theme);
     var screens = (0, useCustomComponents_1.useCustomComponents)().screens;
     var customComponents = screens === null || screens === void 0 ? void 0 : screens.MatchingScreen;
-    return (<ScreenWrapper_1.ScreenWrapper header={<ConsultationHeader_1.ConsultationHeader rightIcon={<CancelConsultationButton_1.CancelConsultationButton />}/>} containerStyle={styles.container}>
+    return (<ScreenWrapper_1.ScreenWrapper header={<ConsultationHeader_1.ConsultationHeader rightIcon={<CancelConsultationButton_1.CancelConsultationButton />}/>} containerStyle={[styles.container, customComponents === null || customComponents === void 0 ? void 0 : customComponents.containerStyle]}>
       <Text_1.Text variant="h2" center>
         {t('matching')}
       </Text_1.Text>
 
-      {(customComponents === null || customComponents === void 0 ? void 0 : customComponents.MatchingAnimation) || <animation_1.FindingAnimation />}
+      <CustomAnimation_1.CustomAnimation animation={customComponents === null || customComponents === void 0 ? void 0 : customComponents.MatchingAnimation} fallback={<animation_1.FindingAnimation />}/>
 
-      <Text_1.Text center>{t('matching.video.text_message')}</Text_1.Text>
-      <Text_1.Text center>{t('match.one_minute')}</Text_1.Text>
+      <react_native_1.View style={styles.footer}>
+        <Text_1.Text center>{t('matching.video.text_message')}</Text_1.Text>
+        <Text_1.Text center>{t('match.one_minute')}</Text_1.Text>
+      </react_native_1.View>
     </ScreenWrapper_1.ScreenWrapper>);
 };
 exports.MatchingScreen = MatchingScreen;
@@ -38,6 +41,9 @@ var getStyles = function (_a) {
         container: {
             paddingTop: spacing.xl,
             rowGap: spacing.xl
+        },
+        footer: {
+            rowGap: spacing.xl
         }
     });
 };

package/dist/common/screens/RatingScreen.d.ts

@@ -1,2 +1,7 @@
+import { EventHandlers } from '../helpers/eventHandler';
 import React from 'react';
-export declare const RatingScreen: () => React.JSX.Element;
+interface RatingScreenProps {
+    onConsultationEnded?: EventHandlers['onConsultationEnded'];
+}
+export declare const RatingScreen: ({ onConsultationEnded }: RatingScreenProps) => React.JSX.Element;
+export {};

package/dist/common/screens/RatingScreen.js

@@ -82,14 +82,15 @@ var StarIcon_1 = require("../icons/StarIcon");
 var react_1 = __importStar(require("react"));
 var react_native_1 = require("react-native");
 var RATINGS = [1, 2, 3, 4, 5];
-var RatingScreen = function () {
+var RatingScreen = function (_a) {
+    var onConsultationEnded = _a.onConsultationEnded;
     var t = (0, useTranslation_1.useTranslation)().t;
     var theme = (0, useTheme_1.useTheme)();
     var styles = getStyles(theme);
-    var _a = (0, useConsultation_1.useConsultation)(), rate = _a.rate, updateConsultation = _a.updateConsultation;
-    var _b = (0, react_1.useState)(false), loading = _b[0], setLoading = _b[1];
-    var _c = react_1.default.useState(null), selectedRating = _c[0], setSelectedRating = _c[1];
-    var _d = (0, react_1.useState)(false), showError = _d[0], setShowError = _d[1];
+    var _b = (0, useConsultation_1.useConsultation)(), rate = _b.rate, updateConsultation = _b.updateConsultation;
+    var _c = (0, react_1.useState)(false), loading = _c[0], setLoading = _c[1];
+    var _d = react_1.default.useState(null), selectedRating = _d[0], setSelectedRating = _d[1];
+    var _e = (0, react_1.useState)(false), showError = _e[0], setShowError = _e[1];
     var shakeAnimation = new react_native_1.Animated.Value(0);
     var startShake = function () {
         react_native_1.Animated.sequence([
@@ -121,6 +122,7 @@ var RatingScreen = function () {
                 case 2:
                     _a.sent();
                     updateConsultation(null);
+                    onConsultationEnded === null || onConsultationEnded === void 0 ? void 0 : onConsultationEnded(null);
                     return [3 /*break*/, 4];
                 case 3:
                     setLoading(false);
@@ -131,6 +133,7 @@ var RatingScreen = function () {
     }); };
     var handleSkip = function () {
         updateConsultation(null);
+        onConsultationEnded === null || onConsultationEnded === void 0 ? void 0 : onConsultationEnded(null);
     };
     return (<ScreenWrapper_1.ScreenWrapper header={<ConsultationHeader_1.ConsultationHeader />} containerStyle={styles.container}>
       <react_native_1.View style={styles.innerContainer}>

package/dist/common/screens/utils.d.ts

@@ -1,3 +1,4 @@
+import { EventHandlers } from '../helpers/eventHandler';
 import { Consultation } from '../types/consultation';
 import { ReactNode } from 'react';
-export declare const getCommonScreen: (consultation: Consultation) => ReactNode | null;
+export declare const getCommonScreen: (consultation: Consultation, eventHandlers?: EventHandlers) => ReactNode | null;

package/dist/common/screens/utils.js

@@ -7,7 +7,7 @@ var MatchingScreen_1 = require("./MatchingScreen");
 var MatchScreen_1 = require("./MatchScreen");
 var NoConsultationFoundScreen_1 = require("./NoConsultationFoundScreen");
 var RatingScreen_1 = require("./RatingScreen");
-var getCommonScreen = function (consultation) {
+var getCommonScreen = function (consultation, eventHandlers) {
     if (!consultation)
         return null;
     var status = consultation.status, professional = consultation.professional, questions = consultation.questions;
@@ -19,7 +19,7 @@ var getCommonScreen = function (consultation) {
         case consultation_1.CONSULTATION_STATUS.RESOLVED:
             return <AnswerScreen_1.AnswerScreen questions={questions} professional={professional}/>;
         case consultation_1.CONSULTATION_STATUS.CLOSED:
-            return <RatingScreen_1.RatingScreen />;
+            return <RatingScreen_1.RatingScreen onConsultationEnded={eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.onConsultationEnded}/>;
         case consultation_1.CONSULTATION_STATUS.CANCELED:
             return <NoConsultationFoundScreen_1.NoConsultationFoundScreen />;
         default:

package/dist/common/types/components.d.ts

@@ -64,9 +64,11 @@ export type Components = {
     };
     screens?: {
         MatchingScreen?: {
+            containerStyle?: ViewStyle;
             MatchingAnimation?: ReactNode;
         };
         JoinScreen?: {
+            containerStyle?: ViewStyle;
             CallingAnimation?: ReactElement;
             JoinCallButton?: CustomPressable;
         };
@@ -84,6 +86,7 @@ export type Components = {
             };
         };
         ProcessingPrescriptionScreen?: {
+            containerStyle?: ViewStyle;
             LoadingAnimation?: ReactElement;
         };
         AnswerScreen?: {

package/dist/form-prescriptions/components/FormPrescription.js

@@ -24,7 +24,8 @@ var FORM_PRESCRIPTION_SCREEN_COMPONENTS = (_a = {},
     _a[screens_1.FORM_PRESCRIPTION_SCREENS.FORM] = <react_native_1.View />,
     _a[screens_1.FORM_PRESCRIPTION_SCREENS.REASON] = <ReasonScreen_1.ReasonScreen />,
     _a);
-var ConsultationScreen = function () {
+var ConsultationScreen = function (_a) {
+    var eventHandlers = _a.eventHandlers;
     var currentScreen = (0, useScreens_1.useScreens)().currentScreen;
     var consultation = (0, useConsultation_1.useConsultation)().consultation;
     var getConsultationScreen = (0, react_1.useCallback)(function (consultation) {
@@ -33,7 +34,7 @@ var ConsultationScreen = function () {
             return <NotValidActiveTypeScreen_1.NotValidActiveTypeScreen caseType={consultation.type}/>;
         if (!consultation)
             return FORM_PRESCRIPTION_SCREEN_COMPONENTS[currentScreen];
-        var commonScreen = (0, utils_1.getCommonScreen)(consultation);
+        var commonScreen = (0, utils_1.getCommonScreen)(consultation, eventHandlers);
         if (commonScreen)
             return commonScreen;
         var status = consultation.status;
@@ -57,7 +58,7 @@ var FormPrescription = function (_a) {
     }, [userId]);
     return (<IndicationSurveyContext_1.IndicationSurveyProvider>
       <ConsultationContainer_1.ConsultationContainer>
-        <ConsultationScreen />
+        <ConsultationScreen eventHandlers={eventHandlers}/>
       </ConsultationContainer_1.ConsultationContainer>
     </IndicationSurveyContext_1.IndicationSurveyProvider>);
 };

package/dist/text-consultations/components/TextConsultation.js

@@ -26,7 +26,7 @@ var TextConsultation = function (_a) {
         var validActiveType = (0, valid_active_type_1.checkValidActiveType)(consultation, consultation_1.CASE_TYPE.MEDICAL);
         if (!validActiveType)
             return <NotValidActiveTypeScreen_1.NotValidActiveTypeScreen caseType={consultation.type}/>;
-        var commonScreen = (0, utils_1.getCommonScreen)(consultation);
+        var commonScreen = (0, utils_1.getCommonScreen)(consultation, eventHandlers);
         if (commonScreen)
             return commonScreen;
         if (!consultation)

package/dist/video-consultations/components/VideoConsultation.d.ts

@@ -1,6 +1,8 @@
 import { EventHandlers } from '../../common/helpers/eventHandler';
+import { HKDeliveryAddress } from '../../common/types/deliveryAddress';
 export interface VideoConsultationProps {
     userId: string;
     eventHandlers?: EventHandlers;
+    deliveryAddress?: HKDeliveryAddress;
 }
-export declare const VideoConsultation: ({ eventHandlers, userId }: VideoConsultationProps) => import("react").JSX.Element;
+export declare const VideoConsultation: ({ eventHandlers, userId, deliveryAddress }: VideoConsultationProps) => import("react").JSX.Element;

package/dist/video-consultations/components/VideoConsultation.js

@@ -17,7 +17,7 @@ var ProcessingPrescriptionScreen_1 = require("../screens/ProcessingPrescriptionS
 var react_1 = require("react");
 var react_native_1 = require("react-native");
 var VideoConsultation = function (_a) {
-    var eventHandlers = _a.eventHandlers, userId = _a.userId;
+    var eventHandlers = _a.eventHandlers, userId = _a.userId, deliveryAddress = _a.deliveryAddress;
     var consultation = (0, useConsultation_1.useConsultation)().consultation;
     var setUserId = (0, useUser_1.useUser)().setUserId;
     (0, react_1.useEffect)(function () {
@@ -30,7 +30,7 @@ var VideoConsultation = function (_a) {
         var validActiveType = (0, valid_active_type_1.checkValidActiveType)(consultation, consultation_1.CASE_TYPE.VIDEO);
         if (!validActiveType)
             return <NotValidActiveTypeScreen_1.NotValidActiveTypeScreen caseType={consultation.type}/>;
-        var commonScreen = (0, utils_1.getCommonScreen)(consultation);
+        var commonScreen = (0, utils_1.getCommonScreen)(consultation, eventHandlers);
         if (commonScreen)
             return commonScreen;
         if (!consultation)
@@ -44,7 +44,7 @@ var VideoConsultation = function (_a) {
             case consultation_1.CONSULTATION_STATUS.WAITING_FOR_INFO:
                 if (prescription === null || prescription === void 0 ? void 0 : prescription.deliveryAddress)
                     return <ProcessingPrescriptionScreen_1.ProcessingPrescriptionScreen />;
-                return <DeliveryAddressScreen_1.DeliveryAddressScreen />;
+                return <DeliveryAddressScreen_1.DeliveryAddressScreen initialDeliveryAddress={deliveryAddress}/>;
             default:
                 react_native_1.Alert.alert('Screen not found', status);
                 throw new Error("Screen not found ".concat(status));

package/dist/video-consultations/screens/DeliveryAddressScreen.d.ts

@@ -1,2 +1,5 @@
+import { HKDeliveryAddress } from '../../common/types/deliveryAddress';
 import React from 'react';
-export declare const DeliveryAddressScreen: () => React.JSX.Element;
+export declare const DeliveryAddressScreen: ({ initialDeliveryAddress }: {
+    initialDeliveryAddress?: HKDeliveryAddress;
+}) => React.JSX.Element;

package/dist/video-consultations/screens/DeliveryAddressScreen.js

@@ -99,13 +99,14 @@ var video_1 = require("../api/video");
 var VideoConsultationIcon_1 = require("../icons/VideoConsultationIcon");
 var react_1 = __importStar(require("react"));
 var react_native_1 = require("react-native");
-var DeliveryAddressScreen = function () {
+var DeliveryAddressScreen = function (_a) {
+    var initialDeliveryAddress = _a.initialDeliveryAddress;
     var t = (0, useTranslation_1.useTranslation)().t;
     var theme = (0, useTheme_1.useTheme)();
     var styles = getStyles(theme);
-    var _a = (0, useConsultation_1.useConsultation)(), consultation = _a.consultation, updateConsultation = _a.updateConsultation;
-    var _b = (0, react_1.useState)(false), loading = _b[0], setLoading = _b[1];
-    var _c = (0, react_1.useState)(false), error = _c[0], setError = _c[1];
+    var _b = (0, useConsultation_1.useConsultation)(), consultation = _b.consultation, updateConsultation = _b.updateConsultation;
+    var _c = (0, react_1.useState)(false), loading = _c[0], setLoading = _c[1];
+    var _d = (0, react_1.useState)(false), error = _d[0], setError = _d[1];
     var onSubmit = function (data) { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             setError(false);
@@ -133,7 +134,7 @@ var DeliveryAddressScreen = function () {
 
       <FormWrapper_1.FormWrapper schema={deliveryAddress_1.HKDeliveryAddressSchema} onSubmit={{
             onSuccess: onSubmit
-        }} submitButton={<Button_1.Button submit loading={loading}>
+        }} initialValues={initialDeliveryAddress} submitButton={<Button_1.Button submit loading={loading}>
             {t('button.confirm')}
           </Button_1.Button>}>
         <Input_1.default id="house" label={t('delivery.address.number_and_floor')} placeholder={t('delivery.address.number_and_floor.placeholder')}/>

package/dist/video-consultations/screens/JoinVideoCallScreen.js

@@ -38,6 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JoinVideoCallScreen = void 0;
 var Button_1 = require("../../common/components/Button");
+var CustomAnimation_1 = require("../../common/components/CustomAnimation");
 var Header_1 = require("../../common/components/headers/Header");
 var ScreenWrapper_1 = require("../../common/components/ScreenWrapper");
 var Text_1 = require("../../common/components/Text");
@@ -64,18 +65,22 @@ var JoinVideoCallScreen = function (_a) {
     };
     if (joined)
         return <VideoCallScreen_1.default />;
-    return (<ScreenWrapper_1.ScreenWrapper header={<Header_1.Header title={t('general.consultation.videoConsultation.title')} leftIcon={<VideoConsultationIcon_1.VideoConsultationIcon />} rightIcon={<CloseIcon_1.CloseIcon />}/>} containerStyle={styles.container}>
+    return (<ScreenWrapper_1.ScreenWrapper header={<Header_1.Header title={t('general.consultation.videoConsultation.title')} leftIcon={<VideoConsultationIcon_1.VideoConsultationIcon />} rightIcon={<CloseIcon_1.CloseIcon />}/>} containerStyle={[styles.container, customComponents === null || customComponents === void 0 ? void 0 : customComponents.containerStyle]}>
       <Text_1.Text variant="h2" center>
         {t('video.calling.physician_female', { name: (0, professional_1.getProfessionalLabel)(professional) })}
       </Text_1.Text>
 
-      <react_native_1.View style={styles.animationContainer}>{(customComponents === null || customComponents === void 0 ? void 0 : customComponents.CallingAnimation) || <animation_1.CallingAnimation />}</react_native_1.View>
+      <react_native_1.View style={styles.animationContainer}>
+        <CustomAnimation_1.CustomAnimation animation={customComponents === null || customComponents === void 0 ? void 0 : customComponents.CallingAnimation} fallback={<animation_1.CallingAnimation />}/>
+      </react_native_1.View>
 
-      {(customComponents === null || customComponents === void 0 ? void 0 : customComponents.JoinCallButton) ? (<customComponents.JoinCallButton onPress={onJoinVideoCall}/>) : (<Button_1.Button icon={<VideoConsultationIcon_1.VideoConsultationIcon />} onPress={onJoinVideoCall}>
-          {t('video.calling.button')}
-        </Button_1.Button>)}
+      <react_native_1.View style={styles.footer}>
+        {(customComponents === null || customComponents === void 0 ? void 0 : customComponents.JoinCallButton) ? (<customComponents.JoinCallButton onPress={onJoinVideoCall}/>) : (<Button_1.Button icon={<VideoConsultationIcon_1.VideoConsultationIcon />} onPress={onJoinVideoCall}>
+            {t('video.calling.button')}
+          </Button_1.Button>)}
 
-      <Text_1.Text center>{t('video.calling.not_refresh')}</Text_1.Text>
+        <Text_1.Text center>{t('video.calling.not_refresh')}</Text_1.Text>
+      </react_native_1.View>
     </ScreenWrapper_1.ScreenWrapper>);
 };
 exports.JoinVideoCallScreen = JoinVideoCallScreen;
@@ -98,6 +103,10 @@ var getStyles = function (_a) {
         },
         disclaimerInnerContainer: {
             flex: 1
+        },
+        footer: {
+            width: '100%',
+            rowGap: spacing.sm
         }
     });
 };

package/dist/video-consultations/screens/ProcessingPrescriptionScreen.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProcessingPrescriptionScreen = void 0;
 var animation_1 = require("../../common/animations/LoadingCircleAnimation/animation");
+var CustomAnimation_1 = require("../../common/components/CustomAnimation");
 var Header_1 = require("../../common/components/headers/Header");
 var ScreenWrapper_1 = require("../../common/components/ScreenWrapper");
 var Text_1 = require("../../common/components/Text");
@@ -15,17 +16,17 @@ var VideoConsultationIcon_1 = require("../icons/VideoConsultationIcon");
 var react_1 = __importDefault(require("react"));
 var react_native_1 = require("react-native");
 var ProcessingPrescriptionScreen = function () {
-    var _a;
+    var _a, _b;
     var t = (0, useTranslation_1.useTranslation)().t;
     var theme = (0, useTheme_1.useTheme)();
     var styles = getStyles(theme);
     var screens = (0, useCustomComponents_1.useCustomComponents)().screens;
-    return (<ScreenWrapper_1.ScreenWrapper header={<Header_1.Header title={t('general.consultation.videoConsultation.title')} leftIcon={<VideoConsultationIcon_1.VideoConsultationIcon />}/>} containerStyle={styles.container}>
-      <Text_1.Text center variant="h1">
+    return (<ScreenWrapper_1.ScreenWrapper header={<Header_1.Header title={t('general.consultation.videoConsultation.title')} leftIcon={<VideoConsultationIcon_1.VideoConsultationIcon />}/>} containerStyle={[styles.container, (_a = screens === null || screens === void 0 ? void 0 : screens.ProcessingPrescriptionScreen) === null || _a === void 0 ? void 0 : _a.containerStyle]}>
+      <Text_1.Text center variant="h2">
         {t('delivery.address.processing')}
       </Text_1.Text>
 
-      {((_a = screens === null || screens === void 0 ? void 0 : screens.ProcessingPrescriptionScreen) === null || _a === void 0 ? void 0 : _a.LoadingAnimation) || <animation_1.LoadingCircleAnimation />}
+      <CustomAnimation_1.CustomAnimation animation={(_b = screens === null || screens === void 0 ? void 0 : screens.ProcessingPrescriptionScreen) === null || _b === void 0 ? void 0 : _b.LoadingAnimation} fallback={<animation_1.LoadingCircleAnimation />}/>
 
       <Text_1.Text center>{t('download.one_minute')}</Text_1.Text>
     </ScreenWrapper_1.ScreenWrapper>);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abihealth/goapp-react-native",
-  "version": "1.23.0",
+  "version": "1.24.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"