Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[No QA] Console cleanup pt.1 #52187

Merged
merged 7 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions desktop/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@ const {DESKTOP_SHORTCUT_ACCELERATOR, LOCALES} = CONST;
// geolocation api (window.navigator.geolocation.getCurrentPosition) to work on desktop.
// Source: https://github.com/electron/electron/blob/98cd16d336f512406eee3565be1cead86514db7b/docs/api/environment-variables.md#google_api_key
process.env.GOOGLE_API_KEY = CONFIG.GCP_GEOLOCATION_API_KEY;
/**
* Suppresses Content Security Policy (CSP) console warnings related to 'unsafe-eval'.
* This is required because:
* 1. Webpack utilizes eval() for module bundling
* 2. The application requires 'unsafe-eval' in CSP to function properly
* Note: CSP warnings are expected and unavoidable in this context
*/
process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = CONFIG.ELECTRON_DISABLE_SECURITY_WARNINGS;

app.setName('New Expensify');

Expand Down
22 changes: 18 additions & 4 deletions package-lock.json

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
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
"react-native-image-picker": "^7.0.3",
"react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#cb392140db4953a283590d7cf93b4d0461baa2a9",
"react-native-key-command": "^1.0.8",
"react-native-keyboard-controller": "1.14.1",
"react-native-keyboard-controller": "1.14.4",
"react-native-launch-arguments": "^4.0.2",
"react-native-localize": "^2.2.6",
"react-native-modal": "^13.0.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/node_modules/react-native-keyboard-controller/android/src/main/java/com/reactnativekeyboardcontroller/views/EdgeToEdgeReactViewGroup.kt b/node_modules/react-native-keyboard-controller/android/src/main/java/com/reactnativekeyboardcontroller/views/EdgeToEdgeReactViewGroup.kt
index 7ef8b36..f4d44ff 100644
index 93c20d3..df1e846 100644
--- a/node_modules/react-native-keyboard-controller/android/src/main/java/com/reactnativekeyboardcontroller/views/EdgeToEdgeReactViewGroup.kt
+++ b/node_modules/react-native-keyboard-controller/android/src/main/java/com/reactnativekeyboardcontroller/views/EdgeToEdgeReactViewGroup.kt
@@ -74,7 +74,7 @@ class EdgeToEdgeReactViewGroup(
Expand Down Expand Up @@ -51,7 +51,7 @@ index 7ef8b36..f4d44ff 100644
}
// endregion

@@ -219,7 +219,7 @@ class EdgeToEdgeReactViewGroup(
@@ -223,7 +223,7 @@ class EdgeToEdgeReactViewGroup(
fun forceStatusBarTranslucent(isStatusBarTranslucent: Boolean) {
if (active && this.isStatusBarTranslucent != isStatusBarTranslucent) {
this.isStatusBarTranslucent = isStatusBarTranslucent
Expand Down
1 change: 1 addition & 0 deletions src/CONFIG.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,5 @@ export default {
},
// to read more about StrictMode see: contributingGuides/STRICT_MODE.md
USE_REACT_STRICT_MODE_IN_DEV: false,
ELECTRON_DISABLE_SECURITY_WARNINGS: 'true',
} as const;
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
import {CellContainer} from '@shopify/flash-list';
import type {CellContainerProps} from '@shopify/flash-list/dist/native/cell-container/CellContainer';
import type {ForwardedRef} from 'react';
import {forwardRef} from 'react';
import type {View} from 'react-native';

function OptionRowRendererComponent(props: CellContainerProps) {
function OptionRowRendererComponent(props: CellContainerProps, ref: ForwardedRef<View>) {
return (
<CellContainer
// eslint-disable-next-line react/jsx-props-no-spreading
{...props}
ref={ref}
style={[props.style, {zIndex: -props.index}]}
/>
);
}

OptionRowRendererComponent.displayName = 'OptionRowRendererComponent';

export default OptionRowRendererComponent;
export default forwardRef(OptionRowRendererComponent);
Loading