diff --git a/packages/mobile/eas.json b/packages/mobile/eas.json
index 97fc89d78f..d5133849f0 100644
--- a/packages/mobile/eas.json
+++ b/packages/mobile/eas.json
@@ -16,7 +16,11 @@
       "node": "20.11.1"
     },
     "production": {
-      "node": "20.11.1"
+      "node": "20.11.1",
+      "env": {
+        "EXPO_PUBLIC_HISTORICAL_DATA_URL": "https://data.app.osmosis.zone",
+        "EXPO_PUBLIC_OSMOSIS_BE_BASE_URL": "http://192.168.6.194:3000"
+      }
     }
   }
 }
diff --git a/packages/web/components/place-limit-tool/index.tsx b/packages/web/components/place-limit-tool/index.tsx
index 32c58b3c4d..ed8f853566 100644
--- a/packages/web/components/place-limit-tool/index.tsx
+++ b/packages/web/components/place-limit-tool/index.tsx
@@ -1,7 +1,7 @@
 import { DEFAULT_VS_CURRENCY } from "@osmosis-labs/server";
 import { QuoteDirection } from "@osmosis-labs/tx";
 import { Dec, DecUtils, PricePretty } from "@osmosis-labs/unit";
-import { isValidNumericalRawInput } from "@osmosis-labs/utils";
+import { isValidNumericalRawInput, mulPrice } from "@osmosis-labs/utils";
 import classNames from "classnames";
 import { observer } from "mobx-react-lite";
 import { parseAsString, parseAsStringLiteral, useQueryStates } from "nuqs";
@@ -40,7 +40,6 @@ import {
   useWalletSelect,
 } from "~/hooks";
 import { MIN_ORDER_VALUE, usePlaceLimit } from "~/hooks/limit-orders";
-import { mulPrice } from "~/hooks/queries/assets/use-coin-fiat-value";
 import {
   useAmountWithSlippage,
   useDynamicSlippageConfig,
diff --git a/packages/web/hooks/limit-orders/use-place-limit.ts b/packages/web/hooks/limit-orders/use-place-limit.ts
index 0de50771f4..db2063233d 100644
--- a/packages/web/hooks/limit-orders/use-place-limit.ts
+++ b/packages/web/hooks/limit-orders/use-place-limit.ts
@@ -5,6 +5,7 @@ import {
   QuoteDirection,
 } from "@osmosis-labs/tx";
 import { CoinPretty, Dec, Int, PricePretty } from "@osmosis-labs/unit";
+import { mulPrice } from "@osmosis-labs/utils";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { useAsync } from "react-use";
 
@@ -19,7 +20,6 @@ import { useOrderbook } from "~/hooks/limit-orders/use-orderbook";
 import { onAdd1CTSession } from "~/hooks/mutations/one-click-trading";
 import { onEnd1CTSession } from "~/hooks/mutations/one-click-trading/use-remove-one-click-trading-session";
 import { use1CTSwapReviewMessages } from "~/hooks/one-click-trading";
-import { mulPrice } from "~/hooks/queries/assets/use-coin-fiat-value";
 import { usePrice } from "~/hooks/queries/assets/use-price";
 import { useAmplitudeAnalytics } from "~/hooks/use-amplitude-analytics";
 import { useEstimateTxFees } from "~/hooks/use-estimate-tx-fees";
diff --git a/packages/web/modals/base.tsx b/packages/web/modals/base.tsx
index 054c6bf0ee..846572cc44 100644
--- a/packages/web/modals/base.tsx
+++ b/packages/web/modals/base.tsx
@@ -1,5 +1,5 @@
 import classNames from "classnames";
-import React, { PropsWithChildren, ReactNode } from "react";
+import React from "react";
 import ReactModal, { setAppElement } from "react-modal";
 import { useUnmount } from "react-use";
 
@@ -18,11 +18,12 @@ export interface ModalBaseProps {
   onRequestBack?: () => void;
   onAfterClose?: () => void;
   backIcon?: SpriteIconId;
-  title?: string | ReactNode;
+  title?: string | React.ReactNode;
   className?: string;
   bodyOpenClassName?: string;
   overlayClassName?: string;
   hideCloseButton?: boolean;
+  children?: React.ReactNode;
 }
 
 export const ModalBase = ({
@@ -37,7 +38,7 @@ export const ModalBase = ({
   overlayClassName,
   hideCloseButton,
   children,
-}: PropsWithChildren<ModalBaseProps>) => {
+}: ModalBaseProps) => {
   const { isMobile } = useWindowSize();
   const bodyOpenClassNames = classNames("overflow-hidden", bodyOpenClassName);
   useUnmount(() => {
@@ -83,7 +84,7 @@ export const ModalBase = ({
         )}
         {!hideCloseButton && <ModalCloseButton onClick={onRequestClose} />}
       </div>
-      {children}
+      <>{children}</>
     </ReactModal>
   );
 };