Merge branch 'main' into feat/disable-metametrics-basic-functionality

Author: mathieuartu

app/scripts/controllers/bridge-status/bridge-status-controller.ts

@@ -14,7 +14,7 @@ import {
   DEFAULT_BRIDGE_STATUS_STATE,
   REFRESH_INTERVAL_MS,
 } from './constants';
-import { BridgeStatusControllerMessenger } from './types';
+import type { BridgeStatusControllerMessenger } from './types';
 import { fetchBridgeTxStatus, getStatusRequestWithSrcTxHash } from './utils';
 
 const metadata: StateMetadata<BridgeStatusControllerState> = {

app/scripts/controllers/bridge-status/constants.ts

@@ -1,3 +1,4 @@
+import { BRIDGE_API_BASE_URL } from '../../../../shared/constants/bridge';
 import { BridgeStatusState } from '../../../../shared/types/bridge-status';
 
 export const REFRESH_INTERVAL_MS = 10 * 1000;
@@ -11,3 +12,5 @@ export const DEFAULT_BRIDGE_STATUS_STATE: BridgeStatusState = {
 export const DEFAULT_BRIDGE_STATUS_CONTROLLER_STATE = {
   bridgeStatusState: { ...DEFAULT_BRIDGE_STATUS_STATE },
 };
+
+export const BRIDGE_STATUS_BASE_URL = `${BRIDGE_API_BASE_URL}/getTxStatus`;

app/scripts/controllers/bridge-status/utils.ts

@@ -1,7 +1,4 @@
-import {
-  BRIDGE_API_BASE_URL,
-  BRIDGE_CLIENT_ID,
-} from '../../../../shared/constants/bridge';
+import { BRIDGE_CLIENT_ID } from '../../../../shared/constants/bridge';
 import fetchWithCache from '../../../../shared/lib/fetch-with-cache';
 import {
   StatusResponse,
@@ -10,11 +7,10 @@ import {
 } from '../../../../shared/types/bridge-status';
 import type { Quote } from '../../../../shared/types/bridge';
 import { validateResponse, validators } from './validators';
+import { BRIDGE_STATUS_BASE_URL } from './constants';
 
 const CLIENT_ID_HEADER = { 'X-Client-Id': BRIDGE_CLIENT_ID };
 
-export const BRIDGE_STATUS_BASE_URL = `${BRIDGE_API_BASE_URL}/getTxStatus`;
-
 export const getStatusRequestDto = (
   statusRequest: StatusRequestWithSrcTxHash,
 ): StatusRequestDto => {

app/scripts/controllers/bridge-status/validators.ts

@@ -7,7 +7,7 @@ import {
   Asset,
   StatusTypes,
 } from '../../../../shared/types/bridge-status';
-import { BRIDGE_STATUS_BASE_URL } from './utils';
+import { BRIDGE_STATUS_BASE_URL } from './constants';
 
 type Validator<ExpectedResponse, DataToValidate> = {
   property: keyof ExpectedResponse | string;

development/circular-deps.jsonc

@@ -7,14 +7,6 @@
 // - For more information contact the Extension Platform team.
 
 [
-  [
-    "app/scripts/controllers/bridge-status/bridge-status-controller.ts",
-    "app/scripts/controllers/bridge-status/types.ts"
-  ],
-  [
-    "app/scripts/controllers/bridge-status/utils.ts",
-    "app/scripts/controllers/bridge-status/validators.ts"
-  ],
   [
     "ui/components/app/alert-system/confirm-alert-modal/confirm-alert-modal.tsx",
     "ui/components/app/alert-system/confirm-alert-modal/index.tsx",