Skip to content

Commit ab257e4

Browse files
committed
Merge branch 'main' into Migrate-rnef-to-rock
2 parents 2b1dfbb + a24b0c0 commit ab257e4

154 files changed

Lines changed: 3349 additions & 1433 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,11 @@ module.exports = {
259259
selector: 'TSEnumDeclaration',
260260
message: "Please don't declare enums, use union types instead.",
261261
},
262+
{
263+
selector: 'CallExpression[callee.name="getUrlWithBackToParam"]',
264+
message:
265+
'Usage of getUrlWithBackToParam function is prohibited. This is legacy code and no new occurrences should be added. Please look into documentation and use alternative routing methods instead.',
266+
},
262267

263268
// These are the original rules from AirBnB's style guide, modified to allow for...of loops and for...in loops
264269
{

.storybook/preview.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import React from 'react';
33
import Onyx from 'react-native-onyx';
44
import {SafeAreaProvider} from 'react-native-safe-area-context';
55
import type {Parameters} from 'storybook/internal/types';
6-
import {EnvironmentProvider} from '@components/EnvironmentContext';
76
import OnyxListItemProvider from '@components/OnyxListItemProvider';
87
import {SearchContextProvider} from '@components/Search/SearchContext';
98
import ComposeProviders from '@src/components/ComposeProviders';
109
import HTMLEngineProvider from '@src/components/HTMLEngineProvider';
1110
import {LocaleContextProvider} from '@src/components/LocaleContextProvider';
11+
import {EnvironmentProvider} from '@src/components/withEnvironment';
1212
import {KeyboardStateProvider} from '@src/components/withKeyboardState';
1313
import CONST from '@src/CONST';
1414
import IntlStore from '@src/languages/IntlStore';

Mobile-Expensify

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ android {
114114
minSdkVersion rootProject.ext.minSdkVersion
115115
targetSdkVersion rootProject.ext.targetSdkVersion
116116
multiDexEnabled rootProject.ext.multiDexEnabled
117-
versionCode 1009020200
118-
versionName "9.2.2-0"
117+
versionCode 1009020300
118+
versionName "9.2.3-0"
119119
// Supported language variants must be declared here to avoid from being removed during the compilation.
120120
// This also helps us to not include unnecessary language variants in the APK.
121121
resConfigs "en", "es"

android/app/src/main/java/com/expensify/chat/ShareActionHandlerModule.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class ShareActionHandlerModule(reactContext: ReactApplicationContext) :
3636
val shareObject = JSONObject(shareObjectString)
3737
val content = shareObject.optString("content")
3838
val mimeType = shareObject.optString("mimeType")
39-
val fileUriPath = "file://$content"
4039
val timestamp = System.currentTimeMillis()
4140

4241
val file = File(content)
@@ -53,6 +52,8 @@ class ShareActionHandlerModule(reactContext: ReactApplicationContext) :
5352

5453
val identifier = file.name
5554
var aspectRatio = 0.0f
55+
val fileUri = android.net.Uri.fromFile(file)
56+
val fileUriPath = fileUri.toString()
5657

5758
if (mimeType.startsWith("image/")) {
5859
val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
File renamed without changes.

babel.config.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ const defaultPluginsForWebpack = [
4646

4747
// Keep it last
4848
'react-native-reanimated/plugin',
49-
'@babel/plugin-transform-export-namespace-from',
5049
];
5150

5251
// The Fullstory annotate plugin generated a few errors when executed in Electron. Let's
@@ -133,7 +132,6 @@ const metro = {
133132
},
134133
},
135134
],
136-
'@babel/plugin-transform-export-namespace-from',
137135
],
138136
env: {
139137
production: {

contributingGuides/NAVIGATION.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,12 @@ Navigation.goBack();
111111
> [!NOTE]
112112
> This function should be used mainly with the `backToRoute` param. If you want to use it, make sure there is a screen to which you should always go back in a given case and pass its route as a param.
113113
114-
It also allows dynamic setting of `backToRoute` which is pretty handy when RHP can be opened from multiple pages. Then we should set `backTo` parameter in the URL, so it is possible to go to the previous page even after refreshing! More information on how to use backTo route param can be found [here](#how-to-use-backto-route-param).
114+
It also allows dynamic setting of `backToRoute` which is pretty handy when RHP can be opened from multiple pages. Then we should set `backTo` parameter in the URL, so it is possible to go to the previous page even after refreshing!
115+
116+
> [!WARNING]
117+
> **Deprecated**: The `backTo` parameter is deprecated and should not be used in new implementations. Most problems that `backTo` solved can be resolved by adding one or more routes for a single screen. If you don't know how to solve your problem, contact someone from the navigation team.
118+
119+
More information on how to use backTo route param can be found [here](#how-to-use-backto-route-param).
115120

116121
```ts
117122
// src/pages/NewSettingsScreen.tsx
@@ -431,6 +436,9 @@ The easiest way to find the piece of code from which the navigation method was c
431436

432437
## Using `backTo` route param
433438

439+
> [!WARNING]
440+
> **Deprecated**: The `backTo` parameter is deprecated and should not be used in new implementations. Most problems that `backTo` solved can be resolved by adding one or more routes for a single screen. If you don't know how to solve your problem, contact someone from the navigation team.
441+
434442
When a particular screen can be opened from two or more different pages, we can use `backTo` route parameter to handle such case.
435443

436444
1. Define `backTo` route param for the target screen in `ROUTES.ts`.
@@ -617,6 +625,9 @@ In the above example, we can see that when building a state from a link leading
617625

618626
RHP screens can usually be opened from a specific central screen. Of course there are cases where one RHP screen can be used in different tabs (then using `backTo` parameter comes in handy). However, most often one RHP screen has a specific central screen assigned underneath.
619627

628+
> [!WARNING]
629+
> **Deprecated**: The `backTo` parameter is deprecated and should not be used in new implementations. Most problems that `backTo` solved can be resolved by adding one or more routes for a single screen. If you don't know how to solve your problem, contact someone from the navigation team.
630+
620631
To assign RHP to the appropriate central screen, you need to add it to the proper relation (`src/libs/Navigation/linkingConfig/RELATIONS`)
621632

622633
For example, if you want to display `SCREENS.SETTINGS.PROFILE.ROOT` in the Account tab under RHP screen, then you need to add the screen to `SETTINGS_TO_RHP`, etc.

contributingGuides/philosophies/ROUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Internet routers and third-party-services can see and store any information in t
4343

4444
### - SHOULD NOT use query parameters
4545
Exceptions:
46-
- When a URL needs to be encoded and added to the path (eg. `?backTo=URL`, `?forwardTo=URL`)
46+
- When a URL needs to be encoded and added to the path (eg. `?backTo=URL`, `?forwardTo=URL`) - **Note: `backTo` parameter is deprecated and should not be used in new implementations**
4747
- When complex data needs to be part of the path (eg. `/search?q=QUERY`)
4848

4949
### - SHOULD NOT use optional parameters

ios/NewExpensify/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<key>CFBundlePackageType</key>
2424
<string>APPL</string>
2525
<key>CFBundleShortVersionString</key>
26-
<string>9.2.2</string>
26+
<string>9.2.3</string>
2727
<key>CFBundleSignature</key>
2828
<string>????</string>
2929
<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>9.2.2.0</string>
47+
<string>9.2.3.0</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

0 commit comments

Comments
 (0)