Merge pull request #28 from bnb-chain/fix/meson

Fix/meson
bnb-chain · Oct 21, 2024 · 4d549b0 · 4d549b0
2 parents 03c7a9d + 2b888d5
commit 4d549b0
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 10 deletions.
diff --git a/...onical-bridge-widget/src/modules/aggregator/adapters/cBridge/components/CBridgeOption.tsx b/...onical-bridge-widget/src/modules/aggregator/adapters/cBridge/components/CBridgeOption.tsx
@@ -97,7 +97,6 @@ export const CBridgeOption = () => {
       />
       <AllowedSendAmount
         position={'static'}
-        zIndex={2}
         isError={isAllowSendError}
         allowedSendAmount={
           !!Number(cBridgeAllowedAmt.min) && !!Number(cBridgeAllowedAmt.max) && selectedToken

diff --git a/.../canonical-bridge-widget/src/modules/aggregator/adapters/meson/components/MesonOption.tsx b/.../canonical-bridge-widget/src/modules/aggregator/adapters/meson/components/MesonOption.tsx
@@ -64,7 +64,6 @@ export const MesonOption = () => {
       {/* <AllowedSendAmount
         position={'static'}
         isError={isAllowSendError}
-        zIndex={2}
         allowedSendAmount={allowedSendAmount}
       /> */}
       <OtherRouteError bridgeType={'meson'} />

diff --git a/...ical-bridge-widget/src/modules/aggregator/adapters/stargate/components/StarGateOption.tsx b/...ical-bridge-widget/src/modules/aggregator/adapters/stargate/components/StarGateOption.tsx
@@ -88,7 +88,6 @@ export const StarGateOption = () => {
       <AllowedSendAmount
         position={'static'}
         isError={isAllowSendError}
-        zIndex={2}
         allowedSendAmount={allowedSendAmount}
       />
       {!isAllowSendError && <OtherRouteError bridgeType={'stargate'} />}

diff --git a/packages/canonical-bridge-widget/src/modules/transfer/components/ToAccount/index.tsx b/packages/canonical-bridge-widget/src/modules/transfer/components/ToAccount/index.tsx
@@ -63,7 +63,7 @@ export function ToAccount(props: FlexProps) {
     return null;
   }
 
-  const isInvalid = (!isAvailableAccount && !!toAccount.address) || isTronContract === false;
+  const isInvalid = (!isAvailableAccount && !!toAccount.address) || isTronContract === true;
 
   const onCheckboxChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     if (e.target.checked === true) {

diff --git a/...dge-widget/src/modules/transfer/components/TransferOverview/RouteInfo/OtherRouteError.tsx b/...dge-widget/src/modules/transfer/components/TransferOverview/RouteInfo/OtherRouteError.tsx
@@ -14,12 +14,7 @@ export const OtherRouteError = ({ bridgeType }: OtherRouteErrorProps) => {
 
   const routeError = useAppSelector((state) => state.transfer.routeError);
   return routeError && routeError[bridgeType] ? (
-    <Box
-      position={'static'}
-      zIndex={2}
-      color={theme.colors[colorMode].route.warning}
-      lineHeight={'16px'}
-    >
+    <Box position={'static'} color={theme.colors[colorMode].route.warning} lineHeight={'16px'}>
       <InfoCircleIcon display={'inline'} w={'16px'} h={'16px'} />
       <Box ml={'4px'} display={'inline'} lineHeight={'16px'} fontSize={'14px'} fontWeight={400}>
         {routeError[bridgeType]}