Skip to content

Commit

Permalink
Merge branch 'refs/heads/main' into VickyStash/feature/53141-remove-r…
Browse files Browse the repository at this point in the history
…eport-connection
  • Loading branch information
VickyStash committed Dec 2, 2024
2 parents bed2343 + 5b884db commit 02bdc4b
Show file tree
Hide file tree
Showing 441 changed files with 11,935 additions and 15,689 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1009006708
versionName "9.0.67-8"
versionCode 1009006901
versionName "9.0.69-1"
// 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
9 changes: 6 additions & 3 deletions contributingGuides/FORMS.md
Original file line number Diff line number Diff line change
Expand Up @@ -320,14 +320,17 @@ An example of this can be seen in the [ACHContractStep](https://github.com/Expen

### Safe Area Padding

Any `FormProvider.js` that has a button will also add safe area padding by default. If the `<FormProvider>` is inside a `<ScreenWrapper>`, we will want to disable the default safe area padding applied there e.g.
Any `FormProvider.tsx` that has a button at the bottom. If the `<FormProvider>` is inside a `<ScreenWrapper>`, the bottom safe area inset is handled automatically (`includeSafeAreaPaddingBottom` needs to be set to `true`, but its the default).
If you have custom requirements and can't use `<ScreenWrapper includeSafeAreaPaddingBottom={true}>`, you can use the `useStyledSafeAreaInsets()` hook:

```jsx
<ScreenWrapper includeSafeAreaPaddingBottom={false}>
const { paddingTop, paddingBottom, safeAreaPaddingBottomStyle } = useStyledSafeAreaInsets();

<View styles={[safeAreaPaddingBottomStyle, styles.pb5]}>
<FormProvider>
{...}
</FormProvider>
</ScreenWrapper>
</View>
```

### Handling nested Pickers in Form
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ios/NewExpensify/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>9.0.67</string>
<string>9.0.69</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -40,7 +40,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>9.0.67.8</string>
<string>9.0.69.1</string>
<key>FullStory</key>
<dict>
<key>OrgId</key>
Expand Down
4 changes: 2 additions & 2 deletions ios/NewExpensifyTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>9.0.67</string>
<string>9.0.69</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>9.0.67.8</string>
<string>9.0.69.1</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions ios/NotificationServiceExtension/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundleShortVersionString</key>
<string>9.0.67</string>
<string>9.0.69</string>
<key>CFBundleVersion</key>
<string>9.0.67.8</string>
<string>9.0.69.1</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
Expand Down
12 changes: 6 additions & 6 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1766,7 +1766,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-pager-view (6.5.0):
- react-native-pager-view (6.5.1):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1779,7 +1779,7 @@ PODS:
- React-featureflags
- React-graphics
- React-ImageManager
- react-native-pager-view/common (= 6.5.0)
- react-native-pager-view/common (= 6.5.1)
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
Expand All @@ -1788,7 +1788,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-pager-view/common (6.5.0):
- react-native-pager-view/common (6.5.1):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -2266,7 +2266,7 @@ PODS:
- React-utils (= 0.75.2)
- RNAppleAuthentication (2.2.2):
- React-Core
- RNCClipboard (1.14.0):
- RNCClipboard (1.15.0):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -3224,7 +3224,7 @@ SPEC CHECKSUMS:
react-native-keyboard-controller: 97bb7b48fa427c7455afdc8870c2978efd9bfa3a
react-native-launch-arguments: 5f41e0abf88a15e3c5309b8875d6fd5ac43df49d
react-native-netinfo: fb5112b1fa754975485884ae85a3fb6a684f49d5
react-native-pager-view: c64a744211a46202619a77509f802765d1659dba
react-native-pager-view: abc5ef92699233eb726442c7f452cac82f73d0cb
react-native-pdf: dd6ae39a93607a80919bef9f3499e840c693989d
react-native-performance: 3c608307be10964f8a97d3af462f37125b6d8fa5
react-native-plaid-link-sdk: f91a22b45b7c3d4cd6c47273200dc57df35068b0
Expand Down Expand Up @@ -3260,7 +3260,7 @@ SPEC CHECKSUMS:
ReactCodegen: 60973d382704c793c605b9be0fc7f31cb279442f
ReactCommon: 6ef348087d250257c44c0204461c03f036650e9b
RNAppleAuthentication: 0571c08da8c327ae2afc0261b48b4a515b0286a6
RNCClipboard: c84275d07e3f73ff296b17e6c27e9ccdc194a0bb
RNCClipboard: 8212ca9e8370d0e23bfb7f5a591380da5a63456d
RNCPicker: 21ae0659666767a5c1253aef985ee5b7c527e345
RNDeviceInfo: 130237d8e97a89b68f2202d5dd18ac6bb68e7648
RNFBAnalytics: f76bfa164ac235b00505deb9fc1776634056898c
Expand Down
Loading

0 comments on commit 02bdc4b

Please sign in to comment.