From 1d5e101d37d0b9767e1b7c56b32dfc18919032aa Mon Sep 17 00:00:00 2001
From: salil-naik <salil.naik27@gmail.com>
Date: Fri, 15 Sep 2023 05:03:51 +0530
Subject: [PATCH 1/5] feat: option to add default sort preference

---
 src/components/Settings/SortPreference.tsx | 14 +++++---------
 src/hooks/useCustomSettings.ts             | 20 ++++++++++++++++----
 src/types/index.d.ts                       |  3 +++
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/components/Settings/SortPreference.tsx b/src/components/Settings/SortPreference.tsx
index 24db7d3..ed108e6 100644
--- a/src/components/Settings/SortPreference.tsx
+++ b/src/components/Settings/SortPreference.tsx
@@ -9,10 +9,8 @@ import { SubTitle } from "./SubTitle";
 
 export const SortPreference = () => {
   const dispatch = useDispatch();
-  const sortPrefFromStore = useSelector((state: any) => state.quotes.sortPref);
-  const [_sortPref, _setSortPref] = useState<string>(sortPrefFromStore);
+  const sortPref = useSelector((state: any) => state.quotes.sortPref);
   const [dropdown, openDropdown] = useState<boolean>(false);
-  const [label, setLabel] = useState<string>("");
 
   const dropdownRef = useClickOutside(() => openDropdown(false));
 
@@ -32,15 +30,13 @@ export const SortPreference = () => {
   ];
 
   const handleChange = (item) => {
-    _setSortPref(item.id);
     dispatch(setSortPref(item.id));
-    setLabel(item.label);
     openDropdown(false);
   };
 
-  useEffect(() => {
-    setLabel(sortOptions.filter((x) => x.id === _sortPref)?.[0].label);
-  }, []);
+  function getSortOption(id) {
+    return sortOptions.filter((x) => x.id === id)?.[0];
+  }
 
   return (
     <div className="skt-w skt-w-flex skt-w-items-center skt-w-relative skt-w-z-30 skt-w-justify-between">
@@ -51,7 +47,7 @@ export const SortPreference = () => {
         ref={dropdownRef}
       >
         <Option onClick={() => openDropdown(!dropdown)} active>
-          {label}{" "}
+          {getSortOption(sortPref)?.label}{" "}
           <ChevronDown
             className={`skt-w skt-w-w-4 skt-w-h-4 skt-w-text-widget-secondary skt-w-transition-all ${
               dropdown ? "rotate-180" : ""
diff --git a/src/hooks/useCustomSettings.ts b/src/hooks/useCustomSettings.ts
index e43f1c7..1d9c977 100644
--- a/src/hooks/useCustomSettings.ts
+++ b/src/hooks/useCustomSettings.ts
@@ -1,5 +1,5 @@
 import { WidgetProps } from "../types";
-import { useEffect } from "react";
+import { useEffect, useRef } from "react";
 import { useDispatch } from "react-redux";
 import {
   setCustomDestNetworks,
@@ -14,9 +14,12 @@ import {
   setSingleTxOnly,
   setApiKey,
   setFeeParams,
-  setHideIntegratorFee
+  setHideIntegratorFee,
 } from "../state/customSettingsSlice";
-import { setSingleTxOnly as setSingleTxOnlyFromUser } from "../state/quotesSlice";
+import {
+  setSingleTxOnly as setSingleTxOnlyFromUser,
+  setSortPref,
+} from "../state/quotesSlice";
 import { formatRGB } from "../utils";
 
 // To set custom chains, tokens, default values passed as props
@@ -32,12 +35,14 @@ export const useCustomSettings = (props: WidgetProps) => {
     enableSameChainSwaps,
     includeBridges,
     excludeBridges,
+    defaultSortPreference,
     singleTxOnly,
     feeParams,
     API_KEY,
     hideIntegratorFee
   } = props;
   const dispatch = useDispatch();
+  const firstRender = useRef(true);
 
   useEffect(() => {
     sourceNetworks && dispatch(setCustomSourceNetworks(sourceNetworks));
@@ -54,9 +59,16 @@ export const useCustomSettings = (props: WidgetProps) => {
       dispatch(setExludeBridges(excludeBridges));
     dispatch(setSingleTxOnly(singleTxOnly));
 
+    // this code will run only on initial render
+    // this is done so that the default sort pref is not reset when network or account is updated
+    if (defaultSortPreference && firstRender.current) {
+      dispatch(setSortPref(defaultSortPreference));
+      firstRender.current = false;
+    }
+
     if (feeParams?.feePercent && feeParams?.feeTakerAddress) {
       dispatch(setFeeParams(feeParams));
-      hideIntegratorFee && dispatch(setHideIntegratorFee(hideIntegratorFee))
+      hideIntegratorFee && dispatch(setHideIntegratorFee(hideIntegratorFee));
     }
 
     // if singleTxOnly is set to true in the plugin config,
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index 0a5b2f7..dcabbd6 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -104,6 +104,9 @@ export interface WidgetProps {
   /** To exclude bridges - bridges passed will be excluded from the original supported list */
   excludeBridges?: supportedBridges[];
 
+  /** To set the default sort preference. Set to output by default */
+  defaultSortPreference?: 'time' | 'output';
+
   // Widget Handlers
   
   /** An integration function called when the route is completed successfully.

From bbf22561faa2fe1ac221815c030c531d9d2a5585 Mon Sep 17 00:00:00 2001
From: salil-naik <salil.naik27@gmail.com>
Date: Fri, 15 Sep 2023 05:32:55 +0530
Subject: [PATCH 2/5] feat: option to add initial source amount

---
 src/components/Input.tsx       | 13 ++++++++++++-
 src/hooks/useCustomSettings.ts | 17 +++++++++++------
 src/types/index.d.ts           |  3 +++
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/components/Input.tsx b/src/components/Input.tsx
index b9fec06..1b5dce7 100644
--- a/src/components/Input.tsx
+++ b/src/components/Input.tsx
@@ -1,6 +1,6 @@
 import { ethers } from "ethers";
 import { useDispatch, useSelector } from "react-redux";
-import { useContext, useEffect, useState } from "react";
+import { useContext, useEffect, useState, useRef } from "react";
 import { Currency, Network, onNetworkChange, onTokenChange } from "../types";
 import { NATIVE_TOKEN_ADDRESS } from "../consts";
 
@@ -304,6 +304,17 @@ export const Input = ({
     } else formateAndParseAmount(balance);
   }
 
+  // to set the initialAmount if any. To be executed only on first render
+  const firstRender = useRef(true);
+  useEffect(() => {
+    if(inputAmountFromReduxState && sourceToken && firstRender.current) {
+      const truncatedValue = truncateDecimalValue(inputAmountFromReduxState, sourceToken?.decimals);
+      onChangeInput(truncatedValue);
+
+      firstRender.current = false;
+    }
+  }, [inputAmountFromReduxState, sourceToken])
+
   // Reset source amount on mount
   useEffect(() => {
     inputAmountFromReduxState && dispatch(setSourceAmount(null));
diff --git a/src/hooks/useCustomSettings.ts b/src/hooks/useCustomSettings.ts
index 1d9c977..7032687 100644
--- a/src/hooks/useCustomSettings.ts
+++ b/src/hooks/useCustomSettings.ts
@@ -21,6 +21,7 @@ import {
   setSortPref,
 } from "../state/quotesSlice";
 import { formatRGB } from "../utils";
+import { setSourceAmount } from "../state/amountSlice";
 
 // To set custom chains, tokens, default values passed as props
 export const useCustomSettings = (props: WidgetProps) => {
@@ -39,7 +40,8 @@ export const useCustomSettings = (props: WidgetProps) => {
     singleTxOnly,
     feeParams,
     API_KEY,
-    hideIntegratorFee
+    hideIntegratorFee,
+    initialAmount
   } = props;
   const dispatch = useDispatch();
   const firstRender = useRef(true);
@@ -58,12 +60,15 @@ export const useCustomSettings = (props: WidgetProps) => {
       excludeBridges?.length > 0 &&
       dispatch(setExludeBridges(excludeBridges));
     dispatch(setSingleTxOnly(singleTxOnly));
+    
+    // This code is executed only on first render
+    // This is done so that the values are not updated or reset to default value
+    // due to network or account updates
+    if(firstRender.current){
+      defaultSortPreference && dispatch(setSortPref(defaultSortPreference));
+      initialAmount && dispatch(setSourceAmount(initialAmount))
 
-    // this code will run only on initial render
-    // this is done so that the default sort pref is not reset when network or account is updated
-    if (defaultSortPreference && firstRender.current) {
-      dispatch(setSortPref(defaultSortPreference));
-      firstRender.current = false;
+      firstRender.current = false
     }
 
     if (feeParams?.feePercent && feeParams?.feeTakerAddress) {
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index dcabbd6..213986e 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -107,6 +107,9 @@ export interface WidgetProps {
   /** To set the default sort preference. Set to output by default */
   defaultSortPreference?: 'time' | 'output';
 
+  /** To set the default amount. To set it on initial render */
+  initialAmount?: string;
+
   // Widget Handlers
   
   /** An integration function called when the route is completed successfully.

From d2c231c57d2f6b0918f962eb1465f62768f7867f Mon Sep 17 00:00:00 2001
From: salil-naik <salil.naik27@gmail.com>
Date: Fri, 15 Sep 2023 05:37:28 +0530
Subject: [PATCH 3/5] chores: updated the supportedBridges type definition to
 include more bridges

---
 src/types/index.d.ts | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index 213986e..613b7c6 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -1,16 +1,24 @@
 import { ReactNode } from "react";
 import { ChainId, UserTxType } from "@socket.tech/socket-v2-sdk";
 type supportedBridges =
-  | "polygon-bridge"
   | "hop"
+  | "anyswap"
   | "anyswap-router-v4"
-  | "hyphen"
+  | "anyswap-router-v6"
+  | "polygon-bridge"
   | "arbitrum-bridge"
-  | "connext"
-  | "celer"
+  | "hyphen"
   | "across"
   | "optimism-bridge"
-  | "refuel-bridge";
+  | "celer"
+  | "refuel-bridge"
+  | "stargate"
+  | "connext"
+  | "cctp"
+  | "synapse"
+  | "base-bridge"
+  | "zora-bridge"
+  | "zksync-native";
 
 interface txData {
   hash: string;
@@ -48,24 +56,24 @@ export interface WidgetProps {
   /** Custom Destination Networks */
   destNetworks?: number[];
 
-  /** 
+  /**
    * To override Default Source Network
-   * 
+   *
    * Default source network is Polygon
    */
   defaultSourceNetwork?: number;
 
   /**
    * To override Default Destination Network
-   * 
+   *
    * Default destination network is Ethereum
    */
   defaultDestNetwork?: number;
 
   /**
    * Token List.
-   * 
-   * You can pass the url to the token list or pass the list as JSON, as long as it matches the schema. 
+   *
+   * You can pass the url to the token list or pass the list as JSON, as long as it matches the schema.
    * Token list schema - https://uniswap.org/tokenlist.schema.json
    */
   tokenList?: string | Currency[];
@@ -73,20 +81,20 @@ export interface WidgetProps {
   /**
    * To override default source token.
    * Default token is USDC with Native token as a fallback.
-   * 
+   *
    * Pass the string "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" for native token
    */
   defaultSourceToken?: string;
 
-   /**
+  /**
    * To override default destination token.
    * Default token is USDC with Native token as a fallback.
-   * 
+   *
    * Pass the string "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" for native token
    */
   defaultDestToken?: string;
 
-  /** To enable only single tx quotes */ 
+  /** To enable only single tx quotes */
   singleTxOnly?: boolean;
 
   /** Refuel feature allows the users to transfer gas tokens across the chains */
@@ -105,13 +113,13 @@ export interface WidgetProps {
   excludeBridges?: supportedBridges[];
 
   /** To set the default sort preference. Set to output by default */
-  defaultSortPreference?: 'time' | 'output';
+  defaultSortPreference?: "time" | "output";
 
   /** To set the default amount. To set it on initial render */
   initialAmount?: string;
 
   // Widget Handlers
-  
+
   /** An integration function called when the route is completed successfully.
    * @param {transactionDetails} data
    */
@@ -146,7 +154,7 @@ export interface WidgetProps {
 
   /**
    * An intergration function called when the transaction (including same chain swap) is submitted.
-   * 
+   *
    * This excludes the source and/or destination swap transactions in case of cross-chain swaps and only the bridging transaction will be considered
    * @param {transactionDetails} data
    */

From 7264c03638c4f2314ec64c42c31cfa90b78c1682 Mon Sep 17 00:00:00 2001
From: salil-naik <salil.naik27@gmail.com>
Date: Fri, 15 Sep 2023 06:11:23 +0530
Subject: [PATCH 4/5] fix: input amount setting with inital amount

---
 src/components/Input.tsx         | 19 +++++++++++--------
 src/hooks/useCustomSettings.ts   |  4 ++--
 src/state/customSettingsSlice.ts |  7 ++++++-
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/components/Input.tsx b/src/components/Input.tsx
index 1b5dce7..e54c8b4 100644
--- a/src/components/Input.tsx
+++ b/src/components/Input.tsx
@@ -96,6 +96,7 @@ export const Input = ({
   const sameChainSwapsEnabled = useSelector(
     (state: any) => state.customSettings.sameChainSwapsEnabled
   );
+  const initialAmount = useSelector((state:any)=> state.customSettings.initialAmount);
 
   function updateNetwork(network: Network) {
     dispatch(setSourceChain(network?.chainId));
@@ -307,23 +308,25 @@ export const Input = ({
   // to set the initialAmount if any. To be executed only on first render
   const firstRender = useRef(true);
   useEffect(() => {
-    if(inputAmountFromReduxState && sourceToken && firstRender.current) {
-      const truncatedValue = truncateDecimalValue(inputAmountFromReduxState, sourceToken?.decimals);
+    if (initialAmount && sourceToken && firstRender.current) {
+      const truncatedValue = truncateDecimalValue(
+        initialAmount,
+        sourceToken?.decimals
+      );
       onChangeInput(truncatedValue);
-
       firstRender.current = false;
+    } else if (!firstRender.current) {
+      // Reset source amount on mount
+      inputAmountFromReduxState && dispatch(setSourceAmount(null));
     }
-  }, [inputAmountFromReduxState, sourceToken])
+  }, [initialAmount, sourceToken]);
 
-  // Reset source amount on mount
   useEffect(() => {
-    inputAmountFromReduxState && dispatch(setSourceAmount(null));
-
     // resetting the source chain on unmount
     // on toggle, the source chain state would retain causing issues in setting token on the first render
     return () => {
       dispatch(setSourceChain(null));
-    }
+    };
   }, []);
 
   return (
diff --git a/src/hooks/useCustomSettings.ts b/src/hooks/useCustomSettings.ts
index 7032687..52a00a3 100644
--- a/src/hooks/useCustomSettings.ts
+++ b/src/hooks/useCustomSettings.ts
@@ -15,13 +15,13 @@ import {
   setApiKey,
   setFeeParams,
   setHideIntegratorFee,
+  setInitialAmount,
 } from "../state/customSettingsSlice";
 import {
   setSingleTxOnly as setSingleTxOnlyFromUser,
   setSortPref,
 } from "../state/quotesSlice";
 import { formatRGB } from "../utils";
-import { setSourceAmount } from "../state/amountSlice";
 
 // To set custom chains, tokens, default values passed as props
 export const useCustomSettings = (props: WidgetProps) => {
@@ -66,7 +66,7 @@ export const useCustomSettings = (props: WidgetProps) => {
     // due to network or account updates
     if(firstRender.current){
       defaultSortPreference && dispatch(setSortPref(defaultSortPreference));
-      initialAmount && dispatch(setSourceAmount(initialAmount))
+      initialAmount && dispatch(setInitialAmount(initialAmount))
 
       firstRender.current = false
     }
diff --git a/src/state/customSettingsSlice.ts b/src/state/customSettingsSlice.ts
index fd3c775..e16e5d4 100644
--- a/src/state/customSettingsSlice.ts
+++ b/src/state/customSettingsSlice.ts
@@ -16,6 +16,7 @@ const initialState = {
   apiKey: null,
   feeParams: null,
   hideIntegratorFee: false,
+  initialAmount: null,
 };
 
 const customSettingsSlice = createSlice({
@@ -66,6 +67,9 @@ const customSettingsSlice = createSlice({
     },
     setHideIntegratorFee: (state, action) => {
       state.hideIntegratorFee = action.payload
+    },
+    setInitialAmount: (state, action) => {
+      state.initialAmount = action.payload
     }
   },
 });
@@ -86,7 +90,8 @@ export const {
   setSingleTxOnly,
   setApiKey,
   setFeeParams,
-  setHideIntegratorFee
+  setHideIntegratorFee,
+  setInitialAmount
 } = customSettingsSlice.actions;
 
 // Note - Custom token list is not set here. Check out hooks/useTokenLists.ts

From 093f5025c4e756a5bb9b1608dd2a37e4a0773c29 Mon Sep 17 00:00:00 2001
From: salil-naik <salil.naik27@gmail.com>
Date: Fri, 15 Sep 2023 06:23:14 +0530
Subject: [PATCH 5/5] v1.3.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 189277c..318fb65 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@socket.tech/plugin",
-  "version": "1.2.6",
+  "version": "1.3.0",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
   "types": "dist/index.d.ts",