Remove VITE_FEATURE_FLAG_PAYMASTER flag

Author: lubej

.env

@@ -2,4 +2,3 @@ VITE_WALLET_CONNECT_PROJECT_ID=e3727c2e231abb0791d9cc90b55fb1e1
 # VITE_ROFL_APP_BACKEND=http://localhost:8899
 VITE_ROFL_APP_BACKEND=https://backend.rofl.app
 VITE_FATHOM_SIDE_ID=ADZXERYI
-VITE_FEATURE_FLAG_PAYMASTER=1

.env.production

@@ -1,2 +1 @@
 VITE_ROFL_APP_BACKEND=https://backend.rofl.app 
-VITE_FEATURE_FLAG_PAYMASTER=1

src/components/rofl-paymaster/TopUp/index.tsx

@@ -36,8 +36,6 @@ import { TransactionSummary } from '../TransactionSummary'
 import { usePaymaster } from '../../../hooks/usePaymaster'
 import { ChainLogo } from '../TokenLogo/ChainLogo'
 
-const { VITE_FEATURE_FLAG_PAYMASTER } = import.meta.env
-
 const bridgeFormSchema = z.object({
   sourceChain: z
     .object({
@@ -612,7 +610,7 @@ const TopUpCmp: FC<TopUpProps> = ({ children, minAmount, onValidChange, onTopUpS
 export const TopUp: FC<TopUpProps> = props => {
   const network = useNetwork()
 
-  if (network === 'testnet' && !VITE_FEATURE_FLAG_PAYMASTER) {
+  if (network === 'testnet') {
     return <FaucetInfo />
   }
 

src/constants/wagmi-config.ts

@@ -2,7 +2,7 @@ import { getDefaultConfig } from '@rainbow-me/rainbowkit'
 import { sapphire, sapphireTestnet } from 'viem/chains'
 import { ROFL_PAYMASTER_ENABLED_CHAINS } from './rofl-paymaster-config.ts'
 
-const { VITE_WALLET_CONNECT_PROJECT_ID, VITE_FEATURE_FLAG_PAYMASTER } = import.meta.env
+const { VITE_WALLET_CONNECT_PROJECT_ID } = import.meta.env
 
 declare module 'wagmi' {
   interface Register {
@@ -13,7 +13,7 @@ declare module 'wagmi' {
 export const wagmiConfig: ReturnType<typeof getDefaultConfig> = getDefaultConfig({
   appName: 'ROFL App',
   projectId: VITE_WALLET_CONNECT_PROJECT_ID,
-  chains: [sapphire, sapphireTestnet, ...(VITE_FEATURE_FLAG_PAYMASTER ? ROFL_PAYMASTER_ENABLED_CHAINS : [])],
+  chains: [sapphire, sapphireTestnet, ...ROFL_PAYMASTER_ENABLED_CHAINS],
   ssr: false,
   batch: {
     multicall: false,

src/pages/CreateApp/PaymentStep.tsx

@@ -15,8 +15,6 @@ import { sapphire, sapphireTestnet } from 'viem/chains'
 import { useTicker } from '../../hooks/useTicker'
 import { useBlockNavigatingAway } from './useBlockNavigatingAway.ts'
 
-const { VITE_FEATURE_FLAG_PAYMASTER } = import.meta.env
-
 type PaymentStepProps = {
   handleNext: () => void
   handleBack: () => void
@@ -142,14 +140,14 @@ export const PaymentStep: FC<PaymentStepProps> = ({
         </TopUp>
       )}
 
-      {isTestnetBlocked && !VITE_FEATURE_FLAG_PAYMASTER && (
+      {isTestnetBlocked && (
         <div className="text-sm text-destructive mt-4 text-pretty">
           Functionality is currently blocked on the Oasis Sapphire Testnet. To build and deploy your
           application, please switch to Mainnet.
         </div>
       )}
 
-      {(hasEnoughBalance || (isTestnet && !VITE_FEATURE_FLAG_PAYMASTER)) && (
+      {hasEnoughBalance && (
         <form onSubmit={handleNext} className="w-full">
           <CreateFormNavigation
             handleBack={() => {

src/vite-env.d.ts

@@ -9,7 +9,6 @@ interface ImportMetaEnv {
   VITE_WALLET_CONNECT_PROJECT_ID: string
   VITE_ROFL_APP_BACKEND: string
   VITE_FATHOM_SIDE_ID: string
-  VITE_FEATURE_FLAG_PAYMASTER: string
 }
 
 interface ImportMeta {