Skip to content

Commit 76ba533

Browse files
committed
Merge branch 'main' of https://github.com/rezkiy37/Expensify into feature/21456-polish-admin-rooms
2 parents ccc00ba + 82669ae commit 76ba533

File tree

118 files changed

+1584
-2232
lines changed

Some content is hidden

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

118 files changed

+1584
-2232
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
name: Design Doc Project Issue Template
3+
about: A template to follow when creating a new issue related to a design doc project
4+
---
5+
6+
# Part of the <Project Name> project
7+
Main issue: <Issue Link>
8+
Doc section: <Doc Link>
9+
Project: <Project Link>
10+
11+
# Feature Description
12+
<!-- Describe the section of the doc that this issue is covering, along with any relevant screenshots -->
13+
14+
# Manual Test Steps
15+
16+
# Automated Tests

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 1001034226
110-
versionName "1.3.42-26"
109+
versionCode 1001034400
110+
versionName "1.3.44-0"
111111
}
112112

113113
splits {

desktop/main.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ const mainWindow = () => {
343343
submenu: [
344344
{id: 'reload', role: 'reload'},
345345
{id: 'forceReload', role: 'forceReload'},
346+
{id: 'toggleDevTools', role: 'toggleDevTools'},
346347
{type: 'separator'},
347348
{id: 'resetZoom', role: 'resetZoom'},
348349
{id: 'zoomIn', role: 'zoomIn'},

docs/articles/playbooks/Expensify-Chat-Playbook-for-Conferences.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,55 +12,55 @@ To help make setting up Expensify Chat for your event and your attendees super s
1212
As a conference organizer, you’re expected to amaze and inspire attendees. You want attendees to get to the right place on time, engage with the speakers, and create relationships with each other that last long after the conference is done. Enter Expensify Chat, a free feature that allows attendees to interact with organizers and other attendees in realtime. With Expensify Chat, you can:
1313

1414
- Communicate logistics and key information
15-
- Foster conference wide attendee networking
16-
- Organize conversations by topic and audience
15+
- Foster conference-wide attendee networking
16+
- Organize discussions by topic and audience
1717
- Continue conversations long after the event itself
1818
- Digitize attendee social interaction
1919

20-
Sounds good? Great! In order to ensure your team, your speakers, and your attendees have the best experience possible, we’ve created a guide on how to use Expensify Chat at your event.
20+
Sounds good? Great! In order to ensure your team, speakers, and attendees have the best experience possible, we’ve created a guide on how to use Expensify Chat at your event.
2121

2222
_Let’s get started!_
2323

2424

2525
## Support
2626

27-
Connect with your dedicated account manager in any new.expensify.com #admins room. Your account manager is excited to brainstorm the best ways to make the most out of your event and work through any questions you have about the setup steps below.
27+
Connect with your dedicated Expensify account manager in any new.expensify.com #admins room. Your account manager is excited to brainstorm the best ways to make the most out of your event and work through any questions you have about the setup steps below.
2828

2929

30-
## Step by step instructions for setting up your conference on Expensify Chat
30+
## How to set up your conference on Expensify Chat
3131

3232
Based on our experience running conferences atop Expensify Chat, we recommend the following simple steps:
3333

34-
### Step 1: Create your event Workspace in Expensify
34+
### Step 1: Create your event workspace in Expensify
3535

3636
To create your event workspace in Expensify:
3737
1. In new.expensify.com: “+” > “New workspace”
38-
2. Name the workspace e.g. “ExpensiCon”
38+
2. Name the workspace (e.g. “ExpensiCon”)
3939

40-
### Step 2: Setup all necessary Expensify Chat rooms you want to feature at your event
40+
### Step 2: Set up all the Expensify Chat rooms you want to feature at your event
4141

42-
*Protip*: Your account manager can complete this step with you. Chat with them in #admins on new.expensify.com to coordinate!
42+
*Protip*: Your Expensify account manager can complete this step with you. Chat them in #admins on new.expensify.com to coordinate!
4343

4444
To create a new chat room:
4545
1. Go to [new.expensify.com](https://new.expensify.com)
4646
2. Go to “+” > New room
47-
3. Name to room e.g. “#social”
48-
4. Select the workspace created at step 1
47+
3. Name the room (e.g. “#social”)
48+
4. Select the workspace created in step 1
4949
5. Select “Public” visibility
5050
6. “Create room” > Copy/Paste room URL for use later
5151
7. Repeat for each room
5252

5353
For an easy-to-follow event, we recommend creating these chat rooms:
5454

55+
- *#announce* - This room will be used as your main announcement channel, and should only be used by organizers to announce schedule updates or anything important that your attendees need to know. Everyone in your policy will be invited to this channel, but chatting in here isn’t encouraged -- so to keep the noise to a minimum!
5556
- *#social* - This room will include all attendees, speakers, and members of your organizing team. You can use this room to discuss social events, happy hours, dinners, or encourage attendees to mingle, share photos and connect.
56-
- *#announce* - This room will be used as your main announcement channel, and should only be used by organizers to announce schedule updates or anything important that your attendees need to know. Everyone in your policy will be invited to this channel, but chatting in here isn’t encouraged so to keep the noise to a minimum.
5757
- *Create an individual room for each session* - Attendees will be able to engage with the speaker/session leader and can ask questions about their content either before/during/after the session.
5858
- *Create a room with your Expensify account manager/s* - We can use this room to coordinate using Expensify Chat before, during, and after the event.
5959

6060
### Step 3: Add chat room QR codes to the applicable session slide deck
6161

6262
Gather QR codes:
63-
1. Go to [new.expensify.com](https://new.expensify.com)
63+
1. Go to [new.expensify.com](https://new.expensify.com)
6464
2. Click into a room and click the room name or avatar in the top header
6565
3. Go into Share Code
6666
4. Download or screenshot the QR code image
@@ -76,8 +76,8 @@ Are you a speaker at an event? Great! Expensify Chat is the perfect way to conne
7676

7777
1. Ensure your session has an Expensify Chat room and that you know the URL link to your session so you can share with attendees ahead of time
7878
2. Join the chat room ahead of the event so you can start engaging with your session’s attendees from the get-go
79-
3. Make sure you have a session moderator with you on the day who is available to help moderate questions and facilitate discussion while you’re busy speaking
80-
4. Ensure your session slides include the QR code for your session chat room. We’d recommend making sure the QR is visible on every page of your deck in case an attendee didn’t join at the beginning.
79+
3. Make sure you have a session moderator with you on presentation day to help moderate questions and facilitate discussion while you’re busy speaking
80+
4. Ensure your session slides include the QR code for your session chat room. We’d recommend making sure the QR code is visible on every page of your deck in case an attendee didn’t join at the beginning.
8181
5. Engage with attendees after your session to continue the discussion around your topic!
8282

8383
*Messaging Suggestions*
@@ -87,27 +87,27 @@ Are you a speaker at an event? Great! Expensify Chat is the perfect way to conne
8787

8888
### Step 5: Plan out your messaging and cadence before the event begins
8989

90-
Expensify Chat is a great place to provide updates leading up to your event -- share news, get folks excited about speakers, and let attendees know of crucial event information like recommended attire, travel info, and more.
90+
Expensify Chat is a great place to provide updates leading up to your event -- share news, get folks excited about speakers, and let attendees know about crucial event information like recommended attire, travel info, and more.
9191

9292
### Step 6: Update your rooms throughout the event
9393

94-
We find chat to be a powerful way to not only engage your attendees, but direct them in realtime to get exactly where they need to go, in realtime:
94+
We find chat to be a powerful way to not only engage your attendees, but direct them in realtime to get exactly where they need to go:
9595

9696
- #announce: Use this room to make announcements such as what’s coming up next, where and when social events are taking place, or announcing the sponsor floor is open to the entire conference. Only workspace admins can post in this room.
97-
- #social: Have your employees in this room sharing fun photos, stoking conversations, and respond to any questions or feedback.
98-
- Speaker rooms: Encourage employees to jump in to comment on content encouraging other attendees to engage with each other during sessions.
97+
- #social: Have your employees in this room sharing fun photos, stoking conversations, and responding to any questions or feedback.
98+
- Speaker rooms: Encourage your employees to jump in to comment on content and nudge attendees to engage with each other during sessions.
9999

100-
*Protip*: Expensify Chat has moderation tools to help flag comments deemed to be spam, inconsiderate, intimidating, bullying, harassment, assault. On any comment just click the flag icon to moderate conversation.
100+
*Protip*: Expensify Chat has moderation tools to help flag comments deemed to be spam, inconsiderate, intimidating, bullying, harassment, assault. On any comment, just click the flag icon to moderate conversation.
101101

102102
### Step 7: Follow up with attendees after the event
103103

104104
Continue the connections by using Expensify Chat to keep your conference community connected. Encourage attendees to share photos, their favorite memories, funny stories, and more.
105105

106106
- We’d recommend creating a draft of all of your reminders that you plan to send in the #announce (or #social) room throughout the event.
107-
- A post in the morning outlining the full agenda, and then before each event as it happens throughout the day is recommended. Be sure to include details like timings, locations, and any special detail like attire to help attendees feel prepared.
107+
- A post in the morning outlining the full agenda, and then before each event as it happens throughout the day, is recommended. Be sure to include details like timings, locations, and any special detail like attire to help attendees feel prepared.
108108
- Use markdown when posting updates so that your messages are easy to read.
109109
- We also recommend posting your updates on new lines so that if someone has a question about a certain item they can ask in a thread pertaining to that topic, rather than in one consolidated block.
110110

111111
## You’re all set!
112112

113-
Once you have completed the above steps you are ready to host your conference on Expensify Chat! Let your account manager know any questions you have over in your new.expensify.com #admins room and start driving activity in your Expensify Chat rooms. By step 4 you have the foundations in place so a great next step is to start training your speakers on how to use Expensify Chat for their sessions. Coordinate with your account manager to make sure everything goes smoothly!
113+
Once you've completed the above steps, you're ready to host your conference on Expensify Chat! Any questions? Just reach out to your Expensify account manager in your new.expensify.com #admins room.

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.42</string>
22+
<string>1.3.44</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.42.26</string>
35+
<string>1.3.44.0</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.42</string>
18+
<string>1.3.44</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>1.3.42.26</string>
22+
<string>1.3.44.0</string>
2323
</dict>
2424
</plist>
45 Bytes
Binary file not shown.
10.8 KB
Binary file not shown.

package-lock.json

Lines changed: 14 additions & 14 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.42-26",
3+
"version": "1.3.44-0",
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.",
@@ -78,7 +78,7 @@
7878
"babel-polyfill": "^6.26.0",
7979
"dom-serializer": "^0.2.2",
8080
"domhandler": "^4.3.0",
81-
"expensify-common": "git+ssh://[email protected]/Expensify/expensify-common.git#d7e424913550349acc779d029319af5b074c7c9e",
81+
"expensify-common": "git+ssh://[email protected]/Expensify/expensify-common.git#fea1a755affabdbb8b6d7c5b754241849124f488",
8282
"fbjs": "^3.0.2",
8383
"htmlparser2": "^7.2.0",
8484
"jest-when": "^3.5.2",
@@ -119,7 +119,7 @@
119119
"react-native-pdf": "^6.6.2",
120120
"react-native-performance": "^4.0.0",
121121
"react-native-permissions": "^3.0.1",
122-
"react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#107b3786ae6bc155dec05c7fc5ee525d3421dc21",
122+
"react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#eae05855286dc699954415cc1d629bfd8e8e47e2",
123123
"react-native-plaid-link-sdk": "^10.0.0",
124124
"react-native-qrcode-svg": "^6.2.0",
125125
"react-native-quick-sqlite": "^8.0.0-beta.2",

0 commit comments

Comments
 (0)