From 372b1a67de71941f1deca46c0459cef2a32c536b Mon Sep 17 00:00:00 2001 From: Leandro Date: Fri, 3 Nov 2023 08:09:23 -0700 Subject: [PATCH] feat(permit): remove permit related feature flags (#3320) * feat(permit): remove permit related feature flags * refactor: remove unecessary variable --- .../hooks/featureFlags/useIsPermitEnabled.ts | 23 ++----------------- .../permit/hooks/useIsTokenPermittable.ts | 2 +- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/apps/cowswap-frontend/src/common/hooks/featureFlags/useIsPermitEnabled.ts b/apps/cowswap-frontend/src/common/hooks/featureFlags/useIsPermitEnabled.ts index 04e42129b7..6f3280b551 100644 --- a/apps/cowswap-frontend/src/common/hooks/featureFlags/useIsPermitEnabled.ts +++ b/apps/cowswap-frontend/src/common/hooks/featureFlags/useIsPermitEnabled.ts @@ -1,25 +1,6 @@ -import { SupportedChainId } from '@cowprotocol/cow-sdk' import { useIsSmartContractWallet } from '@cowprotocol/wallet' -import { useFeatureFlags } from './useFeatureFlags' - -export function useIsPermitEnabled(chainId: SupportedChainId | undefined): boolean { - const isSmartContractWallet = useIsSmartContractWallet() - const { permitEnabledMainnet, permitEnabledGoerli, permitEnabledGnosis } = useFeatureFlags() - +export function useIsPermitEnabled(): boolean { // Permit is only available for EOAs - if (isSmartContractWallet) { - return false - } - - switch (chainId) { - case SupportedChainId.MAINNET: - return !!permitEnabledMainnet - case SupportedChainId.GNOSIS_CHAIN: - return !!permitEnabledGnosis - case SupportedChainId.GOERLI: - return !!permitEnabledGoerli - default: - return false - } + return !useIsSmartContractWallet() } diff --git a/apps/cowswap-frontend/src/modules/permit/hooks/useIsTokenPermittable.ts b/apps/cowswap-frontend/src/modules/permit/hooks/useIsTokenPermittable.ts index 834fc2af47..4fa95b0946 100644 --- a/apps/cowswap-frontend/src/modules/permit/hooks/useIsTokenPermittable.ts +++ b/apps/cowswap-frontend/src/modules/permit/hooks/useIsTokenPermittable.ts @@ -43,7 +43,7 @@ export function useIsTokenPermittable( // Avoid building permit info in the first place if order type is not supported const isPermitSupported = !!tradeType && ORDER_TYPE_SUPPORTS_PERMIT[tradeType] - const isPermitEnabled = useIsPermitEnabled(chainId) && isPermitSupported + const isPermitEnabled = useIsPermitEnabled() && isPermitSupported const addPermitInfo = useAddPermitInfo() const permitInfo = usePermitInfo(chainId, isPermitEnabled ? lowerCaseAddress : undefined)