Merge branch 'stage' into connor/low-price-crash

osmosis-labs · Sep 10, 2024 · 9278038 · 9278038
2 parents e343801 + d1af6ad
commit 9278038
Show file tree

Hide file tree

Showing 15 changed files with 238 additions and 45 deletions.
diff --git a/packages/bridge/src/__tests__/mock-asset-lists.ts b/packages/bridge/src/__tests__/mock-asset-lists.ts
@@ -1445,7 +1445,7 @@ export const MockAssetLists: AssetList[] = [
         sourceDenom: "wmatic-wei",
         coinMinimalDenom:
           "ibc/AB589511ED0DD5FA56171A39978AFBF1371DB986EC1C3526CE138A16377E39BB",
-        symbol: "MATIC",
+        symbol: "POL",
         decimals: 18,
         logoURIs: {
           png: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/polygon/images/matic-purple.png",
@@ -1506,15 +1506,15 @@ export const MockAssetLists: AssetList[] = [
             chainType: "evm",
             chainId: 137,
             address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-            symbol: "MATIC",
+            symbol: "POL",
             decimals: 18,
             logoURIs: {
               png: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/polygon/images/matic-purple.png",
               svg: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/polygon/images/matic-purple.svg",
             },
           },
         ],
-        variantGroupKey: "MATIC",
+        variantGroupKey: "POL",
         name: "Polygon",
         isAlloyed: false,
         verified: true,

diff --git a/packages/bridge/src/squid/__tests__/mocks.ts b/packages/bridge/src/squid/__tests__/mocks.ts
@@ -1977,7 +1977,7 @@ export const MockChains = [
     chainId: 137,
     nativeCurrency: {
       name: "Polygon",
-      symbol: "MATIC",
+      symbol: "POL",
       decimals: 18,
       icon: "https://raw.githubusercontent.com/axelarnetwork/axelar-docs/main/public/images/chains/polygon.svg",
     },

diff --git a/packages/bridge/src/squid/__tests__/squid-bridge-provider.spec.ts b/packages/bridge/src/squid/__tests__/squid-bridge-provider.spec.ts
@@ -527,7 +527,7 @@ describe("SquidBridgeProvider", () => {
         chainId: 137,
         nativeCurrency: {
           name: "Polygon",
-          symbol: "MATIC",
+          symbol: "POL",
           decimals: 18,
           icon: "https://raw.githubusercontent.com/axelarnetwork/axelar-docs/main/public/images/chains/polygon.svg",
         },

diff --git a/packages/server/src/queries/__tests__/mock-asset-lists.ts b/packages/server/src/queries/__tests__/mock-asset-lists.ts
@@ -1447,7 +1447,7 @@ export const AssetLists: AssetList[] = [
         sourceDenom: "wmatic-wei",
         coinMinimalDenom:
           "ibc/AB589511ED0DD5FA56171A39978AFBF1371DB986EC1C3526CE138A16377E39BB",
-        symbol: "MATIC",
+        symbol: "POL",
         decimals: 18,
         logoURIs: {
           png: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/polygon/images/matic-purple.png",
@@ -1508,22 +1508,22 @@ export const AssetLists: AssetList[] = [
             chainType: "evm",
             chainId: 137,
             address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-            symbol: "MATIC",
+            symbol: "POL",
             decimals: 18,
             logoURIs: {
               png: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/polygon/images/matic-purple.png",
               svg: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/polygon/images/matic-purple.svg",
             },
           },
         ],
-        variantGroupKey: "MATIC",
+        variantGroupKey: "POL",
         name: "Polygon",
         isAlloyed: false,
         verified: true,
         unstable: false,
         disabled: false,
         preview: false,
-        relative_image_url: "/tokens/generated/matic.png",
+        relative_image_url: "/tokens/generated/pol.png",
       },
       {
         chainName: "axelar",

diff --git a/packages/stores/src/tests/mock-data.ts b/packages/stores/src/tests/mock-data.ts
@@ -2401,7 +2401,7 @@ export const MockAssetList: AssetList[] = [
         sourceDenom: "wmatic-wei",
         coinMinimalDenom:
           "ibc/AB589511ED0DD5FA56171A39978AFBF1371DB986EC1C3526CE138A16377E39BB",
-        symbol: "MATIC",
+        symbol: "POL",
         decimals: 18,
         logoURIs: {
           png: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/polygon/images/matic-purple.png",
@@ -2462,22 +2462,22 @@ export const MockAssetList: AssetList[] = [
             chainType: "evm",
             chainId: 137,
             address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-            symbol: "MATIC",
+            symbol: "POL",
             decimals: 18,
             logoURIs: {
               png: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/polygon/images/matic-purple.png",
               svg: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/polygon/images/matic-purple.svg",
             },
           },
         ],
-        variantGroupKey: "MATIC",
+        variantGroupKey: "POL",
         name: "Polygon",
         isAlloyed: false,
         verified: true,
         unstable: false,
         disabled: false,
         preview: false,
-        relative_image_url: "/tokens/generated/matic.png",
+        relative_image_url: "/tokens/generated/pol.png",
       },
       {
         chainName: "axelar",

diff --git a/packages/trpc/src/__tests_e2e__/mock-asset-lists.ts b/packages/trpc/src/__tests_e2e__/mock-asset-lists.ts
@@ -1447,7 +1447,7 @@ export const AssetLists: AssetList[] = [
         sourceDenom: "wmatic-wei",
         coinMinimalDenom:
           "ibc/AB589511ED0DD5FA56171A39978AFBF1371DB986EC1C3526CE138A16377E39BB",
-        symbol: "MATIC",
+        symbol: "POL",
         decimals: 18,
         logoURIs: {
           png: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/polygon/images/matic-purple.png",
@@ -1508,22 +1508,22 @@ export const AssetLists: AssetList[] = [
             chainType: "evm",
             chainId: 137,
             address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-            symbol: "MATIC",
+            symbol: "POL",
             decimals: 18,
             logoURIs: {
               png: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/polygon/images/matic-purple.png",
               svg: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/polygon/images/matic-purple.svg",
             },
           },
         ],
-        variantGroupKey: "MATIC",
+        variantGroupKey: "POL",
         name: "Polygon",
         isAlloyed: false,
         verified: true,
         unstable: false,
         disabled: false,
         preview: false,
-        relative_image_url: "/tokens/generated/matic.png",
+        relative_image_url: "/tokens/generated/pol.png",
       },
       {
         chainName: "axelar",

diff --git a/packages/web/components/complex/orders-history/index.tsx b/packages/web/components/complex/orders-history/index.tsx
@@ -84,7 +84,7 @@ export const OrderHistory = observer(() => {
   } = useOrderbookAllActiveOrders({
     userAddress: wallet?.address ?? "",
     pageSize: 20,
-    refetchInterval: 10000,
+    refetchInterval: featureFlags.sqsActiveOrders ? 10000 : 30000,
   });
   const groupedOrders = useMemo(() => groupOrdersByStatus(orders), [orders]);
   const groups = useMemo(
@@ -123,7 +123,7 @@ export const OrderHistory = observer(() => {
     useOrderbookClaimableOrders({
       userAddress: wallet?.address ?? "",
       disabled: isLoading || filledOrdersInDisplay.length === 0 || isRefetching,
-      refetchInterval: 10000,
+      refetchInterval: featureFlags.sqsActiveOrders ? 10000 : 30000,
     });
 
   const claimOrders = useCallback(async () => {

diff --git a/packages/web/components/complex/portfolio/historical-chart.tsx b/packages/web/components/complex/portfolio/historical-chart.tsx
@@ -37,7 +37,7 @@ export const PortfolioHistoricalChart = ({
   setIsChartMinimized,
 }: PortfolioHistoricalChartProps) => {
   const { t } = useTranslation();
-  const { logEvent } = useAmplitudeAnalytics();
+  const { logEvent, getLastEvent } = useAmplitudeAnalytics();
 
   return (
     <section className="relative flex h-[468px] max-h-[468px] flex-col justify-between">
@@ -54,7 +54,14 @@ export const PortfolioHistoricalChart = ({
             onPointerHover={(value, time) => {
               setShowDate(true);
               setDataPoint({ value, time });
-              logEvent([EventName.Portfolio.chartInteraction]);
+
+              const lastEvent = getLastEvent();
+              // Avoid logging subsequent chartInteraction events to prevent Amplitude overload
+              if (
+                lastEvent?.eventName !== EventName.Portfolio.chartInteraction
+              ) {
+                logEvent([EventName.Portfolio.chartInteraction]);
+              }
             }}
             onPointerOut={resetDataPoint}
           />

diff --git a/packages/web/components/earn/filters/filter-context.tsx b/packages/web/components/earn/filters/filter-context.tsx
@@ -1,4 +1,11 @@
-import { createContext, PropsWithChildren, useCallback, useState } from "react";
+import { useRouter } from "next/router";
+import {
+  createContext,
+  PropsWithChildren,
+  useCallback,
+  useEffect,
+  useState,
+} from "react";
 
 import {
   ListOption,
@@ -47,6 +54,14 @@ export const FilterProvider = ({
   defaultFilters,
 }: PropsWithChildren<{ defaultFilters: Filters }>) => {
   const [filters, setFilters] = useState<Filters>(defaultFilters);
+  const router = useRouter();
+  const { search } = router.query;
+
+  useEffect(() => {
+    if (typeof search === "string" && search !== "") {
+      setFilters((prev) => ({ ...prev, search }));
+    }
+  }, [search]);
 
   const setFilter = useCallback<SetFilterFn>(
     (key, value) => {

diff --git a/packages/web/config/analytics-events.ts b/packages/web/config/analytics-events.ts
@@ -2,6 +2,8 @@
  *  Logged to Amplitude at https://analytics.amplitude.com/osmosis-zone/
  */
 
+import { AllocationOptions } from "~/components/complex/portfolio/types";
+
 // Should be in sync with: https://docs.google.com/spreadsheets/d/18w8VwJmmRdb_E-XkE1UjkqhLxCyhqVVhWlzDgTtbRWo/edit?usp=sharing
 // For maintainability - all event logs should be in high level component
 
@@ -71,6 +73,19 @@ export type EventProperties = {
   walletName: string;
   transferDirection: "deposit" | "withdraw";
   swapSource: "market" | "swap";
+  coinDenom: string;
+  appName: string;
+  isFeatured: boolean;
+  isBanner: boolean;
+  position: number;
+  allocationType: AllocationOptions;
+  section: string;
+  tokenIn: string;
+  tokenOut: string;
+  option: string;
+  numberOfValidators: number;
+  validatorNames: string[];
+  squadSize: number;
 };
 
 export type UserProperties = {

diff --git a/packages/web/config/mock-asset-lists.ts b/packages/web/config/mock-asset-lists.ts
@@ -1445,7 +1445,7 @@ export const AssetLists: AssetList[] = [
         sourceDenom: "wmatic-wei",
         coinMinimalDenom:
           "ibc/AB589511ED0DD5FA56171A39978AFBF1371DB986EC1C3526CE138A16377E39BB",
-        symbol: "MATIC",
+        symbol: "POL",
         decimals: 18,
         logoURIs: {
           png: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/polygon/images/matic-purple.png",
@@ -1506,15 +1506,15 @@ export const AssetLists: AssetList[] = [
             chainType: "evm",
             chainId: 137,
             address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-            symbol: "MATIC",
+            symbol: "POL",
             decimals: 18,
             logoURIs: {
               png: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/polygon/images/matic-purple.png",
               svg: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/polygon/images/matic-purple.svg",
             },
           },
         ],
-        variantGroupKey: "MATIC",
+        variantGroupKey: "POL",
         name: "Polygon",
         isAlloyed: false,
         verified: true,