Skip to content

Commit

Permalink
Merge branch 'main' into @wolewicki/bump-clipboard-to-remove-macos-an…
Browse files Browse the repository at this point in the history
…d-windows
  • Loading branch information
WoLewicki committed Nov 28, 2024
2 parents 82ed6e4 + be6468c commit c871090
Show file tree
Hide file tree
Showing 152 changed files with 7,484 additions and 3,250 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1009006701
versionName "9.0.67-1"
versionCode 1009006709
versionName "9.0.67-9"
// Supported language variants must be declared here to avoid from being removed during the compilation.
// This also helps us to not include unnecessary language variants in the APK.
resConfigs "en", "es"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ The following steps will determine how data will be exported from Expensify to Q

# Step 2: Configure coding/import settings

The following steps help you determine how data will be imported from QuickBooks Online to Expensify:
The following steps help you determine how data will be imported from QuickBooks Desktop to Expensify:

![Expensify coding settings page for the QuickBooks Desktop integration](https://help.expensify.com/assets/images/quickbooks-desktop-coding-settings.png){:width="100%"}

1. Click Import under the QuickBooks Online connection.
1. Click Import under the QuickBooks Desktop connection.
2. Review each of the following import settings:
- **Chart of Accounts**: The Chart of Accounts is automatically imported from QuickBooks Desktop as categories. This cannot be amended.
- **Classes**: Choose whether to import classes, which will be shown in Expensify as tags for expense-level coding.
Expand Down Expand Up @@ -67,15 +67,15 @@ To manually sync your connection:
For manual syncing, we recommend completing this process at least once a week and/or after making changes in QuickBooks Desktop that could impact how reports export from Expensify. Changes may include adjustments to your chart of accounts, vendors, employees, customers/jobs, or items. Remember: Both the Web Connector and QuickBooks Desktop need to be running for syncing or exporting to work.
{% include end-info.html %}

## **Can I sync Expensify and QuickBooks Desktop (QBD) and use the platforms at the same time?**
## **Can I sync Expensify and QuickBooks Desktop and use the platforms at the same time?**

When syncing Expensify to QuickBooks Desktop, we recommend waiting until the sync finishes to access either Expensify and/or QuickBooks Desktop, as performance may vary during this process. You cannot open an instance of QuickBooks Desktop while a program is syncing - this may cause QuickBooks Desktop to behave unexpectedly.

## **What are the different types of accounts that can be imported from QuickBooks Desktop?**

Here is the list of accounts from QuickBooks Desktop and how they are pulled into Expensify:

| QBD account type | How it imports to Expensify |
| QuickBooks Desktop account type | How it imports to Expensify |
| ------------- | ------------- |
| Accounts payable | Vendor bill or journal entry export options |
| Accounts receivable | Do not import |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,24 @@ Yes, you can edit an expense until it is paid. When an expense is submitted, the
In Expensify, expense reports group expenses in a batch to be paid or reconciled. When a draft report is open, all new expenses are added to it.

Once a report is submitted, you can track the status from the **Search** section. Click the **View** button for a specific expense or expense report. The status is displayed at the top of the expense or report.

**How can I enable camera permission for a website on mobile browsers?**

**Google Chrome:**
1. Open Chrome.
2. To the right of the address bar, tap More icon > **Settings**.
3. Tap **Site settings** > **Camera**.
4. Tap to turn the microphone or camera on or off.
- If you find the site you want to use under **Blocked**, tap the site > **Allow**.
5. Refresh the site.

**Safari:**
1. Open Safari.
2. To the left of the address bar, tap More icon > **Site settings** > **Camera**.
3. Tap **Allow** to grant permission.
4. Tap **Done**.
5. Refresh the site.

{% include faq-end.md %}

</div>
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>9.0.67.1</string>
<string>9.0.67.9</string>
<key>FullStory</key>
<dict>
<key>OrgId</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>9.0.67.1</string>
<string>9.0.67.9</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion ios/NotificationServiceExtension/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>CFBundleShortVersionString</key>
<string>9.0.67</string>
<key>CFBundleVersion</key>
<string>9.0.67.1</string>
<string>9.0.67.9</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
Expand Down
43 changes: 14 additions & 29 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2503,7 +2503,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RNReanimated (3.16.1):
- RNReanimated (3.16.3):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -2523,10 +2523,10 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNReanimated/reanimated (= 3.16.1)
- RNReanimated/worklets (= 3.16.1)
- RNReanimated/reanimated (= 3.16.3)
- RNReanimated/worklets (= 3.16.3)
- Yoga
- RNReanimated/reanimated (3.16.1):
- RNReanimated/reanimated (3.16.3):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -2546,9 +2546,9 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNReanimated/reanimated/apple (= 3.16.1)
- RNReanimated/reanimated/apple (= 3.16.3)
- Yoga
- RNReanimated/reanimated/apple (3.16.1):
- RNReanimated/reanimated/apple (3.16.3):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -2569,7 +2569,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RNReanimated/worklets (3.16.1):
- RNReanimated/worklets (3.16.3):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -2717,27 +2717,12 @@ PODS:
- SDWebImage/Core (~> 5.17)
- SocketRocket (0.7.0)
- Turf (2.8.0)
- VisionCamera (4.0.0-beta.13):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- VisionCamera (4.6.1):
- VisionCamera/Core (= 4.6.1)
- VisionCamera/React (= 4.6.1)
- VisionCamera/Core (4.6.1)
- VisionCamera/React (4.6.1):
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- Yoga (0.0.0)

DEPENDENCIES:
Expand Down Expand Up @@ -3291,7 +3276,7 @@ SPEC CHECKSUMS:
rnmapbox-maps: 460d6ff97ae49c7d5708c3212c6521697c36a0c4
RNPermissions: 0b1429b55af59d1d08b75a8be2459f65a8ac3f28
RNReactNativeHapticFeedback: 73756a3477a5a622fa16862a3ab0d0fc5e5edff5
RNReanimated: 2d728bad3a69119be89c3431ee0ccda026ecffdc
RNReanimated: 03ba2447d5a7789e2843df2ee05108d93b6441d6
RNScreens: de6e57426ba0e6cbc3fb5b4f496e7f08cb2773c2
RNShare: bd4fe9b95d1ee89a200778cc0753ebe650154bb0
RNSound: 6c156f925295bdc83e8e422e7d8b38d33bc71852
Expand All @@ -3302,7 +3287,7 @@ SPEC CHECKSUMS:
SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
Turf: aa2ede4298009639d10db36aba1a7ebaad072a5e
VisionCamera: c6c8aa4b028501fc87644550fbc35a537d4da3fb
VisionCamera: c95a8ad535f527562be1fb05fb2fd324578e769c
Yoga: a1d7895431387402a674fd0d1c04ec85e87909b8

PODFILE CHECKSUM: 15e2f095b9c80d658459723edf84005a6867debf
Expand Down
26 changes: 18 additions & 8 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
"version": "9.0.67-1",
"version": "9.0.67-9",
"author": "Expensify, Inc.",
"homepage": "https://new.expensify.com",
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
Expand Down Expand Up @@ -161,7 +161,7 @@
"react-native-plaid-link-sdk": "11.11.0",
"react-native-qrcode-svg": "6.3.11",
"react-native-quick-sqlite": "git+https://github.com/margelo/react-native-nitro-sqlite#99f34ebefa91698945f3ed26622e002bd79489e0",
"react-native-reanimated": "3.16.1",
"react-native-reanimated": "3.16.3",
"react-native-release-profiler": "^0.2.1",
"react-native-render-html": "6.3.1",
"react-native-safe-area-context": "4.10.9",
Expand All @@ -172,7 +172,7 @@
"react-native-tab-view": "^3.5.2",
"react-native-url-polyfill": "^2.0.0",
"react-native-view-shot": "3.8.0",
"react-native-vision-camera": "4.0.0-beta.13",
"react-native-vision-camera": "^4.6.1",
"react-native-web": "0.19.13",
"react-native-webview": "13.8.6",
"react-plaid-link": "3.3.2",
Expand Down

This file was deleted.

Loading

0 comments on commit c871090

Please sign in to comment.