From 3089a4820303b6f826ade37e75b43fc29c1bcb7d Mon Sep 17 00:00:00 2001 From: FitseTLT Date: Wed, 28 Aug 2024 22:55:48 +0300 Subject: [PATCH 1/5] bump expensify-common version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f3b17855aa8b..70bdeac450b3 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "date-fns-tz": "^2.0.0", "dom-serializer": "^0.2.2", "domhandler": "^4.3.0", - "expensify-common": "2.0.76", + "expensify-common": "v2.0.83", "expo": "51.0.17", "expo-av": "14.0.6", "expo-image": "1.12.12", From 716644bbffaef4a2623b60c715c87d5829ea178b Mon Sep 17 00:00:00 2001 From: FitseTLT Date: Wed, 28 Aug 2024 22:58:51 +0300 Subject: [PATCH 2/5] update package lock json --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 054ab960e1d2..473db2d78b8d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -56,7 +56,7 @@ "date-fns-tz": "^2.0.0", "dom-serializer": "^0.2.2", "domhandler": "^4.3.0", - "expensify-common": "2.0.76", + "expensify-common": "v2.0.83", "expo": "51.0.17", "expo-av": "14.0.6", "expo-image": "1.12.12", @@ -26323,9 +26323,9 @@ } }, "node_modules/expensify-common": { - "version": "2.0.76", - "resolved": "https://registry.npmjs.org/expensify-common/-/expensify-common-2.0.76.tgz", - "integrity": "sha512-nCM6laaj25kurdiD9rhAXmQKhi8eciIFlshN8P4A7gsjFIScXnRG8fwXM5tX+8ET0vqAOA2SACeNVTT3vGUUsQ==", + "version": "2.0.83", + "resolved": "https://registry.npmjs.org/expensify-common/-/expensify-common-2.0.83.tgz", + "integrity": "sha512-7CHVxV5yEJ43GGKF0UXiLKaSdfKaSHE4YC2+30gKxuWbs5XrOLOK3TcCzk54uBfbmPjmx6VrADbR9uzS4H0A0g==", "dependencies": { "awesome-phonenumber": "^5.4.0", "classnames": "2.5.0", From 8b459aa3ca78e82647f4519277d0ce0df4d9f07c Mon Sep 17 00:00:00 2001 From: FitseTLT Date: Wed, 28 Aug 2024 23:47:12 +0300 Subject: [PATCH 3/5] fix conflict --- package-lock.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index fa858b1beb3d..e2859612a328 100644 --- a/package-lock.json +++ b/package-lock.json @@ -56,11 +56,7 @@ "date-fns-tz": "^2.0.0", "dom-serializer": "^0.2.2", "domhandler": "^4.3.0", -<<<<<<< HEAD "expensify-common": "v2.0.83", -======= - "expensify-common": "2.0.77", ->>>>>>> main "expo": "51.0.17", "expo-av": "14.0.6", "expo-image": "1.12.12", From d241ce24cea4bb76a45774d907524dbfbc8e8772 Mon Sep 17 00:00:00 2001 From: FitseTLT Date: Thu, 29 Aug 2024 19:32:31 +0300 Subject: [PATCH 4/5] minor fix --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index e2859612a328..cde1dfe13d18 100644 --- a/package-lock.json +++ b/package-lock.json @@ -56,7 +56,7 @@ "date-fns-tz": "^2.0.0", "dom-serializer": "^0.2.2", "domhandler": "^4.3.0", - "expensify-common": "v2.0.83", + "expensify-common": "2.0.83", "expo": "51.0.17", "expo-av": "14.0.6", "expo-image": "1.12.12", From e144a67d4dfd6a1f6aa183a8b9d026ad822b15a0 Mon Sep 17 00:00:00 2001 From: FitseTLT Date: Thu, 29 Aug 2024 19:35:15 +0300 Subject: [PATCH 5/5] remove v --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f618bfe81c71..f6cf70167541 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "date-fns-tz": "^2.0.0", "dom-serializer": "^0.2.2", "domhandler": "^4.3.0", - "expensify-common": "v2.0.83", + "expensify-common": "2.0.83", "expo": "51.0.17", "expo-av": "14.0.6", "expo-image": "1.12.12",