diff --git a/.env b/.env
index 853666f44c..c53893e9cb 100644
--- a/.env
+++ b/.env
@@ -56,4 +56,4 @@ VITE_APP_SITE_URL="https://app.dev.decentdao.org"
 VITE_APP_WALLET_CONNECT_PROJECT_ID=""
 
 # FEATURE FLAGS (Must equal "ON")
-VITE_APP_FLAG_STREAMS=""
+VITE_APP_FLAG_DEVELOPMENT_MODE=""
diff --git a/package-lock.json b/package-lock.json
index 024276595c..7d72498b8e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "decent-interface",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "decent-interface",
-      "version": "0.3.5",
+      "version": "0.3.6",
       "hasInstallScript": true,
       "dependencies": {
         "@amplitude/analytics-browser": "^2.11.1",
diff --git a/package.json b/package.json
index fb4b9ff7e0..a45dedf1ca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "decent-interface",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "private": true,
   "dependencies": {
     "@amplitude/analytics-browser": "^2.11.1",
diff --git a/src/components/DaoCreator/formComponents/GuardDetails.tsx b/src/components/DaoCreator/formComponents/GuardDetails.tsx
index 03eabbbced..14432540d2 100644
--- a/src/components/DaoCreator/formComponents/GuardDetails.tsx
+++ b/src/components/DaoCreator/formComponents/GuardDetails.tsx
@@ -161,7 +161,7 @@ function GuardDetails(props: ICreationStepProps) {
                 <BigIntInput
                   isInvalid={!!errors?.freeze?.freezeVotesThreshold?.bigintValue}
                   value={field.value?.bigintValue}
-                  currentValue={values.freeze.freezeVotesThreshold}
+                  parentFormikValue={values.freeze.freezeVotesThreshold}
                   onChange={valuePair => {
                     setFieldValue('freeze.freezeVotesThreshold', valuePair);
                   }}
diff --git a/src/components/pages/Roles/RoleCard.tsx b/src/components/pages/Roles/RoleCard.tsx
index 1cb9fb5dd8..88c52ed552 100644
--- a/src/components/pages/Roles/RoleCard.tsx
+++ b/src/components/pages/Roles/RoleCard.tsx
@@ -3,7 +3,6 @@ import { CaretCircleRight, CaretRight } from '@phosphor-icons/react';
 import { formatDuration, intervalToDuration } from 'date-fns';
 import { useTranslation } from 'react-i18next';
 import { getAddress, zeroAddress } from 'viem';
-import { isFeatureEnabled } from '../../../constants/common';
 import { useGetDAOName } from '../../../hooks/DAO/useGetDAOName';
 import useAvatar from '../../../hooks/utils/useAvatar';
 import { useNetworkConfig } from '../../../providers/NetworkConfig/NetworkConfigProvider';
@@ -62,7 +61,7 @@ export function AvatarAndRoleName({
         >
           {wearerAddress ? accountDisplayName : t('unassigned')}
         </Text>
-        {isFeatureEnabled('STREAMS') && paymentsCount !== undefined && (
+        {paymentsCount !== undefined && (
           <Flex
             mt="1rem"
             gap="0.25rem"
@@ -234,8 +233,7 @@ export function RoleCardEdit({
           />
         </Flex>
       </Flex>
-      {isFeatureEnabled('STREAMS') &&
-        payments &&
+      {payments &&
         payments.map((payment, index) => (
           <Payment
             key={index}
diff --git a/src/components/pages/Roles/RolesDetailsDrawer.tsx b/src/components/pages/Roles/RolesDetailsDrawer.tsx
index fc32b74736..9802214f06 100644
--- a/src/components/pages/Roles/RolesDetailsDrawer.tsx
+++ b/src/components/pages/Roles/RolesDetailsDrawer.tsx
@@ -14,7 +14,7 @@ import { List, PencilLine, User, X } from '@phosphor-icons/react';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Hex, getAddress } from 'viem';
-import { BACKGROUND_SEMI_TRANSPARENT, isFeatureEnabled } from '../../../constants/common';
+import { BACKGROUND_SEMI_TRANSPARENT } from '../../../constants/common';
 import { useGetDAOName } from '../../../hooks/DAO/useGetDAOName';
 import useAvatar from '../../../hooks/utils/useAvatar';
 import { useFractal } from '../../../providers/App/AppProvider';
@@ -178,7 +178,7 @@ export default function RolesDetailsDrawer({
               </Text>
             </GridItem>
           </Grid>
-          {isFeatureEnabled('STREAMS') && roleHat.payments && (
+          {roleHat.payments && (
             <>
               <Divider
                 variant="darker"
diff --git a/src/components/pages/Roles/RolesDetailsDrawerMobile.tsx b/src/components/pages/Roles/RolesDetailsDrawerMobile.tsx
index d9e3c95d42..9b2a0354ac 100644
--- a/src/components/pages/Roles/RolesDetailsDrawerMobile.tsx
+++ b/src/components/pages/Roles/RolesDetailsDrawerMobile.tsx
@@ -3,7 +3,6 @@ import { PencilLine } from '@phosphor-icons/react';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { getAddress, Hex } from 'viem';
-import { isFeatureEnabled } from '../../../constants/common';
 import { useFractal } from '../../../providers/App/AppProvider';
 import {
   paymentSorterByActiveStatus,
@@ -103,7 +102,7 @@ export default function RolesDetailsDrawerMobile({
         px="1rem"
         mb="1.5rem"
       >
-        {isFeatureEnabled('STREAMS') && roleHat.payments && (
+        {roleHat.payments && (
           <>
             <Divider
               variant="darker"
diff --git a/src/components/pages/Roles/RolesTable.tsx b/src/components/pages/Roles/RolesTable.tsx
index b3f5aeecf4..6ef718673c 100644
--- a/src/components/pages/Roles/RolesTable.tsx
+++ b/src/components/pages/Roles/RolesTable.tsx
@@ -3,7 +3,6 @@ import { PencilLine } from '@phosphor-icons/react';
 import { useFormikContext } from 'formik';
 import { useTranslation } from 'react-i18next';
 import { Address, Hex, zeroAddress } from 'viem';
-import { isFeatureEnabled } from '../../../constants/common';
 import useAddress from '../../../hooks/utils/useAddress';
 import useAvatar from '../../../hooks/utils/useAvatar';
 import useDisplayName from '../../../hooks/utils/useDisplayName';
@@ -39,15 +38,13 @@ function RolesHeader() {
           {t('role')}
         </Th>
         <Th width="60%">{t('member')}</Th>
-        {isFeatureEnabled('STREAMS') && (
-          <Th
-            width="15%"
-            minWidth="140px"
-            textAlign="center"
-          >
-            {t('activePayments')}
-          </Th>
-        )}
+        <Th
+          width="15%"
+          minWidth="140px"
+          textAlign="center"
+        >
+          {t('activePayments')}
+        </Th>
       </Tr>
     </Thead>
   );
@@ -195,7 +192,7 @@ export function RolesRow({
         {name}
       </Td>
       <MemberColumn wearerAddress={wearerAddress} />
-      {isFeatureEnabled('STREAMS') && <PaymentsColumn paymentsCount={paymentsCount} />}
+      <PaymentsColumn paymentsCount={paymentsCount} />
     </Tr>
   );
 }
@@ -227,11 +224,7 @@ export function RolesRowEdit({
         editStatus={editStatus}
       />
       <MemberColumn wearerAddress={wearerAddress} />
-      {isFeatureEnabled('STREAMS') && (
-        <PaymentsColumn
-          paymentsCount={payments?.filter(p => p.isStreaming()).length || undefined}
-        />
-      )}
+      <PaymentsColumn paymentsCount={payments?.filter(p => p.isStreaming()).length || undefined} />
     </Tr>
   );
 }
diff --git a/src/components/pages/Roles/forms/RoleFormAssetSelector.tsx b/src/components/pages/Roles/forms/RoleFormAssetSelector.tsx
index 5c9e262922..6d5663ab45 100644
--- a/src/components/pages/Roles/forms/RoleFormAssetSelector.tsx
+++ b/src/components/pages/Roles/forms/RoleFormAssetSelector.tsx
@@ -304,6 +304,7 @@ export function AssetSelector({ formIndex, disabled }: { formIndex: number; disa
                 <BigIntInput
                   isDisabled={inputDisabled}
                   value={field.value?.bigintValue}
+                  parentFormikValue={values?.roleEditing?.payments?.[formIndex]?.amount}
                   onChange={valuePair => {
                     setFieldValue(field.name, valuePair, true);
                   }}
diff --git a/src/components/pages/Roles/forms/RoleFormPaymentStream.tsx b/src/components/pages/Roles/forms/RoleFormPaymentStream.tsx
index cb1b5c85eb..2dedd91b98 100644
--- a/src/components/pages/Roles/forms/RoleFormPaymentStream.tsx
+++ b/src/components/pages/Roles/forms/RoleFormPaymentStream.tsx
@@ -1,11 +1,12 @@
 import { Alert, Box, Button, Flex, FormControl, Icon, Show, Text } from '@chakra-ui/react';
 import { ArrowRight, Info, Trash } from '@phosphor-icons/react';
-import { addDays } from 'date-fns';
+import { addDays, addMinutes } from 'date-fns';
 import { FormikErrors, useFormikContext } from 'formik';
 import { useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { CARD_SHADOW } from '../../../../constants/common';
+import { CARD_SHADOW, isDevMode } from '../../../../constants/common';
 import { useRolesStore } from '../../../../store/roles';
+import { BigIntValuePair } from '../../../../types';
 import { ModalType } from '../../../ui/modals/ModalProvider';
 import { useDecentModal } from '../../../ui/modals/useDecentModal';
 import { DecentDatePicker } from '../../../ui/utils/DecentDatePicker';
@@ -201,6 +202,25 @@ export default function RoleFormPaymentStream({ formIndex }: { formIndex: number
                 {t('save')}
               </Button>
             )}
+            {isDevMode() && (
+              <Button
+                onClick={() => {
+                  const nowDate = new Date();
+                  setFieldValue(`roleEditing.payments[${formIndex}]`, {
+                    ...payment,
+                    amount: {
+                      value: '100',
+                      bigintValue: 100000000000000000000n,
+                    } as BigIntValuePair,
+                    decimals: 18,
+                    startDate: addMinutes(nowDate, 1),
+                    endDate: addMinutes(nowDate, 10),
+                  });
+                }}
+              >
+                Ze stream ends in 10!
+              </Button>
+            )}
             {canBeCancelled && (
               <Show above="md">
                 <Button
diff --git a/src/components/pages/Roles/forms/RoleFormTabs.tsx b/src/components/pages/Roles/forms/RoleFormTabs.tsx
index ce961553e3..6a47828b19 100644
--- a/src/components/pages/Roles/forms/RoleFormTabs.tsx
+++ b/src/components/pages/Roles/forms/RoleFormTabs.tsx
@@ -4,7 +4,6 @@ import { useEffect, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Blocker, useNavigate } from 'react-router-dom';
 import { Hex } from 'viem';
-import { isFeatureEnabled } from '../../../../constants/common';
 import { DAO_ROUTES } from '../../../../constants/routes';
 import { useFractal } from '../../../../providers/App/AppProvider';
 import { useNetworkConfig } from '../../../../providers/NetworkConfig/NetworkConfigProvider';
@@ -67,17 +66,15 @@ export default function RoleFormTabs({
       <Tabs variant="twoTone">
         <TabList>
           <Tab>{t('roleInfo')}</Tab>
-          {isFeatureEnabled('STREAMS') && <Tab>{t('payments')}</Tab>}
+          <Tab>{t('payments')}</Tab>
         </TabList>
         <TabPanels my="1.75rem">
           <TabPanel>
             <RoleFormInfo />
           </TabPanel>
-          {isFeatureEnabled('STREAMS') && (
-            <TabPanel>
-              <RoleFormPaymentStreams />
-            </TabPanel>
-          )}
+          <TabPanel>
+            <RoleFormPaymentStreams />
+          </TabPanel>
         </TabPanels>
       </Tabs>
       <Flex
diff --git a/src/components/ui/forms/BigIntInput.tsx b/src/components/ui/forms/BigIntInput.tsx
index 7a2b9081e4..78089f9e3a 100644
--- a/src/components/ui/forms/BigIntInput.tsx
+++ b/src/components/ui/forms/BigIntInput.tsx
@@ -19,29 +19,30 @@ export interface BigIntInputProps
   min?: string;
   max?: string;
   maxValue?: bigint;
-  currentValue?: BigIntValuePair;
+  parentFormikValue?: BigIntValuePair;
 }
 /**
  * This component will add a chakra Input component that accepts and sets a bigint
  *
  * @param value input value to the control as a bigint. If undefined is set then the component will be blank.
- * @param onChange event is raised whenever the component changes. Sends back a value / bigint pair. The value sent back is a string representation of the bigint as a decimal number.
+ * @param onChange event is raised whenever the component changes. Sends back a resulting `BigIntValuePair` from the new input.
  * @param decimalPlaces number of decimal places to be used to parse the value to set the bigint
  * @param min Setting a minimum value will reset the Input value to min when the component's focus is lost. Can set decimal number for minimum, but must respect the decimalPlaces value.
  * @param max Setting this will cause the value of the Input control to be reset to the maximum when a number larger than it is inputted.
  * @param maxValue The maximum value that can be inputted. This is used to set the max value of the Input control.
- * @param currentValue This needs to be set to `values.yourFormValue` if the value of the Input control is changed outside of the component, for example via `setFieldValue`. This will update the value of the underlying Input control.
+ * @param parentFormikValue This needs to be set to `values.yourFormValue` if the value of the Input control is changed outside of the component, for example via `setFieldValue`. This will update the value of the underlying Input control.
  * @param ...rest component accepts all properties for Input and FormControl
  * @returns
  */
 export function BigIntInput({
+  // @todo `value` can most likely either be removed, or be used for what `parentFormikValue` is currently being used for. Currently it works as nothing more than an initial value.
   value,
   onChange,
   decimalPlaces = 18,
   min,
   max,
   maxValue,
-  currentValue,
+  parentFormikValue = { value: '', bigintValue: undefined },
   ...rest
 }: BigIntInputProps) {
   const { t } = useTranslation('common');
@@ -147,10 +148,22 @@ export function BigIntInput({
 
   // if the parent Formik value prop changes, need to update the value
   useEffect(() => {
-    if (!inputValue || inputValue === currentValue?.value) return;
-    if (currentValue?.bigintValue === 0n) setInputValue('');
-    if (currentValue?.value !== inputValue) setInputValue(currentValue?.value || inputValue);
-  }, [currentValue, inputValue]);
+    // If parentFormikValue is set to undefined, then the input should be blank
+    if (parentFormikValue === undefined) {
+      setInputValue('');
+      return;
+    }
+
+    // If parentFormikValue is the same as the input value, nothing needs to happen.
+    if (inputValue === parentFormikValue.value) return;
+
+    // If parentFormikValue does not match the input value (likely because it was set outside of the input's onChange handler),
+    // then update the underlying input value so that the change is visible on the UI.
+    // But if parentFormikValue.value is false-y, default to whatever is in the input.
+    if (parentFormikValue.value !== inputValue) {
+      setInputValue(parentFormikValue?.value || inputValue);
+    }
+  }, [parentFormikValue, inputValue]);
 
   // if the decimalPlaces change, need to update the value
   useEffect(() => {
diff --git a/src/components/ui/forms/EthAddressInput.tsx b/src/components/ui/forms/EthAddressInput.tsx
index 94419998bb..0f11589f3d 100644
--- a/src/components/ui/forms/EthAddressInput.tsx
+++ b/src/components/ui/forms/EthAddressInput.tsx
@@ -10,6 +10,7 @@ export function AddressInput({ value, onChange, ...rest }: InputProps) {
   const [localValue, setLocalValue] = useState<string | number | readonly string[] | undefined>(
     value,
   );
+
   const debounceValue = useMemo(
     () =>
       debounce((event: ChangeEvent<HTMLInputElement>) => {
@@ -24,6 +25,10 @@ export function AddressInput({ value, onChange, ...rest }: InputProps) {
     };
   }, [debounceValue]);
 
+  useEffect(() => {
+    setLocalValue(value);
+  }, [value]);
+
   const handleChange = useCallback(
     (event: ChangeEvent<HTMLInputElement>) => {
       debounceValue(event);
@@ -31,6 +36,7 @@ export function AddressInput({ value, onChange, ...rest }: InputProps) {
     },
     [debounceValue],
   );
+
   return (
     <Input
       // preface id with "search" to prevent showing 1password
diff --git a/src/components/ui/modals/SendAssetsModal.tsx b/src/components/ui/modals/SendAssetsModal.tsx
index eba43aa791..eafb35c6df 100644
--- a/src/components/ui/modals/SendAssetsModal.tsx
+++ b/src/components/ui/modals/SendAssetsModal.tsx
@@ -136,7 +136,8 @@ export function SendAssetsModal({
                           iconSize="1.5rem"
                           icon={<CaretDown />}
                           onChange={e => {
-                            setFieldValue('inputAmount', { value: '0', bigintValue: 0n });
+                            // New asset selected. First reset the form input amount
+                            setFieldValue('inputAmount', undefined);
                             setFieldValue(
                               'selectedAsset',
                               fungibleAssetsWithBalance[Number(e.target.value)],
@@ -169,7 +170,7 @@ export function SendAssetsModal({
                           onChange={value => {
                             setFieldValue('inputAmount', value);
                           }}
-                          currentValue={values.inputAmount}
+                          parentFormikValue={values.inputAmount}
                           decimalPlaces={values.selectedAsset.decimals}
                           placeholder="0"
                           maxValue={BigInt(values.selectedAsset.balance)}
diff --git a/src/constants/common.ts b/src/constants/common.ts
index 7e3aa5f83a..f09ea82479 100644
--- a/src/constants/common.ts
+++ b/src/constants/common.ts
@@ -53,7 +53,13 @@ export const SIDEBAR_WIDTH = '4.25rem';
 
 export const MAX_CONTENT_WIDTH = '80rem';
 
-export const isFeatureEnabled = (feature: string) => {
+const features = {
+  developmentMode: 'DEVELOPMENT_MODE',
+} as const;
+
+type FeatureFlag = (typeof features)[keyof typeof features];
+
+export const isFeatureEnabled = (feature: FeatureFlag) => {
   const featureStatus = import.meta.env[`VITE_APP_FLAG_${feature}`];
   if (featureStatus === 'ON') {
     return true;
@@ -62,6 +68,8 @@ export const isFeatureEnabled = (feature: string) => {
   }
 };
 
+export const isDevMode = () => isFeatureEnabled(features.developmentMode);
+
 /**
  * @dev DO NOT CHANGE THE SALT
  * @note This SALT is used to generate the account address for the Hats Smart Account
diff --git a/src/hooks/DAO/loaders/governance/useERC20Claim.ts b/src/hooks/DAO/loaders/governance/useERC20Claim.ts
index 49eb0550af..2451c2ec43 100644
--- a/src/hooks/DAO/loaders/governance/useERC20Claim.ts
+++ b/src/hooks/DAO/loaders/governance/useERC20Claim.ts
@@ -46,11 +46,14 @@ export function useERC20Claim() {
       .ERC20ClaimCreated({ fromBlock: 0n })
       .catch(() => []);
 
+    if (!tokenClaimArray.length) return;
+
     const childToken = tokenClaimArray[0].args.childToken;
 
-    if (!tokenClaimArray.length || !childToken || childToken === votesTokenAddress) {
+    if (!childToken || childToken === votesTokenAddress) {
       return;
     }
+
     // action to governance
     action.dispatch({
       type: FractalGovernanceAction.SET_CLAIMING_CONTRACT,
diff --git a/src/hooks/streams/useCreateSablierStream.ts b/src/hooks/streams/useCreateSablierStream.ts
index 7c68e20e84..f4e5196ae7 100644
--- a/src/hooks/streams/useCreateSablierStream.ts
+++ b/src/hooks/streams/useCreateSablierStream.ts
@@ -1,11 +1,13 @@
+import { abis } from '@fractal-framework/fractal-contracts';
 import groupBy from 'lodash.groupby';
 import { useCallback } from 'react';
 import { Address, Hex, encodeFunctionData, erc20Abi, zeroAddress, getAddress } from 'viem';
+import GnosisSafeL2 from '../../assets/abi/GnosisSafeL2';
 import SablierV2BatchAbi from '../../assets/abi/SablierV2Batch';
-import { SablierV2LockupLinearAbi } from '../../assets/abi/SablierV2LockupLinear';
 import { PreparedNewStreamData } from '../../components/pages/Roles/types';
 import { useFractal } from '../../providers/App/AppProvider';
 import { useNetworkConfig } from '../../providers/NetworkConfig/NetworkConfigProvider';
+import { SENTINEL_MODULE } from '../../utils/address';
 
 export function convertStreamIdToBigInt(streamId: string) {
   // streamId is formatted as ${streamContractAddress}-${chainId}-${numericId}
@@ -16,7 +18,7 @@ export function convertStreamIdToBigInt(streamId: string) {
 
 export default function useCreateSablierStream() {
   const {
-    contracts: { sablierV2LockupLinear, sablierV2Batch },
+    contracts: { sablierV2LockupLinear, sablierV2Batch, decentSablierMasterCopy },
   } = useNetworkConfig();
   const {
     node: { daoAddress },
@@ -76,32 +78,91 @@ export default function useCreateSablierStream() {
     [prepareBasicStreamData],
   );
 
-  const prepareFlushStreamTx = useCallback((streamId: string, to: Address) => {
-    // @dev This function comes from "basic" SablierV2
-    // all the types of streams are inheriting from that
-    // so it's safe to rely on any stream ABI
-
-    const flushCalldata = encodeFunctionData({
-      abi: SablierV2LockupLinearAbi,
-      functionName: 'withdrawMax',
-      args: [convertStreamIdToBigInt(streamId), to],
-    });
-
-    return flushCalldata;
-  }, []);
-
-  const prepareCancelStreamTx = useCallback((streamId: string, targetAddress: Address) => {
-    // @dev This function comes from "basic" SablierV2
-    // all the types of streams are inheriting from that
-    // so it's safe to rely on any stream ABI
-    const cancelCallData = encodeFunctionData({
-      abi: SablierV2LockupLinearAbi,
-      functionName: 'cancel',
-      args: [convertStreamIdToBigInt(streamId)],
-    });
-
-    return { calldata: cancelCallData, targetAddress };
-  }, []);
+  const prepareFlushStreamTxs = useCallback(
+    (args: { streamId: string; to: Address; smartAccount: Address }) => {
+      if (!daoAddress) {
+        throw new Error('Can not flush stream without DAO Address');
+      }
+
+      const { streamId, to, smartAccount } = args;
+
+      const enableModuleData = encodeFunctionData({
+        abi: GnosisSafeL2,
+        functionName: 'enableModule',
+        args: [decentSablierMasterCopy],
+      });
+
+      const disableModuleData = encodeFunctionData({
+        abi: GnosisSafeL2,
+        functionName: 'disableModule',
+        args: [SENTINEL_MODULE, decentSablierMasterCopy],
+      });
+
+      const withdrawMaxFromStreamData = encodeFunctionData({
+        abi: abis.DecentSablierStreamManagement,
+        functionName: 'withdrawMaxFromStream',
+        args: [sablierV2LockupLinear, smartAccount, convertStreamIdToBigInt(streamId), to],
+      });
+
+      return [
+        {
+          targetAddress: daoAddress,
+          calldata: enableModuleData,
+        },
+        {
+          targetAddress: decentSablierMasterCopy,
+          calldata: withdrawMaxFromStreamData,
+        },
+        {
+          targetAddress: daoAddress,
+          calldata: disableModuleData,
+        },
+      ];
+    },
+    [daoAddress, decentSablierMasterCopy, sablierV2LockupLinear],
+  );
+
+  const prepareCancelStreamTxs = useCallback(
+    (streamId: string) => {
+      if (!daoAddress) {
+        throw new Error('Can not flush stream without DAO Address');
+      }
+
+      const enableModuleData = encodeFunctionData({
+        abi: GnosisSafeL2,
+        functionName: 'enableModule',
+        args: [decentSablierMasterCopy],
+      });
+
+      const disableModuleData = encodeFunctionData({
+        abi: GnosisSafeL2,
+        functionName: 'disableModule',
+        args: [SENTINEL_MODULE, decentSablierMasterCopy],
+      });
+
+      const cancelStreamData = encodeFunctionData({
+        abi: abis.DecentSablierStreamManagement,
+        functionName: 'cancelStream',
+        args: [sablierV2LockupLinear, convertStreamIdToBigInt(streamId)],
+      });
+
+      return [
+        {
+          targetAddress: daoAddress,
+          calldata: enableModuleData,
+        },
+        {
+          targetAddress: decentSablierMasterCopy,
+          calldata: cancelStreamData,
+        },
+        {
+          targetAddress: daoAddress,
+          calldata: disableModuleData,
+        },
+      ];
+    },
+    [daoAddress, decentSablierMasterCopy, sablierV2LockupLinear],
+  );
 
   const prepareBatchLinearStreamCreation = useCallback(
     (paymentStreams: PreparedNewStreamData[]) => {
@@ -142,8 +203,8 @@ export default function useCreateSablierStream() {
 
   return {
     prepareBatchLinearStreamCreation,
-    prepareFlushStreamTx,
-    prepareCancelStreamTx,
+    prepareFlushStreamTxs,
+    prepareCancelStreamTxs,
     prepareLinearStream,
   };
 }
diff --git a/src/hooks/utils/useCreateRoles.ts b/src/hooks/utils/useCreateRoles.ts
index edf743c3fe..e4731847a0 100644
--- a/src/hooks/utils/useCreateRoles.ts
+++ b/src/hooks/utils/useCreateRoles.ts
@@ -52,7 +52,7 @@ export default function useCreateRoles() {
   const { t } = useTranslation(['roles', 'navigation', 'modals', 'common']);
 
   const { submitProposal } = useSubmitProposal();
-  const { prepareBatchLinearStreamCreation, prepareFlushStreamTx, prepareCancelStreamTx } =
+  const { prepareBatchLinearStreamCreation, prepareFlushStreamTxs, prepareCancelStreamTxs } =
     useCreateSablierStream();
   const ipfsClient = useIPFSClient();
   const publicClient = usePublicClient();
@@ -285,20 +285,6 @@ export default function useCreateRoles() {
     ],
   );
 
-  const prepareHatsAccountFlushExecData = useCallback(
-    (streamId: string, contractAddress: Address, wearer: Address) => {
-      const flushStreamTxCalldata = prepareFlushStreamTx(streamId, wearer);
-      const wrappedFlushStreamTx = encodeFunctionData({
-        abi: HatsAccount1ofNAbi,
-        functionName: 'execute',
-        args: [contractAddress, 0n, flushStreamTxCalldata, 0],
-      });
-
-      return wrappedFlushStreamTx;
-    },
-    [prepareFlushStreamTx],
-  );
-
   const createNewHatTx = useCallback(
     async (formRole: RoleHatFormValueEdited, adminHatId: bigint, topHatSmartAccount: Address) => {
       if (formRole.name === undefined || formRole.description === undefined) {
@@ -513,6 +499,7 @@ export default function useCreateRoles() {
             );
           }
 
+          // @todo: For all instances of `getAddress(formHat.wearer)` we should confirm that at this point, `formHat.wearer` is definitely an `Address` type.
           const originalHat = getHat(formHat.id);
           if (!originalHat) {
             throw new Error('Cannot find original hat');
@@ -538,15 +525,14 @@ export default function useCreateRoles() {
                   'Stream ID and Stream ContractAddress is required for flush stream transaction',
                 );
               }
-              const wrappedFlushStreamTx = prepareHatsAccountFlushExecData(
-                stream.streamId,
-                stream.contractAddress,
-                originalHat.wearer,
-              );
-              allTxs.push({
-                calldata: wrappedFlushStreamTx,
-                targetAddress: formHat.smartAddress,
+
+              const flushStreamTxCalldata = prepareFlushStreamTxs({
+                streamId: stream.streamId,
+                to: getAddress(originalHat.wearer),
+                smartAccount: formHat.smartAddress,
               });
+
+              allTxs.push(...flushStreamTxCalldata);
             }
           }
 
@@ -559,7 +545,7 @@ export default function useCreateRoles() {
                   'Stream ID and Stream ContractAddress is required for cancel stream transaction',
                 );
               }
-              allTxs.push(prepareCancelStreamTx(stream.streamId, stream.contractAddress));
+              allTxs.push(...prepareCancelStreamTxs(stream.streamId));
             }
           }
 
@@ -627,22 +613,23 @@ export default function useCreateRoles() {
                 }),
                 targetAddress: hatsProtocol,
               });
+
               for (const stream of streamsWithFundsToClaim) {
                 if (!stream.streamId || !stream.contractAddress) {
                   throw new Error(
                     'Stream ID and Stream ContractAddress is required for flush stream transaction',
                   );
                 }
-                const wrappedFlushStreamTx = prepareHatsAccountFlushExecData(
-                  stream.streamId,
-                  stream.contractAddress,
-                  originalHat.wearer,
-                );
-                allTxs.push({
-                  calldata: wrappedFlushStreamTx,
-                  targetAddress: formHat.smartAddress,
+
+                const flushStreamTxCalldata = prepareFlushStreamTxs({
+                  streamId: stream.streamId,
+                  to: originalHat.wearer,
+                  smartAccount: formHat.smartAddress,
                 });
+
+                allTxs.push(...flushStreamTxCalldata);
               }
+
               allTxs.push({
                 calldata: encodeFunctionData({
                   abi: HatsAbi,
@@ -663,6 +650,7 @@ export default function useCreateRoles() {
               });
             }
           }
+
           if (formHat.editedRole.fieldNames.includes('payments')) {
             const cancelledStreamsOnHat = getCancelledStreamsFromFormHat(formHat);
             if (cancelledStreamsOnHat.length) {
@@ -691,20 +679,17 @@ export default function useCreateRoles() {
 
                 // flush withdrawable streams to the original wearer
                 if (stream.withdrawableAmount && stream.withdrawableAmount > 0n) {
-                  const wrappedFlushStreamTx = prepareHatsAccountFlushExecData(
-                    stream.streamId,
-                    stream.contractAddress,
-                    originalHat.wearer,
-                  );
-
-                  allTxs.push({
-                    calldata: wrappedFlushStreamTx,
-                    targetAddress: formHat.smartAddress,
+                  const flushStreamTxCalldata = prepareFlushStreamTxs({
+                    streamId: stream.streamId,
+                    to: originalHat.wearer,
+                    smartAccount: formHat.smartAddress,
                   });
+
+                  allTxs.push(...flushStreamTxCalldata);
                 }
 
                 // Cancel the stream
-                allTxs.push(prepareCancelStreamTx(stream.streamId, stream.contractAddress));
+                allTxs.push(...prepareCancelStreamTxs(stream.streamId));
 
                 // Finally, transfer the hat back to the correct wearer.
                 // Because a payment cancel can occur in the same role edit as a member change, we need to ensure hat is
@@ -766,8 +751,8 @@ export default function useCreateRoles() {
       hatsTree,
       mintHatTx,
       predictSmartAccount,
-      prepareCancelStreamTx,
-      prepareHatsAccountFlushExecData,
+      prepareCancelStreamTxs,
+      prepareFlushStreamTxs,
       uploadHatDescription,
     ],
   );
@@ -778,14 +763,13 @@ export default function useCreateRoles() {
         throw new Error('Cannot create Roles proposal without public client');
       }
 
-      const { setSubmitting } = formikHelpers;
-      setSubmitting(true);
-
       if (!safe) {
-        setSubmitting(false);
         throw new Error('Cannot create Roles proposal without known Safe');
       }
 
+      const { setSubmitting } = formikHelpers;
+      setSubmitting(true);
+
       // filter to hats that have been modified, or whose payments have been modified (ie includes `editedRole` prop)
       const modifiedHats: RoleHatFormValueEdited[] = values.hats
         .map(hat => {
diff --git a/src/providers/NetworkConfig/networks/base.ts b/src/providers/NetworkConfig/networks/base.ts
index d7f3091656..c1a3a7b33b 100644
--- a/src/providers/NetworkConfig/networks/base.ts
+++ b/src/providers/NetworkConfig/networks/base.ts
@@ -81,6 +81,8 @@ export const baseConfig: NetworkConfig = {
     fractalRegistry: getAddress(a.FractalRegistry),
     keyValuePairs: getAddress(a.KeyValuePairs),
     decentHatsMasterCopy: getAddress(a.DecentHats_0_1_0),
+    decentSablierMasterCopy: getAddress(a.DecentSablierStreamManagement),
+
     hatsProtocol: '0x3bc1A0Ad72417f2d411118085256fC53CBdDd137',
     erc6551Registry: '0x000000006551c19487814612e58FE06813775758',
     hatsAccount1ofNMasterCopy: '0xfEf83A660b7C10a3EdaFdCF62DEee1fD8a875D29',
diff --git a/src/providers/NetworkConfig/networks/mainnet.ts b/src/providers/NetworkConfig/networks/mainnet.ts
index e17a8ffacc..ee9ab32fc5 100644
--- a/src/providers/NetworkConfig/networks/mainnet.ts
+++ b/src/providers/NetworkConfig/networks/mainnet.ts
@@ -81,6 +81,8 @@ export const mainnetConfig: NetworkConfig = {
     fractalRegistry: getAddress(a.FractalRegistry),
     keyValuePairs: getAddress(a.KeyValuePairs),
     decentHatsMasterCopy: getAddress(a.DecentHats_0_1_0),
+    decentSablierMasterCopy: getAddress(a.DecentSablierStreamManagement),
+
     hatsProtocol: '0x3bc1A0Ad72417f2d411118085256fC53CBdDd137',
     erc6551Registry: '0x000000006551c19487814612e58FE06813775758',
     hatsAccount1ofNMasterCopy: '0xfEf83A660b7C10a3EdaFdCF62DEee1fD8a875D29',
diff --git a/src/providers/NetworkConfig/networks/optimism.ts b/src/providers/NetworkConfig/networks/optimism.ts
index a958d90064..b8833378ab 100644
--- a/src/providers/NetworkConfig/networks/optimism.ts
+++ b/src/providers/NetworkConfig/networks/optimism.ts
@@ -81,6 +81,8 @@ export const optimismConfig: NetworkConfig = {
     fractalRegistry: getAddress(a.FractalRegistry),
     keyValuePairs: getAddress(a.KeyValuePairs),
     decentHatsMasterCopy: getAddress(a.DecentHats_0_1_0),
+    decentSablierMasterCopy: getAddress(a.DecentSablierStreamManagement),
+
     hatsProtocol: '0x3bc1A0Ad72417f2d411118085256fC53CBdDd137',
     erc6551Registry: '0x000000006551c19487814612e58FE06813775758',
     hatsAccount1ofNMasterCopy: '0xfEf83A660b7C10a3EdaFdCF62DEee1fD8a875D29',
diff --git a/src/providers/NetworkConfig/networks/polygon.ts b/src/providers/NetworkConfig/networks/polygon.ts
index afd6338946..84da90946a 100644
--- a/src/providers/NetworkConfig/networks/polygon.ts
+++ b/src/providers/NetworkConfig/networks/polygon.ts
@@ -81,6 +81,8 @@ export const polygonConfig: NetworkConfig = {
     fractalRegistry: getAddress(a.FractalRegistry),
     keyValuePairs: getAddress(a.KeyValuePairs),
     decentHatsMasterCopy: getAddress(a.DecentHats_0_1_0),
+    decentSablierMasterCopy: getAddress(a.DecentSablierStreamManagement),
+
     hatsProtocol: '0x3bc1A0Ad72417f2d411118085256fC53CBdDd137',
     erc6551Registry: '0x000000006551c19487814612e58FE06813775758',
     hatsAccount1ofNMasterCopy: '0xfEf83A660b7C10a3EdaFdCF62DEee1fD8a875D29',
diff --git a/src/providers/NetworkConfig/networks/sepolia.ts b/src/providers/NetworkConfig/networks/sepolia.ts
index 330576da6c..5a6354035d 100644
--- a/src/providers/NetworkConfig/networks/sepolia.ts
+++ b/src/providers/NetworkConfig/networks/sepolia.ts
@@ -81,6 +81,7 @@ export const sepoliaConfig: NetworkConfig = {
     fractalRegistry: getAddress(a.FractalRegistry),
     keyValuePairs: getAddress(a.KeyValuePairs),
     decentHatsMasterCopy: getAddress(a.DecentHats_0_1_0),
+    decentSablierMasterCopy: getAddress(a.DecentSablierStreamManagement),
 
     hatsProtocol: '0x3bc1A0Ad72417f2d411118085256fC53CBdDd137',
     erc6551Registry: '0x000000006551c19487814612e58FE06813775758',
diff --git a/src/types/common.ts b/src/types/common.ts
index 911e89e1fb..fd1c03888e 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -1,5 +1,8 @@
 export interface BigIntValuePair {
+  /** A stringified, user-parseable, decimal representation of `bigintValue`. */
   value: string;
+
+  /** The actual, unformatted `bigint` value. */
   bigintValue?: bigint;
 }
 
diff --git a/src/types/network.ts b/src/types/network.ts
index 52241cdbd6..1387ebb603 100644
--- a/src/types/network.ts
+++ b/src/types/network.ts
@@ -56,6 +56,7 @@ export type NetworkConfig = {
     keyValuePairs: Address;
 
     decentHatsMasterCopy: Address;
+    decentSablierMasterCopy: Address;
 
     hatsProtocol: Address;
     erc6551Registry: Address;