use config correctly

astriaorg · Sep 30, 2024 · 932f362 · 932f362
1 parent 7dc566f
commit 932f362
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/web/src/components/DepositCard/DepositCard.tsx b/web/src/components/DepositCard/DepositCard.tsx
@@ -15,7 +15,7 @@ import { useConfig } from "config/hooks/useConfig";
 export default function DepositCard(): React.ReactElement {
   const { addNotification } = useContext(NotificationsContext);
   const { userAccount } = useEthWallet();
-  const { ibcChains } = useConfig();
+  const { ibcChains, sequencerBridgeAccount } = useConfig();
 
   const {
     selectIbcChain,
@@ -106,6 +106,7 @@ export default function DepositCard(): React.ReactElement {
         recipientAddress,
         DecUtils.getTenExponentN(6).mul(new Dec(amount)).truncate().toString(),
         selectedIbcCurrency,
+        sequencerBridgeAccount,
       );
     } catch (e) {
       if (e instanceof Error) {

diff --git a/web/src/components/WithdrawCard/WithdrawCard.tsx b/web/src/components/WithdrawCard/WithdrawCard.tsx
@@ -17,7 +17,7 @@ import { useConfig } from "config/hooks/useConfig";
 export default function WithdrawCard(): React.ReactElement {
   const { addNotification } = useContext(NotificationsContext);
   const { userAccount, selectedWallet } = useEthWallet();
-  const { ibcChains, sequencerBridgeAccount } = useConfig();
+  const { ibcChains, sequencerBridgeAccount, evmWithdrawerContractAddress } = useConfig();
 
   const {
     selectIbcChain,
@@ -46,6 +46,7 @@ export default function WithdrawCard(): React.ReactElement {
   const [isAnimating, setIsAnimating] = useState<boolean>(false);
 
   useEffect(() => {
+    console.log(userAccount);
     if (userAccount?.address) {
       setFromAddress(userAccount.address);
     }
@@ -165,7 +166,7 @@ export default function WithdrawCard(): React.ReactElement {
     try {
       const withdrawerSvc = getAstriaWithdrawerService(
         selectedWallet.provider,
-        sequencerBridgeAccount,
+        evmWithdrawerContractAddress,
       );
       await withdrawerSvc.withdrawToIbcChain(
         fromAddress,

diff --git a/web/src/config/contexts/ConfigContext.tsx b/web/src/config/contexts/ConfigContext.tsx
@@ -24,9 +24,12 @@ export const ConfigContextProvider: React.FC<ConfigContextProps> = ({
   const sequencerBridgeAccount = getEnvVariable(
     "REACT_APP_SEQUENCER_BRIDGE_ACCOUNT",
   );
+  const evmWithdrawerContractAddress = getEnvVariable(
+    "REACT_APP_EVM_WITHDRAWER_CONTRACT_ADDRESS",
+  );
 
   return (
-    <ConfigContext.Provider value={{ ibcChains, sequencerBridgeAccount }}>
+    <ConfigContext.Provider value={{ evmWithdrawerContractAddress, ibcChains, sequencerBridgeAccount }}>
       {children}
     </ConfigContext.Provider>
   );

diff --git a/web/src/config/index.ts b/web/src/config/index.ts
@@ -9,4 +9,5 @@ import type { IbcChains } from "./chainConfigs";
 export type AppConfig = {
   ibcChains: IbcChains;
   sequencerBridgeAccount: string;
+  evmWithdrawerContractAddress: string;
 };
diff --git a/web/src/services/ibc.ts b/web/src/services/ibc.ts
@@ -12,13 +12,15 @@ import { getEnvVariable } from "config/env";
  * @param recipient
  * @param amount
  * @param currency
+ * @param sequencerBridgeAccount
  */
 export const sendIbcTransfer = async (
   selectedIbcChain: IbcChainInfo,
   sender: string,
   recipient: string,
   amount: string,
   currency: IbcCurrency,
+  sequencerBridgeAccount: string,
 ) => {
   const keplr = window.keplr;
   if (!keplr) {
@@ -37,9 +39,7 @@ export const sendIbcTransfer = async (
   if (!account) {
     throw new Error("Failed to get account from Keplr wallet.");
   }
-  const sequencer_bridge_account = getEnvVariable(
-    "REACT_APP_SEQUENCER_BRIDGE_ACCOUNT",
-  );
+
   // TODO - does this need to be configurable in the ui?
   const feeDenom = selectedIbcChain.feeCurrencies[0].coinMinimalDenom;
   const memo = JSON.stringify({ rollupDepositAddress: recipient });
@@ -64,7 +64,7 @@ export const sendIbcTransfer = async (
       },
       sender: sender,
       memo: memo,
-      receiver: sequencer_bridge_account,
+      receiver: sequencerBridgeAccount,
       // Timeout is in nanoseconds. Use Long.UZERO for default timeout
       timeoutTimestamp: Long.fromNumber(Date.now() + 600_000).multiply(
         1_000_000,

diff --git a/web/src/styles/dropdown-customizations.scss b/web/src/styles/dropdown-customizations.scss
@@ -9,15 +9,18 @@
 
   .dropdown-trigger {
     width: 100%;
-
     .button {
       width: 100%;
-      min-width: 0;
       display: flex;
       align-items: center;
+      justify-content: space-between;
       background-color: transparent;
       color: $dropdown-item-color;
 
+      .dropdown-label {
+        //
+      }
+
       span {
         color: $dropdown-placeholder-color;
 
@@ -27,12 +30,10 @@
 
         &.icon-left {
           height: 20px;
-          flex-shrink: 0;
         }
 
         &.icon-right {
           margin-left: auto;
-          flex-shrink: 0;
         }
       }
     }