Skip to content

Commit

Permalink
Merge branch 'main' into @chrispader/theme-switching-status-and-scrol…
Browse files Browse the repository at this point in the history 
…l-bar
  • Loading branch information
@chrispader
chrispader committed Nov 30, 2023
2 parents 51ef33f + 0931352 commit 4c41816
Show file tree
Hide file tree
Showing 17 changed files with 406 additions and 244 deletions.
6 changes: 3 additions & 3 deletions android/app/build.gradle
View file
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 1001040601
versionName "1.4.6-1"
versionCode 1001040602
versionName "1.4.6-2"
}

flavorDimensions "default"
Expand Down Expand Up @@ -151,7 +151,7 @@ android {
signingConfig null
// buildTypes take precedence over productFlavors when it comes to the signing configuration,
// thus we need to manually set the signing config, so that the e2e uses the debug config again.
// In other words, the signingConfig setting above will be ignored when we build the flavor in release mode.
// In other words, the signingConfig setting above will be ignored when we build the flavor in release mode.
productFlavors.all { flavor ->
// All release builds should be signed with the release config ...
flavor.signingConfig signingConfigs.release
Expand Down
234 changes: 117 additions & 117 deletions ios/NewExpensify/Info.plist
View file
Original file line number Diff line number Diff line change
@@ -1,128 +1,128 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.6</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleURLSchemes</key>
<array>
<string>new-expensify</string>
</array>
</dict>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLSchemes</key>
<array>
<string>com.googleusercontent.apps.921154746561-s3uqn2oe4m85tufi6mqflbfbuajrm2i3</string>
</array>
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.4.6.1</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>venmo</string>
</array>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>LSSupportsOpeningDocumentsInPlace</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
<key>NSExceptionDomains</key>
<dict>
<key>localhost</key>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true />
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.6</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleURLSchemes</key>
<array>
<string>new-expensify</string>
</array>
</dict>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLSchemes</key>
<array>
<string>com.googleusercontent.apps.921154746561-s3uqn2oe4m85tufi6mqflbfbuajrm2i3</string>
</array>
</dict>
<key>www.expensify.com.dev</key>
</array>
<key>CFBundleVersion</key>
<string>1.4.6.2</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false />
<key>LSApplicationQueriesSchemes</key>
<array>
<string>venmo</string>
</array>
<key>LSRequiresIPhoneOS</key>
<true />
<key>LSSupportsOpeningDocumentsInPlace</key>
<true />
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true />
<key>NSExceptionDomains</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
<key>localhost</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true />
<key>NSIncludesSubdomains</key>
<true />
</dict>
<key>www.expensify.com.dev</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true />
<key>NSIncludesSubdomains</key>
<true />
</dict>
</dict>
</dict>
<key>NSCameraUsageDescription</key>
<string>Your camera is used to create chat attachments, documents, and facial capture.</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>Your location is used to determine your default currency and timezone.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Your location is used to determine your default currency and timezone.</string>
<key>NSMicrophoneUsageDescription</key>
<string>Required for video capture</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>Your camera roll is used to store chat attachments.</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>Your photos are used to create chat attachments.</string>
<key>UIAppFonts</key>
<array>
<string>ExpensifyNewKansas-Medium.otf</string>
<string>ExpensifyNewKansas-MediumItalic.otf</string>
<string>ExpensifyMono-Bold.otf</string>
<string>ExpensifyMono-Regular.otf</string>
<string>ExpensifyNeue-Bold.otf</string>
<string>ExpensifyNeue-BoldItalic.otf</string>
<string>ExpensifyNeue-Italic.otf</string>
<string>ExpensifyNeue-Regular.otf</string>
</array>
<key>UIBackgroundModes</key>
<array>
<string>remote-notification</string>
</array>
<key>UIFileSharingEnabled</key>
<true />
<key>UILaunchStoryboardName</key>
<string>BootSplash</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UIRequiresFullScreen</key>
<true />
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
<key>UIUserInterfaceStyle</key>
<string>Dark</string>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false />
</dict>
<key>NSCameraUsageDescription</key>
<string>Your camera is used to create chat attachments, documents, and facial capture.</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>Your location is used to determine your default currency and timezone.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Your location is used to determine your default currency and timezone.</string>
<key>NSMicrophoneUsageDescription</key>
<string>Required for video capture</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>Your camera roll is used to store chat attachments.</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>Your photos are used to create chat attachments.</string>
<key>UIAppFonts</key>
<array>
<string>ExpensifyNewKansas-Medium.otf</string>
<string>ExpensifyNewKansas-MediumItalic.otf</string>
<string>ExpensifyMono-Bold.otf</string>
<string>ExpensifyMono-Regular.otf</string>
<string>ExpensifyNeue-Bold.otf</string>
<string>ExpensifyNeue-BoldItalic.otf</string>
<string>ExpensifyNeue-Italic.otf</string>
<string>ExpensifyNeue-Regular.otf</string>
</array>
<key>UIBackgroundModes</key>
<array>
<string>remote-notification</string>
</array>
<key>UIFileSharingEnabled</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>BootSplash</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UIRequiresFullScreen</key>
<true/>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
<key>UIUserInterfaceStyle</key>
<string>Dark</string>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
</dict>
</plist>
40 changes: 20 additions & 20 deletions ios/NewExpensifyTests/Info.plist
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.6</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.4.6.1</string>
</dict>
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.6</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.4.6.2</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions package-lock.json
View file

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

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
"version": "1.4.6-1",
"version": "1.4.6-2",
"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
1 change: 1 addition & 0 deletions src/components/FeatureList.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ function FeatureList({menuItems, headline, description}) {
iconHeight={60}
iconStyles={[styles.mr3, styles.ml3]}
interactive={false}
wrapperStyle={[styles.cursorAuto]}
/>
))}
</>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/KeyboardShortcutsPage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function KeyboardShortcutsPage() {
key={shortcut.displayName}
title={shortcut.displayName}
description={translate(`keyboardShortcutsPage.shortcuts.${shortcut.descriptionKey}`)}
wrapperStyle={styles.ph0}
wrapperStyle={[styles.ph0, styles.cursorAuto]}
interactive={false}
/>
);
Expand Down
3 changes: 0 additions & 3 deletions src/styles/utilities/overscrollBehaviorContain/index.js
View file

This file was deleted.

1 change: 0 additions & 1 deletion src/styles/utilities/overscrollBehaviorContain/index.native.js
View file

This file was deleted.

5 changes: 5 additions & 0 deletions src/styles/utilities/overscrollBehaviorContain/index.native.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import OverscrollBehaviorStyles from './types';

const overscrollBehaviorContain: OverscrollBehaviorStyles = {};

export default overscrollBehaviorContain;
7 changes: 7 additions & 0 deletions src/styles/utilities/overscrollBehaviorContain/index.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import OverscrollBehaviorStyles from './types';

const overscrollBehaviorContain: OverscrollBehaviorStyles = {
overscrollBehavior: 'contain',
};

export default overscrollBehaviorContain;
5 changes: 5 additions & 0 deletions src/styles/utilities/overscrollBehaviorContain/types.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import {ViewStyle} from 'react-native';

type OverscrollBehaviorStyles = Pick<ViewStyle, 'overscrollBehavior'>;

export default OverscrollBehaviorStyles;
Loading

0 comments on commit 4c41816

Please sign in to comment.