From a7687e9601a65a0f701e94c1da0154c454fca99d Mon Sep 17 00:00:00 2001 From: Yuwen Memon Date: Tue, 12 Mar 2024 13:23:13 -0700 Subject: [PATCH 1/2] Revert https://github.com/Expensify/expensify-common/pull/649 from version used on App --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2268adde8c32..f1c524dbe527 100644 --- a/package-lock.json +++ b/package-lock.json @@ -52,7 +52,7 @@ "date-fns-tz": "^2.0.0", "dom-serializer": "^0.2.2", "domhandler": "^4.3.0", - "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#ee0f33865e3a27245e5cf01ed0c62cf88d44bb10", + "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#cef0e5d57c093edfef8ad9c4d4a58df7bdb3ec5f", "expo": "^50.0.3", "expo-av": "~13.10.4", "expo-image": "1.10.1", @@ -30570,8 +30570,8 @@ }, "node_modules/expensify-common": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#ee0f33865e3a27245e5cf01ed0c62cf88d44bb10", - "integrity": "sha512-1w2PmSG12JxHxG6hYfBrGoJz3WqQGI9QgTVmRb9lDdy482ZH6ZtgOR8LURlPB0x6FjT+IKs6zbKQqE1eNXzE/g==", + "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#cef0e5d57c093edfef8ad9c4d4a58df7bdb3ec5f", + "integrity": "sha512-v6UnN9yAW6p2996Fvd4AZnMRnisVfjg6ijWzUQue/6JsjSY+MW10oP74hSjD6x32fRrNmMctjy6d5a79bQFdPA==", "license": "MIT", "dependencies": { "classnames": "2.5.0", diff --git a/package.json b/package.json index 948f1032f821..fdf6a5cacdb6 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "date-fns-tz": "^2.0.0", "dom-serializer": "^0.2.2", "domhandler": "^4.3.0", - "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#ee0f33865e3a27245e5cf01ed0c62cf88d44bb10", + "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#cef0e5d57c093edfef8ad9c4d4a58df7bdb3ec5f", "expo": "^50.0.3", "expo-av": "~13.10.4", "expo-image": "1.10.1", From 904c2675021895f8bb904f219343008262343f30 Mon Sep 17 00:00:00 2001 From: Yuwen Memon Date: Tue, 12 Mar 2024 13:40:40 -0700 Subject: [PATCH 2/2] Bump up to merge commit --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index f1c524dbe527..dc6270c4353f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -52,7 +52,7 @@ "date-fns-tz": "^2.0.0", "dom-serializer": "^0.2.2", "domhandler": "^4.3.0", - "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#cef0e5d57c093edfef8ad9c4d4a58df7bdb3ec5f", + "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#7bfd55f0ce75a37423119029fde58cfbe57086d9", "expo": "^50.0.3", "expo-av": "~13.10.4", "expo-image": "1.10.1", @@ -30570,7 +30570,7 @@ }, "node_modules/expensify-common": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#cef0e5d57c093edfef8ad9c4d4a58df7bdb3ec5f", + "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#7bfd55f0ce75a37423119029fde58cfbe57086d9", "integrity": "sha512-v6UnN9yAW6p2996Fvd4AZnMRnisVfjg6ijWzUQue/6JsjSY+MW10oP74hSjD6x32fRrNmMctjy6d5a79bQFdPA==", "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index fdf6a5cacdb6..8a4ef3f1dd1d 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "date-fns-tz": "^2.0.0", "dom-serializer": "^0.2.2", "domhandler": "^4.3.0", - "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#cef0e5d57c093edfef8ad9c4d4a58df7bdb3ec5f", + "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#7bfd55f0ce75a37423119029fde58cfbe57086d9", "expo": "^50.0.3", "expo-av": "~13.10.4", "expo-image": "1.10.1",