diff --git a/src/plugins/oSnap/Create.vue b/src/plugins/oSnap/Create.vue
index 3dd4bbad1..0bd762f4d 100644
--- a/src/plugins/oSnap/Create.vue
+++ b/src/plugins/oSnap/Create.vue
@@ -14,11 +14,12 @@ import {
   Transaction
 } from './types';
 import {
+  allTransactionsValid,
   getGnosisSafeBalances,
   getGnosisSafeCollectibles,
   getIsOsnapEnabled,
   getModuleAddressForTreasury,
-  validateTransaction
+  validateOsnapTransaction
 } from './utils';
 import OsnapMarketingWidget from './components/OsnapMarketingWidget.vue';
 
@@ -44,14 +45,14 @@ const safes = ref<GnosisSafe[]>([]);
 const tokens = ref<Token[]>([]);
 const collectables = ref<NFT[]>([]);
 
-const transactionsValid = ref(false);
-
 function addTransaction(transaction: Transaction) {
   if (newPluginData.value.safe === null) return;
-  newPluginData.value.safe.transactions.push({
-    ...transaction,
-    isValid: validateTransaction(transaction)
-  });
+  newPluginData.value.safe.transactions.push(
+    validateOsnapTransaction(transaction)
+  );
+  newPluginData.value.safe.isValid = allTransactionsValid(
+    newPluginData.value.safe.transactions
+  );
   update(newPluginData.value);
 }
 
@@ -63,11 +64,11 @@ function removeTransaction(transactionIndex: number) {
 
 function updateTransaction(transaction: Transaction, transactionIndex: number) {
   if (!newPluginData.value.safe) return;
-  newPluginData.value.safe.transactions[transactionIndex] = {
-    ...transaction,
-    isValid: validateTransaction(transaction)
-  };
-
+  newPluginData.value.safe.transactions[transactionIndex] =
+    validateOsnapTransaction(transaction);
+  newPluginData.value.safe.isValid = allTransactionsValid(
+    newPluginData.value.safe.transactions
+  );
   update(newPluginData.value);
 }
 
@@ -234,25 +235,6 @@ onMounted(async () => {
   update(newPluginData.value);
   isLoading.value = false;
 });
-
-watch(newPluginData, () => {
-  // validate form here, set isValid accordingly upstream
-  if (!newPluginData.value.safe) {
-    return;
-  }
-  // can't publish without transactions
-  if (newPluginData.value.safe.transactions.length === 0) {
-    transactionsValid.value = false;
-    return;
-  }
-  // check ALL transactions
-  if (newPluginData.value.safe.transactions.every(validateTransaction)) {
-    transactionsValid.value = false;
-    return;
-  }
-  // default to invalid
-  transactionsValid.value = false;
-});
 </script>
 
 <template>
diff --git a/src/plugins/oSnap/components/TransactionBuilder/ContractInteraction.vue b/src/plugins/oSnap/components/TransactionBuilder/ContractInteraction.vue
index a787fdf48..5ac8a5fa2 100644
--- a/src/plugins/oSnap/components/TransactionBuilder/ContractInteraction.vue
+++ b/src/plugins/oSnap/components/TransactionBuilder/ContractInteraction.vue
@@ -8,6 +8,7 @@ import {
   createContractInteractionTransaction,
   getABIWriteFunctions,
   getContractABI,
+  processContractInteractionTransaction,
   validateTransaction
 } from '../../utils';
 import AddressInput from '../Input/Address.vue';
@@ -40,23 +41,17 @@ const selectedMethod = computed(
 const parameters = ref<string[]>([]);
 
 function updateTransaction() {
-  if (!isValueValid || !isToValid || !isAbiValid) return;
-  try {
-    const transaction = createContractInteractionTransaction({
-      to: to.value,
-      value: value.value,
-      abi: abi.value,
-      method: selectedMethod.value,
-      parameters: parameters.value
-    });
-
-    if (validateTransaction(transaction)) {
-      emit('updateTransaction', transaction);
-      return;
-    }
-  } catch (error) {
-    console.warn('ContractInteraction - Invalid Transaction:',error);
-  }
+  // if (!isValueValid || !isToValid || !isAbiValid) return;
+
+  const transaction = processContractInteractionTransaction({
+    to: to.value,
+    value: value.value,
+    abi: abi.value,
+    method: selectedMethod.value,
+    parameters: parameters.value
+  });
+
+  emit('updateTransaction', transaction);
 }
 
 function updateParameter(index: number, value: string) {
@@ -73,7 +68,6 @@ function updateMethod(methodName: string) {
 function updateAbi(newAbi: string) {
   abi.value = newAbi;
   methods.value = [];
-
   try {
     methods.value = getABIWriteFunctions(abi.value);
     isAbiValid.value = true;
@@ -137,8 +131,11 @@ function updateValue(newValue: string) {
         </option>
       </UiSelect>
 
-      <div v-if="selectedMethod && selectedMethod.inputs.length">
-        <div class="divider"></div>
+      <div
+        v-if="selectedMethod && selectedMethod.inputs.length"
+        class="flex flex-col gap-2"
+      >
+        <div class="divider h-[1px] bg-skin-border my-3" />
 
         <MethodParameterInput
           v-for="(input, index) in selectedMethod.inputs"
diff --git a/src/plugins/oSnap/components/TransactionBuilder/TransferFunds.vue b/src/plugins/oSnap/components/TransactionBuilder/TransferFunds.vue
index d25127855..d8a142232 100644
--- a/src/plugins/oSnap/components/TransactionBuilder/TransferFunds.vue
+++ b/src/plugins/oSnap/components/TransactionBuilder/TransferFunds.vue
@@ -1,15 +1,8 @@
 <script setup lang="ts">
 import { ETH_CONTRACT } from '@/helpers/constants';
 import { shorten } from '@/helpers/utils';
-import { isAddress } from '@ethersproject/address';
-import { isBigNumberish } from '@ethersproject/bignumber/lib/bignumber';
 import { Network, Token, TransferFundsTransaction } from '../../types';
-import {
-  createTransferFundsTransaction,
-  getERC20TokenTransferTransactionData,
-  getNativeAsset,
-  validateTransaction
-} from '../../utils';
+import { getNativeAsset, processTransferFundsInput } from '../../utils';
 import AddressInput from '../Input/Address.vue';
 import AmountInput from '../Input/Amount.vue';
 import TokensModal from './TokensModal.vue';
@@ -32,36 +25,22 @@ const tokens = ref<Token[]>([nativeAsset, ...props.tokens]);
 const selectedTokenAddress = ref<Token['address']>(
   props.transaction?.token?.address ?? 'main'
 );
+
 const selectedToken = computed(
   () =>
     tokens.value.find(token => token.address === selectedTokenAddress.value) ??
     nativeAsset
 );
-const selectedTokenIsNative = computed(
-  () => selectedToken.value?.address === 'main'
-);
+
 const isTokenModalOpen = ref(false);
 
 function updateTransaction() {
-  try {
-    const data = selectedTokenIsNative.value
-      ? '0x'
-      : getERC20TokenTransferTransactionData(recipient.value, amount.value);
-
-    const transaction = createTransferFundsTransaction({
-      data,
-      amount: amount.value,
-      recipient: recipient.value,
-      token: selectedToken.value
-    });
-    emit('updateTransaction', transaction);
-    const isTransactionValid = validateTransaction(transaction);
-    if (!isTransactionValid) {
-      console.warn('invalid transaction');
-    }
-  } catch (error) {
-    console.warn('invalid transaction', error);
-  }
+  const processedTransaction = processTransferFundsInput({
+    recipient: recipient.value,
+    amount: amount.value,
+    token: selectedToken.value
+  });
+  emit('updateTransaction', processedTransaction);
 }
 
 function openModal() {
diff --git a/src/plugins/oSnap/components/TransactionBuilder/TransferNFT.vue b/src/plugins/oSnap/components/TransactionBuilder/TransferNFT.vue
index f54b022c9..504f14093 100644
--- a/src/plugins/oSnap/components/TransactionBuilder/TransferNFT.vue
+++ b/src/plugins/oSnap/components/TransactionBuilder/TransferNFT.vue
@@ -1,12 +1,7 @@
 <script setup lang="ts">
 import { shorten } from '@/helpers/utils';
-import { isAddress } from '@ethersproject/address';
 import { NFT, Network, TransferNftTransaction } from '../../types';
-import {
-  createTransferNftTransaction,
-  getERC721TokenTransferTransactionData,
-  validateTransaction
-} from '../../utils';
+import { processTransferNftInput } from '../../utils';
 import AddressInput from '../Input/Address.vue';
 
 const props = defineProps<{
@@ -32,28 +27,13 @@ const selectedCollectable = computed(() => {
 });
 
 function updateTransaction() {
-  if (!isAddress(recipient.value) || !selectedCollectable.value) return;
-
-  try {
-    const data = getERC721TokenTransferTransactionData(
-      props.safeAddress,
-      recipient.value,
-      selectedCollectable.value.id
-    );
-
-    const transaction = createTransferNftTransaction({
-      data,
-      recipient: recipient.value,
-      collectable: selectedCollectable.value
-    });
-
-    if (validateTransaction(transaction)) {
-      emit('updateTransaction', transaction);
-      return;
-    }
-  } catch (error) {
-    console.warn('invalid transaction');
-  }
+  // if (!isAddress(recipient.value) || !selectedCollectable.value) return;
+  const processedTransaction = processTransferNftInput({
+    safeAddress: props.safeAddress,
+    recipient: recipient.value,
+    collectible: selectedCollectable.value
+  });
+  emit('updateTransaction', processedTransaction);
 }
 
 watch(recipient, updateTransaction);
diff --git a/src/plugins/oSnap/types.ts b/src/plugins/oSnap/types.ts
index ebfd45921..ddf18d2d0 100644
--- a/src/plugins/oSnap/types.ts
+++ b/src/plugins/oSnap/types.ts
@@ -221,6 +221,7 @@ export type BalanceResponse = {
  * @field `network` field is the id for network that the safe is on.
  * @field `moduleAddress` field is the address of the Optimistic Governor contract that was deployed for this safe.
  * @field `transactions` field is the list of transactions that the Optimistic Governor contract will execute.
+ * @field `isValid?` field check if ALL transactions have passed their respective validation checks
  */
 export type GnosisSafe = {
   safeName: string;
@@ -228,6 +229,7 @@ export type GnosisSafe = {
   network: Network;
   moduleAddress: string;
   transactions: Transaction[];
+  isValid?: boolean;
 };
 
 /**
diff --git a/src/plugins/oSnap/utils/coins.ts b/src/plugins/oSnap/utils/coins.ts
index 19d6c583a..d0066e4cf 100644
--- a/src/plugins/oSnap/utils/coins.ts
+++ b/src/plugins/oSnap/utils/coins.ts
@@ -1,4 +1,4 @@
-import { Network } from '../types';
+import { Network, Token } from '../types';
 
 export const ETHEREUM_COIN = {
   name: 'Ether',
@@ -59,3 +59,7 @@ export function getNativeAsset(network: Network) {
 
   return ETHEREUM_COIN;
 }
+
+export function isNativeAsset(token: Token | undefined) {
+  return token ? token.address === 'main' : false;
+}
diff --git a/src/plugins/oSnap/utils/validators.ts b/src/plugins/oSnap/utils/validators.ts
index f3c670736..bf67abb6b 100644
--- a/src/plugins/oSnap/utils/validators.ts
+++ b/src/plugins/oSnap/utils/validators.ts
@@ -9,7 +9,26 @@ import { isBigNumberish } from '@ethersproject/bignumber/lib/bignumber';
 import { isHexString } from '@ethersproject/bytes';
 import getProvider from '@snapshot-labs/snapshot.js/src/utils/provider';
 import { OPTIMISTIC_GOVERNOR_ABI } from '../constants';
-import { BaseTransaction } from '../types';
+import {
+  BaseTransaction,
+  ContractInteractionTransaction,
+  NFT,
+  Token,
+  Transaction,
+  TransferFundsTransaction,
+  TransferNftTransaction
+} from '../types';
+import {
+  createContractInteractionTransaction,
+  createTransferFundsTransaction,
+  createTransferNftTransaction
+} from './transactions';
+import {
+  getERC20TokenTransferTransactionData,
+  getERC721TokenTransferTransactionData
+} from './abi';
+import { isNativeAsset } from './coins';
+import { FunctionFragment } from '@ethersproject/abi';
 
 /**
  * Validates that the given `address` is a valid Ethereum address
@@ -70,3 +89,205 @@ export async function validateModuleAddress(
     .then(() => true)
     .catch(() => false);
 }
+
+export function processTransferFundsInput(params: {
+  recipient: string;
+  amount: string;
+  token: Token;
+}): TransferFundsTransaction {
+  try {
+    const { recipient, amount, token } = params;
+    const data =
+      token.address === 'main'
+        ? '0x'
+        : getERC20TokenTransferTransactionData(recipient, amount);
+    const transaction = createTransferFundsTransaction({
+      data,
+      amount: amount,
+      recipient: recipient,
+      token: token
+    });
+    return transaction;
+  } catch {
+    // if processing throws, we can not keep possibly valid state upstream, we must reset to empty values, while retaining form state
+    return {
+      type: 'transferFunds',
+      to: '',
+      value: '0',
+      data: '0x',
+      formatted: ['', 0, '0', '0x'],
+      isValid: false
+    };
+  }
+}
+
+export function processTransferNftInput(params: {
+  safeAddress: string;
+  recipient: string;
+  collectible: NFT | undefined;
+}): TransferNftTransaction {
+  try {
+    const { safeAddress, recipient, collectible } = params;
+    if (!collectible) {
+      throw new Error('no NFT selected');
+    }
+    const data = getERC721TokenTransferTransactionData(
+      safeAddress,
+      recipient,
+      collectible.id
+    );
+
+    const transaction = createTransferNftTransaction({
+      data,
+      recipient: recipient,
+      collectable: collectible
+    });
+
+    return transaction;
+  } catch {
+    // if processing throws, we can not keep possibly valid state upstream, we must reset to empty values, while retaining form state
+    return createTransferNftTransaction({
+      data: '',
+      recipient: '',
+      collectable: {
+        name: '',
+        address: '',
+        id: ''
+      }
+    });
+  }
+}
+
+export function processContractInteractionTransaction(params: {
+  to: string;
+  value: string;
+  abi: string;
+  method: FunctionFragment;
+  parameters: string[];
+}): ContractInteractionTransaction {
+  try {
+    const { to, value, abi, method, parameters } = params;
+    const transaction = createContractInteractionTransaction({
+      to,
+      value,
+      abi,
+      method,
+      parameters
+    });
+    return transaction;
+  } catch {
+    // if processing throws, we can not keep possibly valid state upstream, we must reset to empty values, while retaining form state
+    return {
+      type: 'contractInteraction',
+      to: '',
+      value: '0',
+      data: '0x',
+      formatted: ['', 0, '0', '0x'],
+      isValid: false
+    };
+  }
+}
+
+function isContractInteractionValid(
+  tx: ContractInteractionTransaction
+): boolean {
+  // TODO: validate
+  return true;
+}
+
+function validateContractInteraction(
+  tx: ContractInteractionTransaction
+): ContractInteractionTransaction {
+  return {
+    ...tx,
+    isValid: isContractInteractionValid(tx)
+  };
+}
+
+function isTransferFundsValid(tx: TransferFundsTransaction): boolean {
+  // validate base transaction
+  if (!validateTransaction(tx)) {
+    return false;
+  }
+
+  // check empty values
+  if (!tx.recipient || !tx.amount) {
+    return false;
+  }
+
+  if (!isNativeAsset(tx.token)) {
+    // must have data for ERC20 transfers
+    if (tx.data === '' || tx.data === '0x') {
+      return false;
+    }
+  }
+
+  if (!isAddress(tx.recipient) || !amountPositive(tx.amount)) {
+    return false;
+  }
+
+  return true;
+}
+
+function validateTransferFunds(
+  tx: TransferFundsTransaction
+): TransferFundsTransaction {
+  return {
+    ...tx,
+    isValid: isTransferFundsValid(tx)
+  };
+}
+
+function isTransferNftValid(tx: TransferNftTransaction): boolean {
+  // validate base transaction
+  if (!validateTransaction(tx)) {
+    return false;
+  }
+
+  // check empty values
+  if (!tx.recipient || !tx.collectable) {
+    return false;
+  }
+
+  // check NFT transfer variables are correct
+  if (
+    !isAddress(tx.recipient) ||
+    !isAddress(tx.collectable.address) ||
+    !tx.collectable.id
+  ) {
+    return false;
+  }
+
+  return true;
+}
+
+function validateTransferNft(
+  tx: TransferNftTransaction
+): TransferNftTransaction {
+  return {
+    ...tx,
+    isValid: isTransferNftValid(tx)
+  };
+}
+
+function amountPositive(amount: string) {
+  return isBigNumberish(amount) && parseInt(amount) > 0;
+}
+
+export function validateOsnapTransaction(tx: Transaction) {
+  //  handle validation for each type individually
+  switch (tx.type) {
+    case 'transferFunds':
+      return validateTransferFunds(tx);
+    case 'transferNFT':
+      return validateTransferNft(tx);
+    case 'contractInteraction':
+      return validateContractInteraction(tx);
+    default:
+      return tx;
+  }
+}
+
+export function allTransactionsValid(transactions: Transaction[]): boolean {
+  return transactions.every(tx => tx.isValid === true);
+}
diff --git a/src/plugins/safeSnap/utils/abi.ts b/src/plugins/safeSnap/utils/abi.ts
index 44c53df76..344f334c7 100644
--- a/src/plugins/safeSnap/utils/abi.ts
+++ b/src/plugins/safeSnap/utils/abi.ts
@@ -59,6 +59,7 @@ export async function getContractABI(
   }
 
   try {
+    debugger;
     const { result, status } = await fetchContractABI(apiUrl, contractAddress);
 
     if (status === '0') {
diff --git a/src/views/SpaceCreate.vue b/src/views/SpaceCreate.vue
index eb9f1284b..ce1a8cacd 100644
--- a/src/views/SpaceCreate.vue
+++ b/src/views/SpaceCreate.vue
@@ -6,7 +6,6 @@ import Plugin from '@/plugins/safeSnap';
 import { getInstance } from '@snapshot-labs/lock/plugins/vue3';
 import { clone } from '@snapshot-labs/snapshot.js/src/utils';
 import proposalSchema from '@snapshot-labs/snapshot.js/src/schemas/proposal.json';
-import { validateTransaction } from '@/plugins/oSnap/utils';
 
 const safeSnapPlugin = new Plugin();
 
@@ -140,12 +139,8 @@ const isFormValid = computed(() => {
     ? form.value.metadata.plugins.safeSnap.valid
     : true;
 
-  const isOsnapPluginValid = form.value.metadata.plugins?.oSnap?.safe
-    ?.transactions
-    ? form.value.metadata.plugins.oSnap.safe.transactions.every(
-        validateTransaction
-      )
-    : true;
+  const isOsnapPluginValid =
+    form.value.metadata.plugins?.oSnap?.safe?.isValid ?? true;
 
   return (
     !web3.value.authLoading &&