Skip to content

Commit

Permalink
Merge branch 'main' into fix/focus-sync-selection-list
Browse files Browse the repository at this point in the history
  • Loading branch information
WojtekBoman committed Apr 16, 2024
2 parents a26ee23 + ed7029b commit 8321b44
Show file tree
Hide file tree
Showing 41 changed files with 304 additions and 442 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001046207
versionName "1.4.62-7"
versionCode 1001046210
versionName "1.4.62-10"
// Supported language variants must be declared here to avoid from being removed during the compilation.
// This also helps us to not include unnecessary language variants in the APK.
resConfigs "en", "es"
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ To change the roles and permissions for members of your workspace,
| Approve workspace reports | Only reports submitted to them | Yes | Yes |
| Edit workspace settings | No | No | Yes |

{:start="7"}
7. If your workspace uses Advanced Approvals, select an “Approves to.” This determines who the member’s reports must be approved by, if applicable. If “no one” is selected, then any one with the Auditor or Workspace Admin role can approve the member’s reports.
8. Click **Save**.

Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.4.62.7</string>
<string>1.4.62.10</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.4.62.7</string>
<string>1.4.62.10</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion ios/NotificationServiceExtension/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>CFBundleShortVersionString</key>
<string>1.4.62</string>
<key>CFBundleVersion</key>
<string>1.4.62.7</string>
<string>1.4.62.10</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
Expand Down
4 changes: 2 additions & 2 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1236,7 +1236,7 @@ PODS:
- React-Codegen
- React-Core
- ReactCommon/turbomodule/core
- react-native-geolocation (3.0.6):
- react-native-geolocation (3.2.1):
- glog
- hermes-engine
- RCT-Folly (= 2022.05.16.00)
Expand Down Expand Up @@ -2512,7 +2512,7 @@ SPEC CHECKSUMS:
react-native-cameraroll: 95ce0d1a7d2d1fe55bf627ab806b64de6c3e69e9
react-native-config: 5ce986133b07fc258828b20b9506de0e683efc1c
react-native-document-picker: 8532b8af7c2c930f9e202aac484ac785b0f4f809
react-native-geolocation: dcc37809bc117ffdb5946fecc127d62319ccd4a9
react-native-geolocation: c1c21a8cda4abae6724a322458f64ac6889b8c2b
react-native-image-picker: f8a13ff106bcc7eb00c71ce11fdc36aac2a44440
react-native-key-command: 74d18ad516037536c2f671ef0914bcce7739b2f5
react-native-launch-arguments: 5f41e0abf88a15e3c5309b8875d6fd5ac43df49d
Expand Down
22 changes: 13 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
"version": "1.4.62-7",
"version": "1.4.62-10",
"author": "Expensify, Inc.",
"homepage": "https://new.expensify.com",
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
Expand Down Expand Up @@ -79,7 +79,7 @@
"@react-native-async-storage/async-storage": "1.21.0",
"@react-native-camera-roll/camera-roll": "7.4.0",
"@react-native-clipboard/clipboard": "^1.13.2",
"@react-native-community/geolocation": "^3.0.6",
"@react-native-community/geolocation": "3.2.1",
"@react-native-community/netinfo": "11.2.1",
"@react-native-firebase/analytics": "^12.3.0",
"@react-native-firebase/app": "^12.3.0",
Expand Down Expand Up @@ -152,7 +152,7 @@
"react-native-linear-gradient": "^2.8.1",
"react-native-localize": "^2.2.6",
"react-native-modal": "^13.0.0",
"react-native-onyx": "2.0.23",
"react-native-onyx": "2.0.27",
"react-native-pager-view": "6.2.3",
"react-native-pdf": "6.7.3",
"react-native-performance": "^5.1.0",
Expand Down
Loading

0 comments on commit 8321b44

Please sign in to comment.