Skip to content

Commit 6b11127

Browse files
gedugedu
committed
Merge branch 'main' into edu/17548_personal_details_push_to_page
* main: (273 commits) edit comment fix lint Hidden reveal message button when editing message Update version to 1.3.27-6 Manually add back eslint-ignore comments for props spreading Use eslint --fix and prettier to update all function components to use the function keyword Update eslint-config-expensify to latest Update version to 1.3.27-5 adding accessibilityLabel and accessibilityRole remove comment added a comment removed @default unnecessary space added propTypes Updating to PressableWithoutFeedback added to propType correction added props to PressableWithFeedback add cancelButtonID native id Update version to 1.3.27-4 ... # Conflicts: # src/components/MenuItemWithTopDescription.js # src/pages/ReimbursementAccount/AddressForm.js
2 parents 1cfa2ba + 23978e4 commit 6b11127

File tree

393 files changed

+4032
-3473
lines changed

Some content is hidden

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

393 files changed

+4032
-3473
lines changed

‎.eslintrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ module.exports = {
3131
importNames: ['TouchableOpacity', 'TouchableWithoutFeedback', 'TouchableNativeFeedback', 'TouchableHighlight'],
3232
message: 'Please use PressableWithFeedback and/or PressableWithoutFeedback from src/components/Pressable instead',
3333
},
34+
{
35+
name: 'react-native',
36+
importNames: ['StatusBar'],
37+
message: 'Please use StatusBar from src/libs/StatusBar instead',
38+
},
3439
],
3540
},
3641
],

‎.well-known/apple-app-site-association

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
"/": "/settings/*",
1313
"comment": "Profile and app settings"
1414
},
15-
{
16-
"/": "/setpassword/*",
17-
"comment": "Passoword setup"
18-
},
1915
{
2016
"/": "/details/*",
2117
"comment": "Details of another users"

‎__mocks__/react-native-safe-area-context.js

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,17 @@ const insets = {
99
};
1010

1111
function withSafeAreaInsets(WrappedComponent) {
12-
const WithSafeAreaInsets = (props) => (
13-
<WrappedComponent
14-
// eslint-disable-next-line react/jsx-props-no-spreading
15-
{...props}
16-
// eslint-disable-next-line react/prop-types
17-
ref={props.forwardedRef}
18-
insets={insets}
19-
/>
20-
);
12+
function WithSafeAreaInsets(props) {
13+
return (
14+
<WrappedComponent
15+
// eslint-disable-next-line react/jsx-props-no-spreading
16+
{...props}
17+
// eslint-disable-next-line react/prop-types
18+
ref={props.forwardedRef}
19+
insets={insets}
20+
/>
21+
);
22+
}
2123
return forwardRef((props, ref) => (
2224
<WithSafeAreaInsets
2325
// eslint-disable-next-line react/jsx-props-no-spreading

‎android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ android {
106106
minSdkVersion rootProject.ext.minSdkVersion
107107
targetSdkVersion rootProject.ext.targetSdkVersion
108108
multiDexEnabled rootProject.ext.multiDexEnabled
109-
versionCode 1001032601
110-
versionName "1.3.26-1"
109+
versionCode 1001032706
110+
versionName "1.3.27-6"
111111
}
112112

113113
splits {

‎android/app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
<!-- Production URLs -->
5353
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/r"/>
5454
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/settings"/>
55-
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/setpassword"/>
5655
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/details"/>
5756
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/v"/>
5857
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/bank-account"/>
@@ -64,7 +63,6 @@
6463
<!-- Staging URLs -->
6564
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/r"/>
6665
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/settings"/>
67-
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/setpassword"/>
6866
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/details"/>
6967
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/v"/>
7068
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/bank-account"/>

‎ios/NewExpensify/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundlePackageType</key>
2020
<string>APPL</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>1.3.26</string>
22+
<string>1.3.27</string>
2323
<key>CFBundleSignature</key>
2424
<string>????</string>
2525
<key>CFBundleURLTypes</key>
@@ -32,7 +32,7 @@
3232
</dict>
3333
</array>
3434
<key>CFBundleVersion</key>
35-
<string>1.3.26.1</string>
35+
<string>1.3.27.6</string>
3636
<key>ITSAppUsesNonExemptEncryption</key>
3737
<false/>
3838
<key>LSApplicationQueriesSchemes</key>

‎ios/NewExpensifyTests/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.3.26</string>
18+
<string>1.3.27</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>1.3.26.1</string>
22+
<string>1.3.27.6</string>
2323
</dict>
2424
</plist>

‎package-lock.json

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "1.3.26-1",
3+
"version": "1.3.27-6",
44
"author": "Expensify, Inc.",
55
"homepage": "https://new.expensify.com",
66
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -76,7 +76,7 @@
7676
"babel-polyfill": "^6.26.0",
7777
"dom-serializer": "^0.2.2",
7878
"domhandler": "^4.3.0",
79-
"expensify-common": "git+ssh://[email protected]/Expensify/expensify-common.git#925e62744f784a92c3ad8947aabfc21c93bec221",
79+
"expensify-common": "git+ssh://[email protected]/Expensify/expensify-common.git#50aacd53fe54ef7131e5cb9c74ee4526b3bcfe16",
8080
"fbjs": "^3.0.2",
8181
"html-entities": "^1.3.1",
8282
"htmlparser2": "^7.2.0",
@@ -183,7 +183,7 @@
183183
"electron": "22.3.7",
184184
"electron-builder": "24.4.0",
185185
"eslint": "^7.6.0",
186-
"eslint-config-expensify": "^2.0.36",
186+
"eslint-config-expensify": "^2.0.38",
187187
"eslint-config-prettier": "^8.8.0",
188188
"eslint-plugin-jest": "^24.1.0",
189189
"eslint-plugin-jsx-a11y": "^6.6.1",

‎src/App.js

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -33,29 +33,31 @@ LogBox.ignoreLogs([
3333

3434
const fill = {flex: 1};
3535

36-
const App = () => (
37-
<GestureHandlerRootView style={fill}>
38-
<ComposeProviders
39-
components={[
40-
OnyxProvider,
41-
SafeAreaProvider,
42-
PortalProvider,
43-
SafeArea,
44-
LocaleContextProvider,
45-
HTMLEngineProvider,
46-
WindowDimensionsProvider,
47-
KeyboardStateProvider,
48-
CurrentReportIdContextProvider,
49-
PickerStateProvider,
50-
]}
51-
>
52-
<CustomStatusBar />
53-
<ErrorBoundary errorMessage="NewExpensify crash caught by error boundary">
54-
<Expensify />
55-
</ErrorBoundary>
56-
</ComposeProviders>
57-
</GestureHandlerRootView>
58-
);
36+
function App() {
37+
return (
38+
<GestureHandlerRootView style={fill}>
39+
<ComposeProviders
40+
components={[
41+
OnyxProvider,
42+
SafeAreaProvider,
43+
PortalProvider,
44+
SafeArea,
45+
LocaleContextProvider,
46+
HTMLEngineProvider,
47+
WindowDimensionsProvider,
48+
KeyboardStateProvider,
49+
CurrentReportIdContextProvider,
50+
PickerStateProvider,
51+
]}
52+
>
53+
<CustomStatusBar />
54+
<ErrorBoundary errorMessage="NewExpensify crash caught by error boundary">
55+
<Expensify />
56+
</ErrorBoundary>
57+
</ComposeProviders>
58+
</GestureHandlerRootView>
59+
);
60+
}
5961

6062
App.displayName = 'App';
6163

0 commit comments

Comments
 (0)