Merge branch 'master' into feat/feedback-close-message-event

Author: AbhiPrasad

src/sentry/options/defaults.py

@@ -1704,3 +1704,21 @@
     default=False,
     flags=FLAG_AUTOMATOR_MODIFIABLE,
 )
+
+# sample rate for using v2 of deobfuscation that
+# uses function params when line info is missing
+register(
+    "profiling.android.deobfuscation_v2_sample_rate",
+    default=0.0,
+    flags=FLAG_AUTOMATOR_MODIFIABLE,
+)
+
+# org IDs that will be using v2 of deobfuscation
+# regardless of the sample rate defined by:
+# "profiling.android.deobfuscation_v2_sample_rate"
+register(
+    "profiling.android.deobfuscation_v2_org_ids",
+    type=Sequence,
+    default=[],
+    flags=FLAG_ALLOW_EMPTY | FLAG_AUTOMATOR_MODIFIABLE,
+)

static/app/components/globalModal/index.tsx

@@ -75,6 +75,10 @@ type ModalRenderProps = {
    * Closes the modal
    */
   closeModal: () => void;
+  /**
+   * Reference to the modal's container.
+   */
+  modalContainerRef?: React.RefObject<HTMLDivElement>;
 };
 
 /**
@@ -175,14 +179,6 @@ function GlobalModal({onClose}: Props) {
   // Close the modal when the browser history changes
   useEffect(() => browserHistory.listen(() => actionCloseModal()), []);
 
-  const renderedChild = renderer?.({
-    CloseButton: makeCloseButton(closeModal),
-    Header: makeClosableHeader(closeModal),
-    Body: ModalBody,
-    Footer: ModalFooter,
-    closeModal,
-  });
-
   // Default to enabled backdrop
   const backdrop = options.backdrop ?? true;
 
@@ -194,6 +190,15 @@ function GlobalModal({onClose}: Props) {
   const clickClose = (e: React.MouseEvent) =>
     containerRef.current === e.target && allowBackdropClickClose && closeModal();
 
+  const renderedChild = renderer?.({
+    CloseButton: makeCloseButton(closeModal),
+    Header: makeClosableHeader(closeModal),
+    Body: ModalBody,
+    Footer: ModalFooter,
+    modalContainerRef: containerRef,
+    closeModal,
+  });
+
   return createPortal(
     <Fragment>
       <Backdrop

static/app/components/group/externalIssuesList.tsx

@@ -5,7 +5,7 @@ import {
   userEvent,
 } from 'sentry-test/reactTestingLibrary';
 
-import ExternalIssueActions from 'sentry/components/group/externalIssueActions';
+import ExternalIssueActions from 'sentry/components/group/externalIssuesList/externalIssueActions';
 
 describe('ExternalIssueActions', function () {
   const group = TestStubs.Group();

static/app/components/group/externalIssueActions.spec.tsx renamed to static/app/components/group/externalIssuesList/externalIssueActions.spec.tsx

@@ -13,7 +13,7 @@ import useApi from 'sentry/utils/useApi';
 import useOrganization from 'sentry/utils/useOrganization';
 import IntegrationItem from 'sentry/views/settings/organizationIntegrations/integrationItem';
 
-import ExternalIssueForm from './externalIssueForm';
+import ExternalIssueForm from '../externalIssueForm';
 
 type Props = {
   configurations: GroupIntegration[];