Merge remote-tracking branch 'origin/dev' into bal-3619

ballerine-io · Feb 27, 2025 · 8357918 · 8357918
2 parents c9804c3 + 588cd2c
commit 8357918
Show file tree

Hide file tree

Showing 23 changed files with 160 additions and 45 deletions.
diff --git a/apps/backoffice-v2/CHANGELOG.md b/apps/backoffice-v2/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @ballerine/backoffice-v2
 
+## 0.7.106
+
+### Patch Changes
+
+- @ballerine/workflow-browser-sdk@0.6.98
+- @ballerine/workflow-node-sdk@0.6.98
+
 ## 0.7.105
 
 ### Patch Changes

diff --git a/apps/backoffice-v2/package.json b/apps/backoffice-v2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ballerine/backoffice-v2",
-  "version": "0.7.105",
+  "version": "0.7.106",
   "description": "Ballerine - Backoffice",
   "homepage": "https://github.com/ballerine-io/ballerine",
   "type": "module",
@@ -54,8 +54,8 @@
   "dependencies": {
     "@ballerine/blocks": "0.2.34",
     "@ballerine/common": "0.9.77",
-    "@ballerine/workflow-browser-sdk": "0.6.97",
-    "@ballerine/workflow-node-sdk": "0.6.97",
+    "@ballerine/workflow-browser-sdk": "0.6.98",
+    "@ballerine/workflow-node-sdk": "0.6.98",
     "@ballerine/react-pdf-toolkit": "^1.2.79",
     "@ballerine/ui": "^0.5.79",
     "@botpress/webchat": "^2.1.10",

diff --git a/...backoffice-v2/src/pages/MerchantMonitoring/components/MerchantMonitoringTable/columns.tsx b/...backoffice-v2/src/pages/MerchantMonitoring/components/MerchantMonitoringTable/columns.tsx
@@ -196,6 +196,24 @@ export const columns = [
     },
     header: 'Report ID',
   }),
+  columnHelper.accessor('business.correlationId', {
+    cell: info => {
+      // eslint-disable-next-line react-hooks/rules-of-hooks -- ESLint doesn't like `cell` not being `Cell`.
+      const { ref, styles } = useEllipsesWithTitle<HTMLSpanElement>();
+      const merchantId = info.getValue() ?? info.row.original.business?.id;
+
+      return (
+        <div className={`flex w-full max-w-[12ch] items-center space-x-2`}>
+          <TextWithNAFallback style={{ ...styles, width: '70%' }} ref={ref}>
+            {merchantId}
+          </TextWithNAFallback>
+
+          <CopyToClipboardButton textToCopy={merchantId ?? ''} />
+        </div>
+      );
+    },
+    header: 'Merchant ID',
+  }),
   columnHelper.accessor('status', {
     meta: {
       useWrapper: true,

diff --git a/...MonitoringTable/hooks/useMerchantMonitoringTableLogic/useMerchantMonitoringTableLogic.tsx b/...MonitoringTable/hooks/useMerchantMonitoringTableLogic/useMerchantMonitoringTableLogic.tsx
@@ -29,7 +29,7 @@ export const useMerchantMonitoringTableLogic = () => {
         {children}
       </Link>
     ) : (
-      children
+      <div className={`d-full flex p-1 opacity-50`}>{children}</div>
     );
   };
 

diff --git a/apps/kyb-app/CHANGELOG.md b/apps/kyb-app/CHANGELOG.md
@@ -1,5 +1,12 @@
 # kyb-app
 
+## 0.3.134
+
+### Patch Changes
+
+- Bump
+  - @ballerine/workflow-browser-sdk@0.6.98
+
 ## 0.3.133
 
 ### Patch Changes

diff --git a/apps/kyb-app/package.json b/apps/kyb-app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@ballerine/kyb-app",
   "private": true,
-  "version": "0.3.133",
+  "version": "0.3.134",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -18,7 +18,7 @@
   "dependencies": {
     "@ballerine/blocks": "0.2.34",
     "@ballerine/common": "^0.9.77",
-    "@ballerine/workflow-browser-sdk": "0.6.97",
+    "@ballerine/workflow-browser-sdk": "0.6.98",
     "@ballerine/ui": "0.5.79",
     "@lukemorales/query-key-factory": "^1.0.3",
     "@radix-ui/react-icons": "^1.3.0",

diff --git a/apps/kyb-app/src/components/organisms/DynamicUI/rule-engines/json-schema.rule-engine.ts b/apps/kyb-app/src/components/organisms/DynamicUI/rule-engines/json-schema.rule-engine.ts
@@ -1,15 +1,15 @@
-import dayjs from 'dayjs';
-import uniqBy from 'lodash/uniqBy';
-import ajvErrors from 'ajv-errors';
 import { AnyObject } from '@ballerine/ui';
-import Ajv, { ErrorObject } from 'ajv/dist/2019';
+import ajvErrors from 'ajv-errors';
 import addFormats, { FormatName } from 'ajv-formats';
+import Ajv, { ErrorObject } from 'ajv/dist/2019';
+import dayjs from 'dayjs';
+import uniqBy from 'lodash/uniqBy';
 
-import { Rule, UIElement } from '@/domains/collection-flow';
 import {
   ErrorField,
   RuleEngine,
 } from '@/components/organisms/DynamicUI/rule-engines/rule-engine.abstract';
+import { Rule, UIElement } from '@/domains/collection-flow';
 
 const addCustomFormats = (validator: Ajv) => {
   validator.addFormat('non-past-date', {
@@ -24,6 +24,33 @@ const addCustomFormats = (validator: Ajv) => {
       return inputDate.startOf('day').valueOf() >= dayjs().startOf('day').valueOf();
     },
   });
+
+  validator.addFormat('minAge', {
+    type: 'string',
+    validate: (dateString: string, schema?: { minAge?: number }) => {
+      const inputDate = dayjs(dateString);
+
+      if (!inputDate.isValid()) {
+        return false;
+      }
+
+      // Default to 18 if not specified
+      const requiredAge = schema?.minAge || 18;
+      const today = dayjs();
+      const birthDate = dayjs(dateString);
+
+      // Calculate age
+      let age = today.year() - birthDate.year();
+      const monthDiff = today.month() - birthDate.month();
+
+      // Adjust age if birthday hasn't occurred yet this year
+      if (monthDiff < 0 || (monthDiff === 0 && today.date() < birthDate.date())) {
+        age--;
+      }
+
+      return age >= requiredAge;
+    },
+  });
 };
 
 export class JsonSchemaRuleEngine implements RuleEngine {

diff --git a/apps/kyb-app/src/domains/collection-flow/types/index.ts b/apps/kyb-app/src/domains/collection-flow/types/index.ts
@@ -148,6 +148,7 @@ export interface UIOptions {
     success?: string;
     failure?: string;
   };
+  disableLanguageSelection?: boolean;
 }
 
 export interface UISchema {

diff --git a/apps/kyb-app/src/helpers/transform-errors.ts b/apps/kyb-app/src/helpers/transform-errors.ts
@@ -50,6 +50,10 @@ export const transformRJSFErrors = (errors: RJSFValidationError[]): RJSFValidati
       error.message = 'Please provide valid email address.';
     }
 
+    if (error.params?.format === 'minAge18') {
+      error.message = 'You must be at least 18 years old to apply.';
+    }
+
     return error;
   });
 };
diff --git a/apps/kyb-app/src/pages/CollectionFlow/versions/v1/CollectionFlowV1.tsx b/apps/kyb-app/src/pages/CollectionFlow/versions/v1/CollectionFlowV1.tsx
@@ -119,23 +119,29 @@ export const CollectionFlowV1 = withSessionProtected(() => {
   const [isLogoLoaded, setLogoLoaded] = useState(customer?.logoImageUri ? false : true);
 
   useEffect(() => {
-    if (!customer?.logoImageUri) return;
+    if (!customer?.logoImageUri) {
+      return;
+    }
 
     // Resseting loaded state in case of logo change
     setLogoLoaded(false);
   }, [customer?.logoImageUri]);
 
-  if (getCollectionFlowState(initialContext)?.status === CollectionFlowStatusesEnum.approved)
+  if (getCollectionFlowState(initialContext)?.status === CollectionFlowStatusesEnum.approved) {
     return <Approved />;
+  }
 
-  if (getCollectionFlowState(initialContext)?.status === CollectionFlowStatusesEnum.rejected)
+  if (getCollectionFlowState(initialContext)?.status === CollectionFlowStatusesEnum.rejected) {
     return <Rejected />;
+  }
 
-  if (getCollectionFlowState(initialContext)?.status === CollectionFlowStatusesEnum.completed)
+  if (getCollectionFlowState(initialContext)?.status === CollectionFlowStatusesEnum.completed) {
     return <CompletedScreen />;
+  }
 
-  if (getCollectionFlowState(initialContext)?.status === CollectionFlowStatusesEnum.failed)
+  if (getCollectionFlowState(initialContext)?.status === CollectionFlowStatusesEnum.failed) {
     return <FailedScreen />;
+  }
 
   return definition && collectionFlowData ? (
     <DynamicUI initialState={initialUIState}>
@@ -184,11 +190,17 @@ export const CollectionFlowV1 = withSessionProtected(() => {
             >
               {() => {
                 // Temp state, has to be resolved to success or failure by plugins
-                if (state === 'done') return <LoadingScreen />;
+                if (state === 'done') {
+                  return <LoadingScreen />;
+                }
 
-                if (isCompleted(state)) return <CompletedScreen />;
+                if (isCompleted(state)) {
+                  return <CompletedScreen />;
+                }
 
-                if (isFailed(state)) return <FailedScreen />;
+                if (isFailed(state)) {
+                  return <FailedScreen />;
+                }
 
                 return (
                   <DynamicUI.PageResolver state={state} pages={elements ?? []}>
@@ -205,9 +217,11 @@ export const CollectionFlowV1 = withSessionProtected(() => {
                                   <div className="flex h-full flex-1 flex-col">
                                     <div className="flex justify-between gap-8 pb-10">
                                       <AppShell.Navigation />
-                                      <div className="flex w-full justify-end">
-                                        <AppShell.LanguagePicker />
-                                      </div>
+                                      {schema?.uiOptions?.disableLanguageSelection ? null : (
+                                        <div className="flex w-full justify-end">
+                                          <AppShell.LanguagePicker />
+                                        </div>
+                                      )}
                                     </div>
                                     <div className="pb-10">
                                       {customer?.logoImageUri && (

diff --git a/apps/kyb-app/src/pages/CollectionFlow/versions/v2/CollectionFlowV2.tsx b/apps/kyb-app/src/pages/CollectionFlow/versions/v2/CollectionFlowV2.tsx
@@ -154,9 +154,11 @@ export const CollectionFlowV2 = withSessionProtected(() => {
                                   <div className="flex h-full flex-1 flex-col">
                                     <div className="flex justify-between gap-8 pb-10">
                                       <AppShell.Navigation />
-                                      <div className="flex w-full justify-end">
-                                        <AppShell.LanguagePicker />
-                                      </div>
+                                      {schema?.uiOptions?.disableLanguageSelection ? null : (
+                                        <div className="flex w-full justify-end">
+                                          <AppShell.LanguagePicker />
+                                        </div>
+                                      )}
                                     </div>
                                     <div className="pb-10">
                                       {customer?.logoImageUri && (
@@ -175,11 +177,11 @@ export const CollectionFlowV2 = withSessionProtected(() => {
                                       ) : null}
                                     </div>
                                     <div>
-                                      {themeDefinition.settings.contactInformation ? (
+                                      {themeDefinition.settings?.contactInformation ? (
                                         <div
                                           className="text-sm"
                                           dangerouslySetInnerHTML={{
-                                            __html: themeDefinition.settings.contactInformation,
+                                            __html: themeDefinition.settings?.contactInformation,
                                           }}
                                         />
                                       ) : customer?.displayName ? (

diff --git a/examples/headless-example/CHANGELOG.md b/examples/headless-example/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @ballerine/headless-example
 
+## 0.3.97
+
+### Patch Changes
+
+- @ballerine/workflow-browser-sdk@0.6.98
+
 ## 0.3.96
 
 ### Patch Changes

diff --git a/examples/headless-example/package.json b/examples/headless-example/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@ballerine/headless-example",
   "private": true,
-  "version": "0.3.96",
+  "version": "0.3.97",
   "type": "module",
   "scripts": {
     "spellcheck": "cspell \"*\"",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@ballerine/common": "0.9.77",
-    "@ballerine/workflow-browser-sdk": "0.6.97",
+    "@ballerine/workflow-browser-sdk": "0.6.98",
     "@felte/reporter-svelte": "^1.1.5",
     "@felte/validator-zod": "^1.0.13",
     "@fontsource/inter": "^4.5.15",

diff --git a/packages/workflow-core/CHANGELOG.md b/packages/workflow-core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @ballerine/workflow-core
 
+## 0.6.98
+
+### Patch Changes
+
+- Bump
+
 ## 0.6.97
 
 ### Patch Changes

diff --git a/packages/workflow-core/package.json b/packages/workflow-core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@ballerine/workflow-core",
   "author": "Ballerine <[email protected]>",
-  "version": "0.6.97",
+  "version": "0.6.98",
   "description": "workflow-core",
   "module": "./dist/esm/index.js",
   "main": "./dist/cjs/index.js",

diff --git a/packages/workflow-core/src/lib/plugins/external-plugin/vendor-consts.ts b/packages/workflow-core/src/lib/plugins/external-plugin/vendor-consts.ts
@@ -830,6 +830,7 @@ export const BALLERINE_API_PLUGIN_FACTORY = {
             transformer: 'jmespath',
             mapping: `{
               ${options.dataMapping || ''}
+              context: @,
               companyName: data.companyName,
               customerName: metadata.customerName,
               collectionFlowUrl: join('',['{secret.COLLECTION_FLOW_URL}','/?token=',metadata.token,'&lng=',workflowRuntimeConfig.language]),

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,7 @@ export const useMerchantMonitoringTableLogic = () => { @@
             {children}
           </Link>
         ) : (
-          children
+          <div className={`d-full flex p-1 opacity-50`}>{children}</div>
         );
       };
@@ Expand Down @@