Merge branch 'Expensify:main' into arrow-feature-signed

Expensify · Nov 8, 2022 · a083df2 · a083df2
2 parents a7200ba + 91acada
commit a083df2
Show file tree

Hide file tree

Showing 101 changed files with 1,896 additions and 1,933 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001022306
-        versionName "1.2.23-6"
+        versionCode 1001022404
+        versionName "1.2.24-4"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

diff --git a/android/app/src/main/assets/fonts/ExpensifyMono-Bold.otf b/android/app/src/main/assets/fonts/ExpensifyMono-Bold.otf
diff --git a/android/app/src/main/assets/fonts/ExpensifyMono-Regular.otf b/android/app/src/main/assets/fonts/ExpensifyMono-Regular.otf
diff --git a/android/app/src/main/assets/fonts/ExpensifyNeue-Bold.otf b/android/app/src/main/assets/fonts/ExpensifyNeue-Bold.otf
diff --git a/android/app/src/main/assets/fonts/ExpensifyNeue-BoldItalic.otf b/android/app/src/main/assets/fonts/ExpensifyNeue-BoldItalic.otf
diff --git a/android/app/src/main/assets/fonts/ExpensifyNeue-Italic.otf b/android/app/src/main/assets/fonts/ExpensifyNeue-Italic.otf
diff --git a/android/app/src/main/assets/fonts/ExpensifyNeue-Regular.otf b/android/app/src/main/assets/fonts/ExpensifyNeue-Regular.otf
diff --git a/android/app/src/main/assets/fonts/ExpensifyNewKansas-Medium.otf b/android/app/src/main/assets/fonts/ExpensifyNewKansas-Medium.otf
diff --git a/android/app/src/main/assets/fonts/ExpensifyNewKansas-MediumItalic.otf b/android/app/src/main/assets/fonts/ExpensifyNewKansas-MediumItalic.otf
diff --git a/android/build.gradle b/android/build.gradle
@@ -21,7 +21,6 @@ buildscript {
     }
     repositories {
         google()
-        jcenter()
         mavenCentral()
     }
     dependencies {
@@ -42,10 +41,14 @@ allprojects {
     configurations.all {
         resolutionStrategy {
             force 'org.xerial:sqlite-jdbc:3.34.0'
+
+            // Manually set the react-native version to resolve this upstream issue: https://github.com/facebook/react-native/issues/35210
+            def REACT_NATIVE_VERSION = new File(['node', '--print',"JSON.parse(require('fs').readFileSync(require.resolve('react-native/package.json'), 'utf-8')).version"].execute(null, rootDir).text.trim())
+            force "com.facebook.react:react-native:" + REACT_NATIVE_VERSION
+            force "com.facebook.react:hermes-engine:" + REACT_NATIVE_VERSION
         }
     }
     repositories {
-        jcenter()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url("$rootDir/../node_modules/react-native/android")

diff --git a/assets/fonts/ExpensifyMono-Bold.otf b/assets/fonts/ExpensifyMono-Bold.otf
diff --git a/assets/fonts/ExpensifyMono-Regular.otf b/assets/fonts/ExpensifyMono-Regular.otf
diff --git a/assets/fonts/ExpensifyNeue-Bold.otf b/assets/fonts/ExpensifyNeue-Bold.otf
diff --git a/assets/fonts/ExpensifyNeue-BoldItalic.otf b/assets/fonts/ExpensifyNeue-BoldItalic.otf
diff --git a/assets/fonts/ExpensifyNeue-Italic.otf b/assets/fonts/ExpensifyNeue-Italic.otf
diff --git a/assets/fonts/ExpensifyNeue-Regular.otf b/assets/fonts/ExpensifyNeue-Regular.otf
diff --git a/assets/fonts/ExpensifyNewKansas-Medium.otf b/assets/fonts/ExpensifyNewKansas-Medium.otf
diff --git a/assets/fonts/ExpensifyNewKansas-MediumItalic.otf b/assets/fonts/ExpensifyNewKansas-MediumItalic.otf
diff --git a/docs/_data/routes.yml b/docs/_data/routes.yml
@@ -9,17 +9,28 @@ hubs:
     title: Send money
     description: With only a couple of clicks, send money to your friends or coworkers using NewExpensify.
     icon: /assets/images/send.svg
+    articles:
+      - href: Request-and-Send-Money
+        title: Request and Send Money
     sections:
       - href: workspaces
         title: Workspaces
         articles:
           - href: The-Free-Plan
             title: The Free Plan
+      - href: chat
+        title: Chat
+        articles:
+          - href: Everything-About-Chat
+            title: Everything About Chat
 
   - href: request-money
     title: Request money
     icon: /assets/images/money-circle.svg
     description: Request money for work expenses, bills, or a night out with friends using NewExpensify.
+    articles:
+      - href: Request-and-Send-Money
+        title: Request and Send Money
 
   - href: other
     title: Other

diff --git a/docs/articles/request-money/Request-and-Send-Money.md b/docs/articles/request-money/Request-and-Send-Money.md
@@ -0,0 +1,53 @@
+---
+title: Request Money, Split Bills, and Send Money to Friends
+description: Everything you need to know about Requesting Money, Splitting Bills, and Sending Money to Friends!
+---
+
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+# How do these Payment Features work?
+Our suite of money movement features enables you to request money owed by an individual, split a bill with a group, and proactively send money for a one-off expense.
+
+**Request Money** lets your friends pay you back directly in Expensify. When you send a payment request to a friend, Expensify will display the amount owed and the option to pay the corresponding request in a chat between you.
+
+**Split Bill** allows you to split payments between friends and ensures the person who settled the tab gets paid back.
+
+**Send Money** allows you to send money to someone proactively. With this feature, you can Send Money to a friend without receiving a payment or split bill request.
+
+These three features ensure you can live in the moment and settle up afterward.
+
+# How to Request Money
+- Select the Green **+** button and choose **Request Money**
+- Enter the amount **$** they owe and click **Next**
+- Search for the user or enter their email!
+- Enter a reason for the request (optional)
+- Click **Request!**
+- If you change your mind, all you have to do is click **Cancel**
+- The user will be able to **Settle up outside of Expensify** or pay you via **Venmo** or **PayPal.me**
+
+# How to Split a Bill
+- Select the Green **+** button and choose **Split Bill**
+- Enter the total amount for the bill and click **Next**
+- Search for users or enter their emails and **Select**
+- Enter a reason for the split
+- The split is then shared equally between the attendees
+
+# How to Send Money
+- Click the green **+** button and select **Send Money**
+- Enter an **amount > Next**
+- Enter the **email address** or **phone number** (including area code) of the person you’re paying
+- Add a note about why you’re paying them (this is optional, but it’s fun!)
+- Click **Pay with Expensify**
+- Choose **Bank Account\*** or **Debit Card\*\***
+\* If paying with a Bank Account, follow the prompts to connect your bank to Expensify.
+\*\* If paying with a Debit Card, enter your card details and tap Save.
+
+# FAQs
+## Send Money Payment: Why is the option to Pay With Expensify not visible to me?
+If “I’ll Settle Elsewhere” is showing for you when you’re trying to send money, this is because we don’t support money movement through Expensify in your jurisdiction yet. You can use “I’ll settle elsewhere” if you want to track the payments for audit in Expensify.
+
+## I’ve received a payment request/bill split from a friend in a DM. Do I use Send Money to send this payment?
+No. Click the green “Pay” button in the payment preview in the DM, and this will ensure you are paying the accompanying Payment or Bill Split request - canceling out the IOU to 0.
+
+## Can I request money from more than one person at a time?
+If you need to request money for more than one person at a time, you’ll want to use the Split Bill feature. The Request Money option is for one-to-one payments between two people.
diff --git a/docs/articles/send-money/Everything-About-Chat.md b/docs/articles/send-money/Everything-About-Chat.md
@@ -0,0 +1,52 @@
+---
+title: Everything About Chat
+description: Everything you need to know about Expensify's Chat Features!
+---
+
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+# What is Expensify Chat?
+Expensify Chat is the ideal way to collaborate on expenses or payment requests by communicating in real time with your accountant, clients, employees, friends, and family.
+
+With Expensify Chat, you can start a conversation about that missing receipt your employee forgot to submit or chat about splitting that electric bill with your roommates. Through eChat, you can even request money from your friends!
+
+# How to use Chat in Expensify
+Download NewExpensify from the [App Store](https://apps.apple.com/us/app/expensify-cash/id1530278510) or [Google Play](https://play.google.com/store/apps/details?id=com.expensify.chat) to use the chat function. You can also access your account at new.expensify.com from your favorite web browser.
+
+After downloading the app, log into your new.expensify.com account (you’ll use the same username and password for your standard Expensify account). From there, you can customize your profile and start chatting immediately.
+
+
+## Start Chatting
+Select **New Chat** to chat one-on-one or **New Group** to start a group chat.
+## Workspace Chat Rooms
+In addition to 1:1 and group chat, members of a Workspace will have access to two additional rooms; the #announce and #admins rooms.
+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.
+
+Workspace admins will have access to the #admins room. Use the #admins room to collaborate between admins and your dedicated Expensify Guide!
+
+# FAQs
+## How do I add more than one person to a chat?
+Creating a Group chat with multiple people is easy. Start by clicking the green chat **+** button and select **New Group**. Search for the people you want to invite and check the circle to the far right. Once you’ve selected everyone, click the **Create Group** button at the bottom of your screen.
+
+## Can I add people to an existing Group chat?
+Adding people to an existing group chat isn’t possible right now, so you’ll need to make a new group chat with the latest additions.
+
+## Someone I don’t recognize is in my #admins room for my workspace; who is it?
+After creating your workspace, you’ll have a dedicated Expensify specialist who will help you onboard and answer your questions. You can chat with them directly in the #admins room or request a call to talk to them over the phone.
+
+## Can I force a chat to stay at the top of the chats list?
+You sure can! Click on the chat you want to keep at the top of the list, and then click the small **pin** icon. From now on, your chat will stay pinned to the top of the chat list. If you want to unpin a chat, just click the **pin** icon again.
+
+# Deep Dive
+## Chat display, aka Priority Mode
+The way your chats display in the left-hand menu is customizable, and we offer two different options; Most Recent mode and _#focus_ mode.
+
+- Most Recent mode will display all chats by default, sorted by most recent, with your pinned chats at the top of the list.
+- #focus mode will display only unread and pinned chats, all sorted alphabetically. This setting is perfect for when you need to heads down to focus on a crucial project.
+
+You can find your display mode by clicking on your User Icon > Preferences > Priority Mode.
+
+## Inviting someone to Expensify Chat
+If the person you want to chat with doesn’t appear in your contact list, simply type their email or phone number to invite them to chat! They will receive an email with instructions and can reply directly to it to start chatting with you.
+
+All they have to do is click the link, and a new.expensify.com account will be set up automatically for them (if they don't have one already), and they can start chatting immediately!
diff --git a/docs/articles/send-money/Request-and-Send-Money.md b/docs/articles/send-money/Request-and-Send-Money.md
@@ -0,0 +1,53 @@
+---
+title: Request Money, Split Bills, and Send Money to Friends
+description: Everything you need to know about Requesting Money, Splitting Bills, and Sending Money to Friends!
+---
+
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+# How do these Payment Features work?
+Our suite of money movement features enables you to request money owed by an individual, split a bill with a group, and proactively send money for a one-off expense.
+
+**Request Money** lets your friends pay you back directly in Expensify. When you send a payment request to a friend, Expensify will display the amount owed and the option to pay the corresponding request in a chat between you.
+
+**Split Bill** allows you to split payments between friends and ensures the person who settled the tab gets paid back.
+
+**Send Money** allows you to send money to someone proactively. With this feature, you can Send Money to a friend without receiving a payment or split bill request.
+
+These three features ensure you can live in the moment and settle up afterward.
+
+# How to Request Money
+- Select the Green **+** button and choose **Request Money**
+- Enter the amount **$** they owe and click **Next**
+- Search for the user or enter their email!
+- Enter a reason for the request (optional)
+- Click **Request!**
+- If you change your mind, all you have to do is click **Cancel**
+- The user will be able to **Settle up outside of Expensify** or pay you via **Venmo** or **PayPal.me**
+
+# How to Split a Bill
+- Select the Green **+** button and choose **Split Bill**
+- Enter the total amount for the bill and click **Next**
+- Search for users or enter their emails and **Select**
+- Enter a reason for the split
+- The split is then shared equally between the attendees
+
+# How to Send Money
+- Click the green **+** button and select **Send Money**
+- Enter an **amount > Next**
+- Enter the **email address** or **phone number** (including area code) of the person you’re paying
+- Add a note about why you’re paying them (this is optional, but it’s fun!)
+- Click **Pay with Expensify**
+- Choose **Bank Account\*** or **Debit Card\*\***
+\* If paying with a Bank Account, follow the prompts to connect your bank to Expensify.
+\*\* If paying with a Debit Card, enter your card details and tap Save.
+
+# FAQs
+## Send Money Payment: Why is the option to Pay With Expensify not visible to me?
+If “I’ll Settle Elsewhere” is showing for you when you’re trying to send money, this is because we don’t support money movement through Expensify in your jurisdiction yet. You can use “I’ll settle elsewhere” if you want to track the payments for audit in Expensify.
+
+## I’ve received a payment request/bill split from a friend in a DM. Do I use Send Money to send this payment?
+No. Click the green “Pay” button in the payment preview in the DM, and this will ensure you are paying the accompanying Payment or Bill Split request - canceling out the IOU to 0.
+
+## Can I request money from more than one person at a time?
+If you need to request money for more than one person at a time, you’ll want to use the Split Bill feature. The Request Money option is for one-to-one payments between two people.
diff --git a/ios/ExpensifyMono-Bold.otf b/ios/ExpensifyMono-Bold.otf
diff --git a/ios/ExpensifyMono-Regular.otf b/ios/ExpensifyMono-Regular.otf
diff --git a/ios/ExpensifyNeue-Bold.otf b/ios/ExpensifyNeue-Bold.otf
diff --git a/ios/ExpensifyNeue-BoldItalic.otf b/ios/ExpensifyNeue-BoldItalic.otf
diff --git a/ios/ExpensifyNeue-Italic.otf b/ios/ExpensifyNeue-Italic.otf
diff --git a/ios/ExpensifyNeue-Regular.otf b/ios/ExpensifyNeue-Regular.otf
diff --git a/ios/ExpensifyNewKansas-Medium.otf b/ios/ExpensifyNewKansas-Medium.otf
diff --git a/ios/ExpensifyNewKansas-MediumItalic.otf b/ios/ExpensifyNewKansas-MediumItalic.otf
diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj
@@ -74,6 +74,14 @@
 		3981452A2C7340EBBA2B9BD1 /* GTAmericaExpMono-BdIt.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "GTAmericaExpMono-BdIt.otf"; path = "../assets/fonts/GTAmericaExpMono-BdIt.otf"; sourceTree = "<group>"; };
 		3EDF186626B8D2CBA203E08D /* libPods-NewExpensify.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NewExpensify.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5150E5D0D7F74DBA8D7C1914 /* GTAmericaExpMono-RgIt.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "GTAmericaExpMono-RgIt.otf"; path = "../assets/fonts/GTAmericaExpMono-RgIt.otf"; sourceTree = "<group>"; };
+		5935414E2915C8CF001E81A5 /* ExpensifyNeue-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ExpensifyNeue-Regular.otf"; sourceTree = "<group>"; };
+		5935414F2915C8CF001E81A5 /* ExpensifyNeue-BoldItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ExpensifyNeue-BoldItalic.otf"; sourceTree = "<group>"; };
+		593541502915C8CF001E81A5 /* ExpensifyNeue-Italic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ExpensifyNeue-Italic.otf"; sourceTree = "<group>"; };
+		593541512915C8CF001E81A5 /* ExpensifyNeue-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ExpensifyNeue-Bold.otf"; sourceTree = "<group>"; };
+		593541522915C8DF001E81A5 /* ExpensifyMono-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ExpensifyMono-Bold.otf"; sourceTree = "<group>"; };
+		593541532915C8DF001E81A5 /* ExpensifyMono-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ExpensifyMono-Regular.otf"; sourceTree = "<group>"; };
+		593541542915C8ED001E81A5 /* ExpensifyNewKansas-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ExpensifyNewKansas-Medium.otf"; sourceTree = "<group>"; };
+		593541552915C8ED001E81A5 /* ExpensifyNewKansas-MediumItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ExpensifyNewKansas-MediumItalic.otf"; sourceTree = "<group>"; };
 		67D5C3A6A7FA417C8A853FC1 /* GTAmericaExp-Light.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "GTAmericaExp-Light.otf"; path = "../assets/fonts/GTAmericaExp-Light.otf"; sourceTree = "<group>"; };
 		7041848326A8E40900E09F4D /* RCTStartupTimer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RCTStartupTimer.h; path = NewExpensify/RCTStartupTimer.h; sourceTree = "<group>"; };
 		7041848426A8E47D00E09F4D /* RCTStartupTimer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RCTStartupTimer.m; path = NewExpensify/RCTStartupTimer.m; sourceTree = "<group>"; };
@@ -206,6 +214,14 @@
 			isa = PBXGroup;
 			children = (
 				A5AAD008CBD84A6CAEB9AC97 /* GTAmericaExp-Bold.otf */,
+				593541512915C8CF001E81A5 /* ExpensifyNeue-Bold.otf */,
+				593541522915C8DF001E81A5 /* ExpensifyMono-Bold.otf */,
+				593541532915C8DF001E81A5 /* ExpensifyMono-Regular.otf */,
+				593541542915C8ED001E81A5 /* ExpensifyNewKansas-Medium.otf */,
+				593541552915C8ED001E81A5 /* ExpensifyNewKansas-MediumItalic.otf */,
+				5935414F2915C8CF001E81A5 /* ExpensifyNeue-BoldItalic.otf */,
+				593541502915C8CF001E81A5 /* ExpensifyNeue-Italic.otf */,
+				5935414E2915C8CF001E81A5 /* ExpensifyNeue-Regular.otf */,
 				67D5C3A6A7FA417C8A853FC1 /* GTAmericaExp-Light.otf */,
 				AE65058949E14DA5A2D5435D /* GTAmericaExp-Medium.otf */,
 				8C7003903C1E4957824899BB /* GTAmericaExp-Regular.otf */,

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.23</string>
+	<string>1.2.24</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.23.6</string>
+	<string>1.2.24.4</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
@@ -75,6 +75,14 @@
 	<string>Your photos are used to create chat attachments.</string>
 	<key>UIAppFonts</key>
 	<array>
+		<string>ExpensifyNewKansas-MediumItalic.otf</string>
+		<string>ExpensifyNewKansas-Meduim.otf</string>
+		<string>ExpensifyNeue-Regular.otf</string>
+		<string>ExpensifyNeue-Italic.otf</string>
+		<string>ExpensifyNeue-BoldItalic.otf</string>
+		<string>ExpensifyNeue-Bold.otf</string>
+		<string>ExpensifyMono-Regular.otf</string>
+		<string>ExpensifyMono-Bold.otf</string>
 		<string>GTAmericaExp-Bold.otf</string>
 		<string>GTAmericaExp-Light.otf</string>
 		<string>GTAmericaExp-Medium.otf</string>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.23</string>
+	<string>1.2.24</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.23.6</string>
+	<string>1.2.24.4</string>
 </dict>
 </plist>
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -624,7 +624,7 @@ PODS:
   - RNScreens (3.17.0):
     - React-Core
     - React-RCTImage
-  - RNSVG (13.4.0):
+  - RNSVG (13.5.0):
     - React-Core
   - SDWebImage (5.11.1):
     - SDWebImage/Core (= 5.11.1)
@@ -1015,7 +1015,7 @@ SPEC CHECKSUMS:
   RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c
   RNReanimated: 6c980139eb3b043569a08b8cb3d92cdf46bd54fa
   RNScreens: 0df01424e9e0ed7827200d6ed1087ddd06c493f9
-  RNSVG: 07dbd870b0dcdecc99b3a202fa37c8ca163caec2
+  RNSVG: 38ca962c970dbce1ca38991a5aebf26d163f9efb
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608