@swan-io/shared-business 7.4.6 → 8.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swan-io/shared-business",
-  "version": "7.4.6",
+  "version": "8.1.0",
   "engines": {
     "node": ">=18.0.0",
     "yarn": "^1.22.0"
@@ -31,9 +31,10 @@
   "dependencies": {
     "@formatjs/intl": "^2.10.1",
     "@placekit/client-js": "^2.3.0",
-    "@swan-io/boxed": "^2.1.1",
-    "@swan-io/request": "^1.0.2",
-    "@swan-io/use-form": "^2.0.0",
+    "@swan-io/boxed": "^2.2.1",
+    "@swan-io/graphql-client": "^0.1.1",
+    "@swan-io/request": "^1.0.5",
+    "@swan-io/use-form": "^2.0.2",
     "dayjs": "^1.11.10",
     "iban": "^0.0.14",
     "react": "^18.2.0",
@@ -43,7 +44,6 @@
     "react-native-web": "^0.19.10",
     "rifm": "^0.12.1",
     "ts-pattern": "^5.1.0",
-    "urql": "^4.0.7",
     "uuid": "^9.0.1"
   },
   "devDependencies": {

package/src/components/DatePicker.js

@@ -458,7 +458,7 @@ const MonthCalendar = ({ month, year, value, firstWeekDay, isSelectable, onChang
                 }) }, weekIndex)))] }));
 };
 const DatePickerPopoverContent = ({ value, format, firstWeekDay, desktop, isSelectable, onChange, }) => {
-    const [monthYear, setMonthYear] = useState(() => getYearMonth(value, format).getWithDefault(getTodayYearMonth()));
+    const [monthYear, setMonthYear] = useState(() => getYearMonth(value, format).getOr(getTodayYearMonth()));
     // Automatically change displayed year and month when user change the value with text input
     useEffect(() => {
         const yearMonth = getYearMonth(value, format);
@@ -494,7 +494,7 @@ export const DatePickerModal = ({ value, format, firstWeekDay, isSelectable, onC
     const handleConfirm = () => {
         submitForm({
             onSuccess: values => {
-                const date = values.date.getWithDefault("");
+                const date = values.date.getOr("");
                 if (isNotEmpty(date)) {
                     onChange(date);
                 }
@@ -519,8 +519,8 @@ const DateModal = ({ children, visible, maxWidth, withCloseButton, onPressClose,
 const DateRangePickerModalContent = ({ value, format, firstWeekDay, desktop, displayTwoCalendar, isSelectable, onChange, }) => {
     const isFirstMount = useFirstMountState();
     const [periods, setPeriods] = useState(() => {
-        const startYearMonth = getYearMonth(value.start, format).getWithDefault(getTodayYearMonth());
-        const endYearMonth = getYearMonth(value.end, format).getWithDefault(incrementYearMonth(startYearMonth));
+        const startYearMonth = getYearMonth(value.start, format).getOr(getTodayYearMonth());
+        const endYearMonth = getYearMonth(value.end, format).getOr(incrementYearMonth(startYearMonth));
         return {
             start: startYearMonth,
             end: isYearMonthEquals(startYearMonth, endYearMonth)

package/src/components/FileInput.js

@@ -105,7 +105,7 @@ export const FileInput = ({ icon = "document-regular", accept, value, disabled =
             .with(P.nullish, () => Option.None())
             .with({ url: P.string }, ({ url, name }) => Option.Some({
             url,
-            name: name !== null && name !== void 0 ? name : Result.fromExecution(() => new URL(url).pathname).getWithDefault("untitled"),
+            name: name !== null && name !== void 0 ? name : Result.fromExecution(() => new URL(url).pathname).getOr("untitled"),
         }))
             .with(P.instanceOf(File), file => Option.Some({
             name: file.name,

package/src/utils/i18n.js

@@ -1,5 +1,6 @@
 import { createIntl, createIntlCache } from "@formatjs/intl";
 import { getRifmProps } from "@swan-io/lake/src/utils/rifm";
+import { BadStatusError } from "@swan-io/request";
 import dayjs from "dayjs";
 import dayjsLocaleDE from "dayjs/locale/de";
 import dayjsLocaleEN from "dayjs/locale/en";
@@ -15,7 +16,6 @@ import relativeTime from "dayjs/plugin/relativeTime";
 import utc from "dayjs/plugin/utc";
 import { cloneElement, isValidElement } from "react";
 import { P, match } from "ts-pattern";
-import { CombinedError } from "urql";
 import translationDE from "../locales/de.json";
 import translationEN from "../locales/en.json";
 import translationES from "../locales/es.json";
@@ -133,9 +133,7 @@ export const translateError = (error) => {
         .returnType()
         .with({ __typename: P.select(P.string) }, __typename => `rejection.${__typename}`)
         .with(P.string, __typename => `rejection.${__typename}`)
-        .with(P.instanceOf(CombinedError), ({ response }) => match(response)
-        .with({ response: { status: P.select(P.number) } }, status => `error.network.${status}`)
-        .otherwise(() => "error.generic"))
+        .with(P.instanceOf(BadStatusError), ({ status }) => `error.network.${status}`)
         .with(P.instanceOf(Error), ({ message }) => `rejection.${message}`)
         .otherwise(() => "error.generic");
     return t(isTranslationKey(key) ? key : "error.generic");