Skip to content

Commit

Permalink
Merge branch 'Expensify:main' into fix-51888-cors-errors-are-displaye…
Browse files Browse the repository at this point in the history
…d-for-attachments
  • Loading branch information
Kalydosos authored Dec 9, 2024
2 parents cfaee48 + d007785 commit 49f829c
Show file tree
Hide file tree
Showing 67 changed files with 1,821 additions and 2,032 deletions.
444 changes: 354 additions & 90 deletions .github/actions/javascript/authorChecklist/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type {StorybookConfig} from '@storybook/types';
import type {StorybookConfig} from 'storybook/internal/types';

const main: StorybookConfig = {
stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
Expand Down
2 changes: 1 addition & 1 deletion .storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {PortalProvider} from '@gorhom/portal';
import type {Parameters} from '@storybook/types';
import React from 'react';
import Onyx from 'react-native-onyx';
import {SafeAreaProvider} from 'react-native-safe-area-context';
import type {Parameters} from 'storybook/internal/types';
import ComposeProviders from '@src/components/ComposeProviders';
import HTMLEngineProvider from '@src/components/HTMLEngineProvider';
import {LocaleContextProvider} from '@src/components/LocaleContextProvider';
Expand Down
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 1009007201
versionName "9.0.72-1"
versionCode 1009007300
versionName "9.0.73-0"
// 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
3 changes: 3 additions & 0 deletions docs/assets/js/selector.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
function syncSelectors(selectedIndex) {
const allSelects = document.querySelectorAll('select');
// eslint-disable-next-line @typescript-eslint/prefer-for-of
for (let i = 0; i < allSelects.length; i++) {
allSelects[i].selectedIndex = selectedIndex;
}
Expand All @@ -19,13 +20,15 @@ function selectOption(select) {
allOptions.forEach((option) => {
if (option.value === selectedValue) {
const toShow = document.getElementsByClassName(option.value);
// eslint-disable-next-line @typescript-eslint/prefer-for-of
for (let i = 0; i < toShow.length; i++) {
toShow[i].classList.remove('hidden');
}
return;
}

const toHide = document.getElementsByClassName(option.value);
// eslint-disable-next-line @typescript-eslint/prefer-for-of
for (let i = 0; i < toHide.length; i++) {
toHide[i].classList.add('hidden');
}
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>9.0.72</string>
<string>9.0.73</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -40,7 +40,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>9.0.72.1</string>
<string>9.0.73.0</string>
<key>FullStory</key>
<dict>
<key>OrgId</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>9.0.72</string>
<string>9.0.73</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>9.0.72.1</string>
<string>9.0.73.0</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions ios/NotificationServiceExtension/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundleShortVersionString</key>
<string>9.0.72</string>
<string>9.0.73</string>
<key>CFBundleVersion</key>
<string>9.0.72.1</string>
<string>9.0.73.0</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
Expand Down
Loading

0 comments on commit 49f829c

Please sign in to comment.