Skip to content

Commit f215ae2

Browse files
mountinymountiny
committed
Resolve merge conflicts
2 parents a330fef + 78145cf commit f215ae2

File tree

407 files changed

+4471
-3858
lines changed

Some content is hidden

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

407 files changed

+4471
-3858
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
],

‎.github/actions/composite/setupNode/action.yml

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,34 @@ runs:
88
with:
99
node-version-file: '.nvmrc'
1010
cache: npm
11+
cache-dependency-path: |
12+
package-lock.json
13+
desktop/package-lock.json
1114
12-
- name: Install node packages
13-
uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
15+
- id: cache-node-modules
16+
uses: actions/cache@v3
17+
with:
18+
path: node_modules
19+
key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json') }}
20+
21+
- id: cache-desktop-node-modules
22+
uses: actions/cache@v3
23+
with:
24+
path: desktop/node_modules
25+
key: ${{ runner.os }}-desktop-node-modules-${{ hashFiles('desktop/package-lock.json') }}
26+
27+
- name: Install root project node packages
28+
if: steps.cache-node-modules.outputs.cache-hit != 'true'
29+
uses: nick-fields/retry@v2
1430
with:
1531
timeout_minutes: 30
1632
max_attempts: 3
1733
command: npm ci
34+
35+
- name: Install node packages for desktop submodule
36+
if: steps.cache-desktop-node-modules.outputs.cache-hit != 'true'
37+
uses: nick-fields/retry@v2
38+
with:
39+
timeout_minutes: 30
40+
max_attempts: 3
41+
command: cd desktop && npm ci

‎.github/workflows/platformDeploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,13 +158,13 @@ jobs:
158158
bundler-cache: true
159159

160160
- uses: actions/cache@v3
161+
id: cache-pods
161162
with:
162163
path: ios/Pods
163164
key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
164-
restore-keys: |
165-
${{ runner.os }}-pods-
166165

167166
- name: Install cocoapods
167+
if: steps.cache-pods.outputs.cache-hit != 'true'
168168
uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
169169
with:
170170
timeout_minutes: 10

‎.github/workflows/testBuild.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,13 @@ jobs:
141141
bundler-cache: true
142142

143143
- uses: actions/cache@v3
144+
id: cache-pods
144145
with:
145146
path: ios/Pods
146147
key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
147-
restore-keys: |
148-
${{ runner.os }}-pods-
149148

150149
- name: Install cocoapods
150+
if: steps.cache-pods.outputs.cache-hit != 'true'
151151
uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
152152
with:
153153
timeout_minutes: 10

‎.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 1001032508
110-
versionName "1.3.25-8"
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"/>

‎docs/articles/other/Everything-About-Chat.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,37 @@ In addition to 1:1 and group chat, members of a Workspace or Policy will have ac
2323
All workspace members are added to the #announce room by default. The #announce room lets you share important company announcements and have conversations between workspace members.
2424

2525
All workspace admins can access the #admins room. Use the #admins room to collaborate with the other admins on your policy, and chat with your dedicated Expensify Onboarding Guide. If you have a subscription of 10 or more users, you're automatically assigned an Account Manager. You can ask for help and collaborate with your Account Manager in this same #admins room. Anytime someone on your team, your dedicated setup specialist, or your dedicated account manager makes any changes to your Workspace settings, that update is logged in the #admins room.
26+
## How to format text
27+
28+
#### Italic
29+
###### To italicize your message, place an underscore on both sides of the text:
30+
*text*
31+
32+
#### Bold
33+
###### To bold your message, place an asterisk on both sides of the text:
34+
**text**
35+
36+
#### Strikethrough
37+
###### To strikethrough your message, place a tilde on both sides of the text:
38+
~text~
39+
40+
#### Quote
41+
###### To turn your text into a blockquote, add a `>` symbol in front of the text:
42+
> your text
43+
44+
#### Code
45+
###### To turn your message into code, place a backtick on both sides of the text:
46+
`text`
47+
48+
#### Codeblock
49+
###### To turn your entire message into code block, place three backticks on both sides of the text:
50+
```
51+
text
52+
and even more text
53+
```
54+
#### Heading
55+
###### To turn your message into a heading, place the `#` symbol in front of the text:
56+
## Heading
2657

2758
# FAQs
2859
## How do I add more than one person to a chat?

‎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.25</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.25.8</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.25</string>
18+
<string>1.3.27</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>1.3.25.8</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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "new.expensify",
3-
"version": "1.3.25-8",
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.",
77
"license": "MIT",
88
"private": true,
99
"scripts": {
10-
"postinstall": "npx patch-package && cd desktop && npm install",
10+
"postinstall": "scripts/postInstall.sh",
1111
"clean": "npx react-native clean-project-auto",
1212
"android": "scripts/set-pusher-suffix.sh && npx react-native run-android --port=8083",
1313
"ios": "scripts/set-pusher-suffix.sh && npx react-native run-ios --port=8082",
@@ -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",

‎scripts/postInstall.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/bash
2+
3+
# Go to project root
4+
ROOT_DIR=$(dirname "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)")
5+
cd "$ROOT_DIR" || exit 1
6+
7+
# Run patch-package
8+
npx patch-package
9+
10+
# Install node_modules in subpackages, unless we're in a CI/CD environment,
11+
# where the node_modules for subpackages are cached separately.
12+
# See `.github/actions/composite/setupNode/action.yml` for more context.
13+
if [[ -n ${CI+x} ]]; then
14+
cd desktop || exit 1
15+
npm install
16+
fi

0 commit comments

Comments
 (0)