Skip to content

Commit

Permalink
Merge branch 'Expensify:main' into remove-datepicker
Browse files Browse the repository at this point in the history
  • Loading branch information
shubham1206agra authored Nov 29, 2023
2 parents dbb5e05 + dca1716 commit a83a35d
Show file tree
Hide file tree
Showing 160 changed files with 2,078 additions and 1,257 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/deployBlocker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ jobs:
env:
GITHUB_TOKEN: ${{ github.token }}

- name: Escape html characters in GH issue title
env:
GH_ISSUE_TITLE: ${{ github.event.issue.title }}
run: |
escaped_title=$(echo "$GH_ISSUE_TITLE" | sed -e 's/&/\&amp;/g; s/</\&lt;/g; s/>/\&gt;/g; s/"/\&quot;/g; s/'"'"'/\&#039;/g; s/|/\&verbar;/g')
echo "GH_ISSUE_TITLE=$escaped_title" >> "$GITHUB_ENV"
- name: 'Post the issue in the #expensify-open-source slack room'
if: ${{ success() }}
uses: 8398a7/action-slack@v3
Expand All @@ -32,7 +39,7 @@ jobs:
channel: '#expensify-open-source',
attachments: [{
color: "#DB4545",
text: '💥 We have found a New Expensify Deploy Blocker, if you have any idea which PR could be causing this, please comment in the issue: <${{ github.event.issue.html_url }}|${{ github.event.issue.title }}>'.replace(/[&<>"'|]/g, function(m) { return {'&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#039;', '|': '&verbar;'}[m]; }),
text: '💥 We have found a New Expensify Deploy Blocker, if you have any idea which PR could be causing this, please comment in the issue: <${{ github.event.issue.html_url }}|${{ env.GH_ISSUE_TITLE }}>'
}]
}
env:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/e2ePerformanceTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,9 @@ jobs:
test_spec_file: tests/e2e/TestSpec.yml
test_spec_type: APPIUM_NODE_TEST_SPEC
remote_src: false
file_artifacts: Customer Artifacts.zip
file_artifacts: |
Customer Artifacts.zip
Test spec output.txt
log_artifacts: debug.log
cleanup: true
timeout: 5400
Expand All @@ -220,6 +222,7 @@ jobs:
if: failure()
run: |
echo ${{ steps.schedule-awsdf-main.outputs.data }}
cat "./mainResults/Host_Machine_Files/\$WORKING_DIRECTORY/Test spec output.txt"
unzip "Customer Artifacts.zip" -d mainResults
cat ./mainResults/Host_Machine_Files/\$WORKING_DIRECTORY/debug.log
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/platformDeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ jobs:
- name: Setup Node
uses: ./.github/actions/composite/setupNode

- name: Setup Java
uses: actions/setup-java@v3
with:
distribution: 'oracle'
java-version: '17'

- name: Setup Ruby
uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
with:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/testBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@ jobs:
- name: Setup Node
uses: ./.github/actions/composite/setupNode

- name: Setup Java
uses: actions/setup-java@v3
with:
distribution: 'oracle'
java-version: '17'

- name: Setup Ruby
uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
with:
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001040401
versionName "1.4.4-1"
versionCode 1001040503
versionName "1.4.5-3"
}

flavorDimensions "default"
Expand Down
17 changes: 15 additions & 2 deletions contributingGuides/NAVIGATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,22 @@ When creating RHP flows, you have to remember a couple things:

An example of adding `Settings_Workspaces` page:

1. Add path to `ROUTES.js`: https://github.com/Expensify/App/blob/3531af22dcadaa94ed11eccf370517dca0b8c305/src/ROUTES.js#L36
1. Add path to `ROUTES.ts`: https://github.com/Expensify/App/blob/main/src/ROUTES.ts

```ts
export const ROUTES = {
// static route
SETTINGS_WORKSPACES: 'settings/workspaces',
// dynamic route
SETTINGS_WORKSPACES: {
route: 'settings/:accountID',
getRoute: (accountID: number) => `settings/${accountID}` as const,
},
};

```

2. Add `Settings_Workspaces` page to proper RHP flow in `linkingConfig.js`: https://github.com/Expensify/App/blob/3531af22dcadaa94ed11eccf370517dca0b8c305/src/libs/Navigation/linkingConfig.js#L40-L42
2. Add `Settings_Workspaces` page to proper RHP flow in `linkingConfig.ts`: https://github.com/Expensify/App/blob/3531af22dcadaa94ed11eccf370517dca0b8c305/src/libs/Navigation/linkingConfig.js#L40-L42

3. Add your page to proper navigator (it should be aligned with where you've put it in the previous step) https://github.com/Expensify/App/blob/3531af22dcadaa94ed11eccf370517dca0b8c305/src/libs/Navigation/AppNavigator/ModalStackNavigators.js#L334-L338

Expand Down
69 changes: 36 additions & 33 deletions docs/articles/new-expensify/chat/Introducing-Expensify-Chat.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,30 +24,30 @@ After downloading the app, log into your new.expensify.com account (you’ll use

## How to send messages

Click **+** then **Send message** in New Expensify
Choose **Chat**
Search for any name, email or phone number
Select the individual to begin chatting
1. Click **+** then **Send message** in New Expensify
2. Choose **Chat**
3. Search for any name, email or phone number
4. Select the individual to begin chatting

## How to create a group

Click **+**, then **Send message** in New Expensify
Search for any name, email or phone number
Click **Add to group**
Group participants are listed with a green check
Repeat steps 1-3 to add more participants to the group
Click **Create chat** to start chatting
1. Click **+**, then **Send message** in New Expensify
2. Search for any name, email or phone number
3. Click **Add to group**
4. Group participants are listed with a green check
5. Repeat steps 1-3 to add more participants to the group
6. Click **Create chat** to start chatting

## How to create a room

Click **+**, then **Send message** in New Expensify
Click **Room**
Enter a room name that doesn’t already exist on the intended Workspace
Choose the Workspace you want to associate the room with.
Choose the room’s visibility setting:
Private: Only people explicitly invited can find the room*
Restricted: Workspace members can find the room*
Public: Anyone can find the room
1. Click **+**, then **Send message** in New Expensify
2. Click **Room**
3. Enter a room name that doesn’t already exist on the intended Workspace
4. Choose the Workspace you want to associate the room with.
5. Choose the room’s visibility setting:
6. Private: Only people explicitly invited can find the room*
7. Restricted: Workspace members can find the room*
8. Public: Anyone can find the room

*Anyone, including non-Workspace Members, can be invited to a Private or Restricted room.

Expand All @@ -56,26 +56,29 @@ Public: Anyone can find the room
You can invite people to a Group or Room by @mentioning them or from the Members pane.

## Mentions:
Type **@** and start typing the person’s name or email address
Choose one or more contacts
Input message, if desired, then send

1. Type **@** and start typing the person’s name or email address
2. Choose one or more contacts
3. Input message, if desired, then send


## Members pane invites:
Click the **Room** or **Group** header
Select **Members**
Click **Invite**
Find and select any contact/s you’d like to invite
Click **Next**
Write a custom invitation if you like
Click **Invite**

1. Click the **Room** or **Group** header
2. Select **Members**
3. Click **Invite**
4. Find and select any contact/s you’d like to invite
5. Click **Next**
6. Write a custom invitation if you like
7. Click **Invite**

## Members pane removals:
Click the **Room** or **Group** header
Select **Members**
Find and select any contact/s you’d like to remove
Click **Remove**
Click **Remove members**

1. Click the **Room** or **Group** header
2. Select **Members**
3. Find and select any contact/s you’d like to remove
4. Click **Remove**
5. Click **Remove members**

## How to format text

Expand Down
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>1.4.4</string>
<string>1.4.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -40,7 +40,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.4.4.1</string>
<string>1.4.5.3</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</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>1.4.4</string>
<string>1.4.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.4.4.1</string>
<string>1.4.5.3</string>
</dict>
</plist>
14 changes: 7 additions & 7 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ PODS:
- Onfido (~> 28.3.0)
- React
- OpenSSL-Universal (1.1.1100)
- Plaid (4.1.0)
- Plaid (4.7.0)
- PromisesObjC (2.2.0)
- RCT-Folly (2021.07.22.00):
- boost
Expand Down Expand Up @@ -585,12 +585,12 @@ PODS:
- React-Core
- react-native-pager-view (6.2.0):
- React-Core
- react-native-pdf (6.7.1):
- react-native-pdf (6.7.3):
- React-Core
- react-native-performance (5.1.0):
- React-Core
- react-native-plaid-link-sdk (10.0.0):
- Plaid (~> 4.1.0)
- react-native-plaid-link-sdk (10.8.0):
- Plaid (~> 4.7.0)
- React-Core
- react-native-quick-sqlite (8.0.0-beta.2):
- React
Expand Down Expand Up @@ -1207,7 +1207,7 @@ SPEC CHECKSUMS:
Onfido: c7d010d9793790d44a07799d9be25aa8e3814ee7
onfido-react-native-sdk: b346a620af5669f9fecb6dc3052314a35a94ad9f
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
Plaid: 7d340abeadb46c7aa1a91f896c5b22395a31fcf2
Plaid: 431ef9be5314a1345efb451bc5e6b067bfb3b4c6
PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
RCTRequired: c0569ecc035894e4a68baecb30fe6a7ea6e399f9
Expand Down Expand Up @@ -1236,9 +1236,9 @@ SPEC CHECKSUMS:
react-native-key-command: 5af6ee30ff4932f78da6a2109017549042932aa5
react-native-netinfo: ccbe1085dffd16592791d550189772e13bf479e2
react-native-pager-view: 0ccb8bf60e2ebd38b1f3669fa3650ecce81db2df
react-native-pdf: 7c0e91ada997bac8bac3bb5bea5b6b81f5a3caae
react-native-pdf: b4ca3d37a9a86d9165287741c8b2ef4d8940c00e
react-native-performance: cef2b618d47b277fb5c3280b81a3aad1e72f2886
react-native-plaid-link-sdk: 9eb0f71dad94b3bdde649c7a384cba93024af46c
react-native-plaid-link-sdk: df1618a85a615d62ff34e34b76abb7a56497fbc1
react-native-quick-sqlite: bcc7a7a250a40222f18913a97cd356bf82d0a6c4
react-native-render-html: 96c979fe7452a0a41559685d2f83b12b93edac8c
react-native-safe-area-context: 99b24a0c5acd0d5dcac2b1a7f18c49ea317be99a
Expand Down
53 changes: 30 additions & 23 deletions package-lock.json

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

Loading

0 comments on commit a83a35d

Please sign in to comment.