@os1-platform/dispatch-mobile 2.1.22 → 2.1.24

package/src/ui/screens/DropCashScreen.tsx

@@ -8,7 +8,7 @@ import { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';
 import type { ETAmount } from '../../components/executiontasks/payments/init/InitPaymentSchema';
 import { View } from 'react-native';
 import CancelOrderDialog from '../../components/widgets/CancelOrderDialog';
-import { onTaskStart } from '../../utils/ExecTaskUtils';
+import { getBaseETResponse, onTaskStart } from '../../utils/ExecTaskUtils';
 
 import { DispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';
 import { GO_BACK_EVENT_CODE } from '../../constants/constants';
@@ -16,6 +16,8 @@ import Helper from '../../utils/helper';
 //{ fireEventWithScreenName } from 'src/analytics/sentry/SentryAnalyticsUtils';
 import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../analytics/sentry/SentrySdkConstants';
 import { fireEventWithScreenName } from '../../analytics/sentry/SentryAnalyticsUtils';
+import ProgressDialog from '../../components/widgets/ProgressDialog';
+import { getEventCodeByET } from '../../manager/dispatchCodes/EventCodeContainer';
 
 // OLD CODE
 // function getTotalExpected(nextStates: any[]): ETAmount {
@@ -40,13 +42,15 @@ const DropCashScreen = ({
   navigation: any;
   baseETProps: BaseETProps;
 }) => {
+  const [loading, setLoading] = useState(false);
+
   const helperInstance = Helper.getInstance();
   const nextState = route.params[RouteParams.NEXT_STATES];
   const { taskMeta, mergedObjectiveId, input, wfMeta, taskName } =
     getDataFromNextState(nextState);
 
   const [expectedAmount, setExpectedAmount] = useState<ETAmount>({
-    value: 0,
+    value: 1,
     minorUnit: input.expectedAmount.minorUnit,
     currencyCode: input.expectedAmount.currencyCode,
   });
@@ -66,6 +70,45 @@ const DropCashScreen = ({
     })();
   }, [])
 
+  useEffect(() => {
+    (async () => {
+      console.log("expectedAmount:",expectedAmount);
+      if(expectedAmount.value === 0){
+        // setLoading(true);
+        let dropCashETOutput = {
+          amount: {
+            value: expectedAmount.value,
+            currencyCode: expectedAmount.currencyCode,
+            minorUnit: expectedAmount.minorUnit,
+          },
+          ...(await getBaseETResponse(
+            EntityCode.DELIVER_CASH,
+            true,
+            getEventCodeByET(
+              ExecutionTaskID.DELIVER_CASH,
+              true,
+              input.applicableReasons?.success
+            ),
+            '',
+            mergedObjectiveId,
+            ExecutionTaskID.DELIVER_CASH
+          )),
+        }
+        if (dropCashETOutput.success || dropCashETOutput.eventCode == GO_BACK_EVENT_CODE) {
+          await submitOutput(dropCashETOutput);
+        } else {
+          setResponse((_prevState: any) => {
+            setShowAlert(true);
+            return dropCashETOutput;
+          });
+        }
+        // setLoading(false);
+    }
+    })();
+  }, [expectedAmount.value])
+
+
+
   const getTotalExpected = async () => {
     const totalAmount: number = await DispatchExecutor.getTotalAmountMWI(
       mergedObjectiveId
@@ -101,8 +144,10 @@ const DropCashScreen = ({
     },
     [baseETProps, navigation, route]
   );
+  
   return (
     <View style={{ flex: 1 }}>
+      { expectedAmount.value === 0 ? <View><ProgressDialog visible={loading} label={'Please wait...'} /></View> : 
       <SLDropCash
         {...input}
         expectedAmount={expectedAmount}
@@ -121,6 +166,8 @@ const DropCashScreen = ({
           }
         }}
       />
+      }
+      
       <CancelOrderDialog
         visible={showAlert}
         onSubmit={async (value) => {

package/src/ui/screens/ETScreensIndex.ts

@@ -14,6 +14,7 @@ import DropCashScreen from './DropCashScreen';
 import ScanScreen from './ScanScreen';
 import HttpRequestScreen from './HttpRequestScreen';
 import ValidateOTPScreen from './ValidateOTPScreen';
+import CollectPaymentScreen from './CollectPaymentScreen';
 
 export {
   CancellationScreen,
@@ -32,4 +33,5 @@ export {
   ScanScreen,
   HttpRequestScreen,
   ValidateOTPScreen,
+  CollectPaymentScreen,
 };

package/src/ui/screens/PaymentScreen.tsx

@@ -73,6 +73,7 @@ const PaymentScreen = ({
 
   const submitOutput = useCallback(
     async (etOutput: any) => {
+      console.log("submitOutput:",JSON.stringify(etOutput));
       await DispatchStateContainer.getInstance().navigateToNextTask(
         navigation,
         route,

package/src/ui/screens/StartWorkFlowScreen.tsx

@@ -112,6 +112,20 @@ const StartWorkFlowScreen = ({
             )
           )[0];
 
+          if (
+            nextStateData.taskId === ExecutionTaskID.COLLECT_PAYMENT_ET &&
+            (!isMandatoryKeysPresent(route.params, ['paymentConfig']) ||
+              !isMandatoryKeysPresent(route.params.paymentConfig, [
+                'paymentRefId',
+              ]))
+          ) {
+            navigateWithError(
+              ErrorCodes.InvalidArgumentError,
+              'Missing or Invalid Route Params'
+            );
+            return;
+          }
+
           let updatedStatusFilter: IDispatchExecutor.ExecutionStatus[] = [];
 
           if (
@@ -136,6 +150,7 @@ const StartWorkFlowScreen = ({
             customEventsData: route.params.mergedWI.customEventsData,
             statusFilter: updatedStatusFilter,
             prefixedMergedObjectiveId,
+            paymentConfig: route.params.paymentConfig,
           };
 
           // if (nextStateList != null && nextStateList.length > 0) {
@@ -211,7 +226,7 @@ const StartWorkFlowScreen = ({
         }
       } catch (error: any) {
         baseETProps.showProgress(false);
-        navigateWithError(ErrorCodes.UNEXPECTED_ERROR, error.message);
+        navigateWithError(error?.code ?? ErrorCodes.UNEXPECTED_ERROR, error.message);
         Logger.getInstance().logEvent(TAG, error.message, LOG_TYPE.SDK_ERROR);
       }
     })();

package/src/ui/uiConfig/RouteParams.ts

@@ -24,5 +24,12 @@ export function getDataFromNextState(
   const mergedObjectiveId = nextState.mergedObjectiveIds;
   const wfMeta = JSON.parse(nextState.meta?.workflow || '{}'); //nextState.meta?.workflow || {}; //JSON.parse(nextState.meta?.workflow || '{}');
 
-  return { input, taskMeta, mergedObjectiveId, wfMeta, taskName };
+  return {
+    input,
+    taskMeta,
+    mergedObjectiveId,
+    wfMeta,
+    taskName,
+    taskId: nextState.taskId,
+  };
 }

package/src/utils/ApiUtils.ts

@@ -119,6 +119,7 @@ export async function getApiResponse(apiData: APIData) {
   if (apiData.requestBody) {
     axiosConfig.data = { ...apiData.requestBody };
   }
+  // console.log('axiosConfig: ', JSON.stringify(axiosConfig));
 
   return axios(axiosConfig);
 }

package/src/utils/ExecTaskUtils.ts

@@ -6,7 +6,7 @@ import { EntityCode, ExecutionTaskID } from '../models/execTasks/ETConfig';
 import type { EventRow } from '../manager/syncmanager/DBConfig';
 import type { DispatchSDKConfig } from '../models/sdk';
 import dispatchEvent from '../events/EventDispatcher';
-import type { startEvent } from '../models/DispatchModels';
+import type { clickEvent, startEvent } from '../models/DispatchModels';
 import { JSONPath } from 'jsonpath-plus';
 import { IDispatch } from '@os1-platform/platform-coreos-execution-engine-sdk';
 import { last } from 'lodash';
@@ -181,6 +181,26 @@ export function onTaskStart(
   }
 }
 
+export function onClickEvent(
+  eventName: string,
+  eventData: IDispatch.IExecutionTaskQueryResponse,
+  customData: any,
+  additionalData: any,
+  triggerEvent = true
+) {
+  if (triggerEvent) {
+    const customEtName = eventData.taskName;
+    const eventOutputData: clickEvent = {
+      etData: eventData.input,
+      taskId: eventData.taskId,
+      timestamp: Date.now(),
+      customData,
+      additionalData,
+    };
+    dispatchEvent('ON_CLICK', eventName + ':' + customEtName, eventOutputData);
+  }
+}
+
 const isLeafData = (value: any) => {
   switch (typeof value) {
     case 'boolean':
@@ -223,8 +243,18 @@ export function handleDynamicValues(jsonInput: any, dataBlob: any) {
                 json: dataBlob,
                 path,
               });
-              const outputResp = output.pop();
-              if (outputResp) jsonInput[key] = outputResp;
+
+              let outputResp = output.pop();
+              if (outputResp) {
+                value.shift();
+                if (
+                  Array.isArray(outputResp) &&
+                  value &&
+                  Array.isArray(value)
+                ) {
+                  jsonInput[key] = [...outputResp, ...value];
+                } else jsonInput[key] = outputResp;
+              }
             }
           } else if (typeof value[0] === 'object') {
             jsonInput[key] = value.map((val) => {
@@ -238,3 +268,14 @@ export function handleDynamicValues(jsonInput: any, dataBlob: any) {
   }
   return jsonInput;
 }
+
+export const maskContact = (contact: string) => {
+  if (contact.includes('@')) {
+    const [name, domain] = contact.split('@');
+    const maskedName = name.substring(0, 3) + '****';
+    const maskedEmail = maskedName + '@' + domain;
+    return maskedEmail;
+  } else {
+    return `${contact.slice(0, 2)}****${contact.slice(-4)}`;
+  }
+};

package/src/utils/Logger.ts

@@ -1,6 +1,4 @@
-import DispatchSdkCache from '../manager/sdk/DispatchSdkCache';
 import type { DispatchSDKConfig } from '../models/sdk';
-import * as Sentry from '@sentry/react-native';
 import crashlytics from '@react-native-firebase/crashlytics';
 
 export const enum LOG_TYPE {
@@ -33,8 +31,6 @@ class Logger {
 
   logEvent(TAG: string, message: string, logType: LOG_TYPE) {
     if (this.enableLogs) console.log(TAG, message);
-    // crashlytics().log(`${TAG} - ${logType} -${message}`);
-    // this.sendSentryMessage(message, TAG, logType);
     if (
       logType === LOG_TYPE.SDK_WARNING ||
       logType === LOG_TYPE.SDK_ERROR ||
@@ -42,8 +38,7 @@ class Logger {
       logType === LOG_TYPE.APP_WARNING
     ) {
       crashlytics().recordError(new Error(message), TAG);
-      //this.sendSentryException(new Error(message), TAG, logType);
-     }
+    }
   }
 
 
@@ -53,58 +48,6 @@ class Logger {
     }
     return Logger.instance;
   }
-
-  // public sendSentryException(exception: any, logTag: string, logType: string) {
-  //   // (async () => {
-  //   //   try {
-  //   //     Sentry.captureException(
-  //   //       exception,
-  //   //       await this.getUserConfig(Severity.Error, logType, logTag)
-  //   //     );
-  //   //   } catch (error: any) {}
-  //   // })();
-  // }
-
-  // public sendSentryMessage(message: string, logTag: string, logType: string) {
-  //   // (async () => {
-  //   //   try {
-  //   //     Sentry.captureMessage(
-  //   //       message,
-  //   //       await this.getUserConfig(Severity.Warning, logType, logTag)
-  //   //     );
-  //   //   } catch (error: any) {}
-  //   // })();
-  // }
-
-  // private async getUserConfig(
-  //   logLevel: Severity,
-  //   logType: string,
-  //   logTag: string
-  // ) {
-  //   try {
-  //     const config = (await DispatchSdkCache.getInstance().getObjectFromCache(
-  //       DispatchSdkCache.KEYS.SDK_CONFIG
-  //     )) as DispatchSDKConfig;
-  //     const dspId = await DispatchSdkCache.getInstance().getKeyFromCache(
-  //       DispatchSdkCache.KEYS.DISPATCH_ID
-  //     );
-  //     return {
-  //       user: {
-  //         id: config?.userID,
-  //         username: config?.userName,
-  //       },
-  //       tags: {
-  //         dispatchId: dspId,
-  //         errorTime: Date.now(),
-  //         logType: logType,
-  //         logTag: logTag,
-  //       },
-  //       level: logLevel,
-  //     };
-  //   } catch (error: any) {
-  //     return undefined;
-  //   }
-  // }
 }
 
 export default Logger;

package/src/utils/SyncManagerUtils.ts

@@ -224,6 +224,7 @@ export async function createFmsFolder(dispatchID: string) {
     .join('')}`;
   let fmsFolder = await cache.getKeyFromCache(keys.FMS_FOLDER);
   const dspID = await cache.getKeyFromCache(keys.DISPATCH_ID);
+  // await cache.setKeyInCache(keys.FMS_FOLDER, folderName); //FOR TESTING WHILE USING COREOS TOKEN DIRECTLY
   if (!isEmptyOrBlank(fmsFolder) && dspID != null && dspID === dispatchID) {
     return;
   } else {

package/src/utils/context/paymentContext.ts

@@ -0,0 +1,8 @@
+import { createContext } from 'react';
+import { DispatchSDKConfig } from '../../models/sdk';
+import NetworkClient from '../../network/NetworkClient';
+
+export const PaymentContext = createContext<{
+  sdkConfig: DispatchSDKConfig;
+  networkInstance: NetworkClient;
+} | null>(null);

package/src/utils/fcm/FCM.ts

@@ -2,6 +2,8 @@ import { Component } from 'react';
 import messaging from '@react-native-firebase/messaging';
 import Logger, { LOG_TYPE } from '../Logger';
 import DispatchSdkCache from '../../manager/sdk/DispatchSdkCache';
+import { dispatch } from '../../events/EventDispatcher';
+import { PAYMENT_NOTIFICATION } from '../../constants/constants';
 // import JobRemovalManager from '../../manager/jobRemoval/JobRemovalManager';
 
 const cache = DispatchSdkCache.getInstance();
@@ -44,7 +46,16 @@ abstract class FCM extends Component<any, any> {
       //     return;
       //   }
       // }
+      console.log("remoteMessage2:",remoteMessage)
 
+      if (remoteMessage?.data?.type === PAYMENT_NOTIFICATION) {
+        dispatch(
+          PAYMENT_NOTIFICATION,
+          remoteMessage?.data?.data
+            ? JSON.stringify(remoteMessage?.data?.data)
+            : null
+        );
+      }
       this.handleFcmMessage(remoteMessage);
     });
 
@@ -73,7 +84,16 @@ abstract class FCM extends Component<any, any> {
       //     return;
       //   }
       // }
+      console.log("remoteMessage3:",remoteMessage)
 
+      if (remoteMessage?.data?.type === PAYMENT_NOTIFICATION) {
+        dispatch(
+          PAYMENT_NOTIFICATION,
+          remoteMessage?.data?.data
+            ? JSON.stringify(remoteMessage?.data?.data)
+            : null
+        );
+      }
       this.handleNotification(remoteMessage);
     });
 
@@ -105,7 +125,17 @@ abstract class FCM extends Component<any, any> {
           //     return;
           //   }
           // }
+          
+          console.log("remoteMessage4:",remoteMessage)
 
+          if (remoteMessage?.data?.type === PAYMENT_NOTIFICATION) {
+            dispatch(
+              PAYMENT_NOTIFICATION,
+              remoteMessage?.data?.data
+                ? JSON.stringify(remoteMessage?.data?.data)
+                : null
+            );
+          }
           this.handleNotification(remoteMessage);
         }
       });

package/src/utils/fcm/FcmUtils.ts

@@ -3,6 +3,9 @@ import messaging from '@react-native-firebase/messaging';
 import Logger, { LOG_TYPE } from '../Logger';
 import type { messageReceived, tokenRefreshed } from '../../models/fcm';
 import DispatchSdkCache from '../../manager/sdk/DispatchSdkCache';
+import { PAYMENT_NOTIFICATION } from '../../constants/constants';
+import { dispatch } from '../..//events/EventDispatcher';
+import { Platform } from 'react-native';
 // import JobRemovalManager from '../../manager/jobRemoval/JobRemovalManager';
 
 const cache = DispatchSdkCache.getInstance();
@@ -34,7 +37,18 @@ export default function useFCMMessage() {
         JSON.stringify(remoteMessage),
         LOG_TYPE.SDK_INFO
       );
-
+      console.log("remoteMessage1:",JSON.stringify(remoteMessage));
+      if (remoteMessage?.data?.type === PAYMENT_NOTIFICATION) {
+        console.log("remoteMessage2:",JSON.stringify(remoteMessage));
+        dispatch(
+          PAYMENT_NOTIFICATION,
+          remoteMessage?.data?.data
+            ? JSON.parse(remoteMessage?.data?.data as string)
+            : null
+        );
+        return;
+      }
+     
       setMessage(remoteMessage);
     });
     return () => {
@@ -89,42 +103,52 @@ async function generateFCMToken(): Promise<string | null> {
 }
 export function registerBackgroundHandler(callback: messageReceived) {
   messaging().setBackgroundMessageHandler(async (remoteMessage) => {
-    Logger.getInstance().logEvent('setBackgroundMessageHandler Message arrived ',
-      JSON.stringify(remoteMessage), LOG_TYPE.SDK_INFO);
+    Logger.getInstance().logEvent(
+      'setBackgroundMessageHandler Message arrived ',
+      JSON.stringify(remoteMessage),
+      LOG_TYPE.SDK_INFO
+    );
     callback(remoteMessage);
   });
 }
 
 export function onNotificationOpenedApp(callback: messageReceived) {
-  messaging().onNotificationOpenedApp(
-    async (remoteMessage) => {
-      Logger.getInstance().logEvent('onNotificationOpenedApp Notification Arrived',
-        JSON.stringify(remoteMessage), LOG_TYPE.SDK_INFO);
-      callback(remoteMessage);
-    }
-  );
+  messaging().onNotificationOpenedApp(async (remoteMessage) => {
+    Logger.getInstance().logEvent(
+      'onNotificationOpenedApp Notification Arrived',
+      JSON.stringify(remoteMessage),
+      LOG_TYPE.SDK_INFO
+    );
+    callback(remoteMessage);
+  });
 }
 
 export function getInitialNotification(callback: messageReceived) {
-  messaging().getInitialNotification().then(async (remoteMessage) => {
-    if (remoteMessage) {
-      Logger.getInstance().logEvent('getInitialNotification Notification Arrived',
-        JSON.stringify(remoteMessage), LOG_TYPE.SDK_INFO);
-      callback(remoteMessage);
-    }
-  });
+  messaging()
+    .getInitialNotification()
+    .then(async (remoteMessage) => {
+      if (remoteMessage) {
+        Logger.getInstance().logEvent(
+          'getInitialNotification Notification Arrived',
+          JSON.stringify(remoteMessage),
+          LOG_TYPE.SDK_INFO
+        );
+        callback(remoteMessage);
+      }
+    });
 }
 
 export function onTokenRefresh(callback: tokenRefreshed) {
-  messaging().onTokenRefresh(
-    async (token) => {
-      await cache.setKeyInCache(
-        DispatchSdkCache.KEYS.FIREBASE_REGISTRATION_TOKEN,
-        token
-      );
-      Logger.getInstance().logEvent('onTokenRefresh Called',
-      token, LOG_TYPE.SDK_INFO);
-      callback(token);
-    }
-  );
-}
+  messaging().onTokenRefresh(async (token) => {
+    await cache.setKeyInCache(
+      DispatchSdkCache.KEYS.FIREBASE_REGISTRATION_TOKEN,
+      token
+    );
+    Logger.getInstance().logEvent(
+      'onTokenRefresh Called',
+      token,
+      LOG_TYPE.SDK_INFO
+    );
+    callback(token);
+  });
+}

package/lib/commonjs/icons/circleMark.svg

@@ -1,3 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.9414 7.06434C12.6973 6.82067 12.3016 6.82067 12.0578 7.06434L10 9.11891L7.94141 7.06434C7.69727 6.82067 7.30156 6.82067 7.05781 7.06434C6.81406 7.308 6.81367 7.70293 7.05781 7.94621L9.11719 10L7.05859 12.0546C6.81445 12.2982 6.81445 12.6932 7.05859 12.9364C7.30258 13.1799 7.69805 13.1803 7.94219 12.9364L10 10.8811L12.0582 12.9353C12.3022 13.1788 12.6977 13.1791 12.9418 12.9353C13.1859 12.6916 13.1859 12.2967 12.9418 12.0534L10.8828 10L12.941 7.94582C13.1875 7.70371 13.1875 7.30605 12.9414 7.06434ZM10 0.0195312C4.47656 0.0195312 0 4.48735 0 10C0 15.5126 4.47656 19.9805 10 19.9805C15.5234 19.9805 20 15.5126 20 10C20 4.48735 15.5234 0.0195312 10 0.0195312ZM10 18.7329C5.17578 18.7329 1.25 14.8148 1.25 10C1.25 5.1852 5.17578 1.26709 10 1.26709C14.8242 1.26709 18.75 5.1852 18.75 10C18.75 14.8148 14.8242 18.7329 10 18.7329Z" fill="#A3AAC2"/>
-</svg>

package/lib/module/icons/circleMark.svg

@@ -1,3 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.9414 7.06434C12.6973 6.82067 12.3016 6.82067 12.0578 7.06434L10 9.11891L7.94141 7.06434C7.69727 6.82067 7.30156 6.82067 7.05781 7.06434C6.81406 7.308 6.81367 7.70293 7.05781 7.94621L9.11719 10L7.05859 12.0546C6.81445 12.2982 6.81445 12.6932 7.05859 12.9364C7.30258 13.1799 7.69805 13.1803 7.94219 12.9364L10 10.8811L12.0582 12.9353C12.3022 13.1788 12.6977 13.1791 12.9418 12.9353C13.1859 12.6916 13.1859 12.2967 12.9418 12.0534L10.8828 10L12.941 7.94582C13.1875 7.70371 13.1875 7.30605 12.9414 7.06434ZM10 0.0195312C4.47656 0.0195312 0 4.48735 0 10C0 15.5126 4.47656 19.9805 10 19.9805C15.5234 19.9805 20 15.5126 20 10C20 4.48735 15.5234 0.0195312 10 0.0195312ZM10 18.7329C5.17578 18.7329 1.25 14.8148 1.25 10C1.25 5.1852 5.17578 1.26709 10 1.26709C14.8242 1.26709 18.75 5.1852 18.75 10C18.75 14.8148 14.8242 18.7329 10 18.7329Z" fill="#A3AAC2"/>
-</svg>

package/src/icons/circleMark.svg

@@ -1,3 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.9414 7.06434C12.6973 6.82067 12.3016 6.82067 12.0578 7.06434L10 9.11891L7.94141 7.06434C7.69727 6.82067 7.30156 6.82067 7.05781 7.06434C6.81406 7.308 6.81367 7.70293 7.05781 7.94621L9.11719 10L7.05859 12.0546C6.81445 12.2982 6.81445 12.6932 7.05859 12.9364C7.30258 13.1799 7.69805 13.1803 7.94219 12.9364L10 10.8811L12.0582 12.9353C12.3022 13.1788 12.6977 13.1791 12.9418 12.9353C13.1859 12.6916 13.1859 12.2967 12.9418 12.0534L10.8828 10L12.941 7.94582C13.1875 7.70371 13.1875 7.30605 12.9414 7.06434ZM10 0.0195312C4.47656 0.0195312 0 4.48735 0 10C0 15.5126 4.47656 19.9805 10 19.9805C15.5234 19.9805 20 15.5126 20 10C20 4.48735 15.5234 0.0195312 10 0.0195312ZM10 18.7329C5.17578 18.7329 1.25 14.8148 1.25 10C1.25 5.1852 5.17578 1.26709 10 1.26709C14.8242 1.26709 18.75 5.1852 18.75 10C18.75 14.8148 14.8242 18.7329 10 18.7329Z" fill="#A3AAC2"/>
-</svg>