@wise/dynamic-flow-client 2.8.4 → 2.8.5

package/build/main.js

@@ -3520,9 +3520,9 @@ var import_react17 = require("react");
 var import_components11 = require("@transferwise/components");
 var import_react_intl13 = require("react-intl");
 
-// src/legacy/jsonSchemaForm/help/Help.messages.js
+// src/common/helpMessages/help.messages.ts
 var import_react_intl12 = require("react-intl");
-var Help_messages_default = (0, import_react_intl12.defineMessages)({
+var help_messages_default = (0, import_react_intl12.defineMessages)({
   helpAria: {
     id: "dynamicFlows.Help.ariaLabel",
     defaultMessage: "Click here for more info.",
@@ -3541,7 +3541,7 @@ var Help = (props) => {
       content: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(import_components11.Markdown, { children: props.help.markdown }),
       presentation: "POPOVER",
       size: "sm",
-      "aria-label": intl.formatMessage(Help_messages_default.helpAria)
+      "aria-label": intl.formatMessage(help_messages_default.helpAria)
     }
   );
 };
@@ -7304,9 +7304,16 @@ var DynamicFlowComponent = ({
     dispatchEvent("Dynamic Flow - Step Submitted", { actionId: action.id || action.$id });
     try {
       const response = await dfHttpClient({ action, data });
+      if (action.exit && response.ok) {
+        await handleExitResponse(response, action.result);
+        return;
+      }
       await handleResponse(response, "submission");
     } catch (error) {
-      completeWithError(error, "Error fetching next step");
+      completeWithError(
+        error,
+        action.exit ? "Error fetching exit result" : "Error fetching next step"
+      );
     }
   };
   const performRefresh = async (url, data, etag2) => {
@@ -7319,15 +7326,6 @@ var DynamicFlowComponent = ({
       completeWithError(error, "Error fetching refresh step");
     }
   };
-  const performExitAction = async (action, data) => {
-    setLoadingState("submission");
-    try {
-      const response = await dfHttpClient({ action, data });
-      await handleExitResponse(response, action.result);
-    } catch (error) {
-      completeWithError(error, "Error fetching exit result");
-    }
-  };
   const handleExitResponse = async (response, actionResult) => {
     const exitResult = await getJsonObjectOrNull(response);
     dispatchEventAndComplete(__spreadValues(__spreadValues({}, exitResult), actionResult));
@@ -7443,7 +7441,6 @@ var DynamicFlowComponent = ({
       dispatchEventAndComplete(action.result);
       return;
     }
-    const actionHandler = action.exit ? performExitAction : performAction;
     const { data, method, skipValidation } = action;
     const submissionData = __spreadValues(__spreadValues({}, combineModels2(models)), data);
     if (isSubmissionMethod(method)) {
@@ -7452,10 +7449,10 @@ var DynamicFlowComponent = ({
         setSubmitted(true);
       }
       if (modelIsValid || skipValidation) {
-        await actionHandler(action, submissionData);
+        await performAction(action, submissionData);
       }
     } else {
-      await actionHandler(action);
+      await performAction(action);
     }
   };
   return /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(LogProvider, { flowId, stepId: (step == null ? void 0 : step.id) || (step == null ? void 0 : step.key), onLog, children: /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(EventsContextProvider, { metadata: analyticsMetadata, onEvent, children: /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(DynamicFlowProvider, { loading: isLoading, children: /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(HttpClientProvider, { httpClient, children: /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(FeatureContextProvider, { features, children: loader !== null ? loader : /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(