@swan-io/shared-business 8.15.14 → 8.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swan-io/shared-business",
-  "version": "8.15.14",
+  "version": "8.16.0",
   "engines": {
     "node": ">=20.9.0",
     "yarn": "^1.22.0"

package/src/components/DatePicker.d.ts

@@ -1,6 +1,7 @@
 import { Option } from "@swan-io/boxed";
 import { ValidatorResult } from "@swan-io/use-form";
 import { Except } from "type-fest";
+import { DateFormat } from "../utils/i18n";
 export type MonthNames = readonly [
     string,
     string,
@@ -34,7 +35,6 @@ export type DatePickerRange = {
     start: Option<DatePickerDate>;
     end: Option<DatePickerDate>;
 };
-export type DateFormat = "DD/MM/YYYY" | "MM/DD/YYYY";
 export declare const validateDateRangeOrder: (value: {
     start: string;
     end: string;

package/src/components/InlineDatePicker.js

@@ -12,7 +12,8 @@ import { useForm } from "@swan-io/use-form";
 import { StyleSheet, View } from "react-native";
 import { match } from "ts-pattern";
 import { extractDate, formatExtractedDate } from "../utils/date";
-import { getCountry, t } from "../utils/i18n";
+import { t } from "../utils/i18n";
+import { getMostLikelyUserCountry } from "../utils/localization";
 const months = [
     { value: "01", name: t("datePicker.month.january") },
     { value: "02", name: t("datePicker.month.february") },
@@ -50,7 +51,7 @@ const styles = StyleSheet.create({
     },
 });
 // https://en.wikipedia.org/wiki/List_of_date_formats_by_country
-const order = match(getCountry().cca2)
+const order = match(getMostLikelyUserCountry().cca2)
     .returnType()
     .with("US", () => "MDY")
     .with("CN", "JP", "KR", "KP", "TW", "HU", "MN", "LT", "BT", () => "YMD")

package/src/utils/i18n.d.ts

@@ -1,8 +1,7 @@
 import { RifmProps } from "@swan-io/lake/src/utils/rifm";
 import { ReactElement, ReactNode } from "react";
-import type { DateFormat } from "../components/DatePicker";
-import { Country } from "../constants/countries";
 import translationEN from "../locales/en.json";
+export type DateFormat = "DD/MM/YYYY" | "MM/DD/YYYY";
 declare const supportedLanguages: readonly ["en", "es", "de", "fr", "it", "nl", "pt", "fi"];
 type SupportedLanguage = (typeof supportedLanguages)[number];
 type TranslationParams = Record<string, string | number>;
@@ -23,5 +22,4 @@ export declare const formatNestedMessage: (key: TranslationKey, params: Record<s
 export declare const rifmDateProps: RifmProps;
 export declare const isTranslationKey: (value: unknown) => value is TranslationKey;
 export declare const translateError: (error: unknown) => string;
-export declare const getCountry: () => Country;
 export {};

package/src/utils/i18n.js

@@ -1,5 +1,4 @@
 import { createIntl, createIntlCache } from "@formatjs/intl";
-import { isNotNullish } from "@swan-io/lake/src/utils/nullish";
 import { getRifmProps } from "@swan-io/lake/src/utils/rifm";
 import { BadStatusError } from "@swan-io/request";
 import dayjs from "dayjs";
@@ -17,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 { countries, france } from "../constants/countries";
 import translationDE from "../locales/de.json";
 import translationEN from "../locales/en.json";
 import translationES from "../locales/es.json";
@@ -141,17 +139,3 @@ export const translateError = (error) => {
         .otherwise(() => "error.generic");
     return t(isTranslationKey(key) ? key : "error.generic");
 };
-export const getCountry = () => {
-    const navigatorCountries = navigator.languages
-        .map(language => language.split("-")[1])
-        .filter(isNotNullish);
-    for (let index = 0; index < navigatorCountries.length; index++) {
-        const navigatorCountry = navigatorCountries[index];
-        const country = countries.find(({ cca2 }) => cca2 === navigatorCountry);
-        if (isNotNullish(country)) {
-            return country;
-        }
-    }
-    // fallback to france when no valid country found in navigator locales
-    return france;
-};

package/src/utils/localization.d.ts

@@ -0,0 +1,2 @@
+import { Country } from "../constants/countries";
+export declare const getMostLikelyUserCountry: () => Country;

package/src/utils/localization.js

@@ -0,0 +1,16 @@
+import { isNotNullish } from "@swan-io/lake/src/utils/nullish";
+import { countries, france } from "../constants/countries";
+export const getMostLikelyUserCountry = () => {
+    const navigatorCountries = navigator.languages
+        .map(language => language.split("-")[1])
+        .filter(isNotNullish);
+    for (let index = 0; index < navigatorCountries.length; index++) {
+        const navigatorCountry = navigatorCountries[index];
+        const country = countries.find(({ cca2 }) => cca2 === navigatorCountry);
+        if (isNotNullish(country)) {
+            return country;
+        }
+    }
+    // fallback to france when no valid country found in navigator locales
+    return france;
+};