diff --git a/frontend/src/components/NewDashboard.js b/frontend/src/components/NewDashboard.js
index 03bf168e..8445e711 100644
--- a/frontend/src/components/NewDashboard.js
+++ b/frontend/src/components/NewDashboard.js
@@ -299,7 +299,7 @@ const NewDashboard = (props) => {
                                                     size="sm"
                                                     placeSelf="self-end"
                                                     colorScheme={
-                                                      item.hasABI
+                                                      item.abi
                                                         ? "green"
                                                         : "gray"
                                                     }
@@ -383,10 +383,10 @@ const NewDashboard = (props) => {
                         )}
                     </Td>
                     <Td w="90px">
-                      {subscibedItem.hasABI && subscibedItem.address && (
+                      {subscibedItem.abi && subscibedItem.address && (
                         <CheckCircleIcon color="green" />
                       )}
-                      {!subscibedItem.hasABI && (
+                      {!subscibedItem.abi && (
                         <Button
                           colorScheme="orange"
                           size="xs"
@@ -407,7 +407,7 @@ const NewDashboard = (props) => {
                     <Td w="60px">
                       <Checkbox
                         isDisabled={
-                          !subscibedItem.address || !subscibedItem.hasABI
+                          !subscibedItem.address || !subscibedItem.abi
                         }
                         isChecked={subscibedItem.isMethods}
                       ></Checkbox>
@@ -415,7 +415,7 @@ const NewDashboard = (props) => {
                     <Td w="60px">
                       <Checkbox
                         isDisabled={
-                          !subscibedItem.address || !subscibedItem.hasABI
+                          !subscibedItem.address || !subscibedItem.abi
                         }
                         isChecked={subscibedItem.isEvents}
                       ></Checkbox>
diff --git a/frontend/src/components/SubscriptionsList.js b/frontend/src/components/SubscriptionsList.js
index 97e27bd9..25c34d1c 100644
--- a/frontend/src/components/SubscriptionsList.js
+++ b/frontend/src/components/SubscriptionsList.js
@@ -119,7 +119,10 @@ const SubscriptionsList = ({ emptyCTA }) => {
                       py={2}
                       disabled={!subscription.address}
                       onClick={() =>
-                        overlay.toggleModal({ type: MODAL_TYPES.UPLOAD_ABI })
+                        overlay.toggleModal({
+                          type: MODAL_TYPES.UPLOAD_ABI,
+                          props: { id: subscription.id },
+                        })
                       }
                     >
                       Upload
diff --git a/frontend/src/components/UploadABI.js b/frontend/src/components/UploadABI.js
index 258ef155..c0507745 100644
--- a/frontend/src/components/UploadABI.js
+++ b/frontend/src/components/UploadABI.js
@@ -1,17 +1,21 @@
-import React, { useEffect, useState } from "react";
+import React, { useContext, useEffect, useState } from "react";
 import { Flex, ButtonGroup, Button, useToast, Spinner } from "@chakra-ui/react";
-import { modifySubscription } from "../core/services/subscriptions.service";
+import { useSubscriptions } from "../core/hooks";
 // import hljs from "highlight.js";
 // import ReactQuill from "react-quill"; // ES6
 import AceEditor from "react-ace";
 import "ace-builds/src-noconflict/theme-github";
 import "ace-builds/src-noconflict/mode-json";
+import OverlayContext from "../core/providers/OverlayProvider/context";
+import { MODAL_TYPES } from "../core/providers/OverlayProvider/constants";
 
-const ABIUPLoad = () => {
+const ABIUPLoad = (props) => {
+  console.assert(props.id, "id not defined in ABI Upload");
+  const { updateSubscription } = useSubscriptions();
   const toast = useToast();
   const [text, setText] = useState();
   const [json, setJSON] = useState();
-  const [isSubmitting, setSubmitting] = useState(false);
+  const { toggleModal } = useContext(OverlayContext);
 
   const handleVerify = (raw) => {
     try {
@@ -32,6 +36,19 @@ const ABIUPLoad = () => {
     }
   };
 
+  useEffect(() => {
+    updateSubscription.isSuccess && toggleModal({ type: MODAL_TYPES.OFF });
+    updateSubscription.isSuccess &&
+      toast({
+        id: "upload_abi_success",
+        description: "ABI was assigned to the subscription",
+        title: "Success!",
+        position: "bottom",
+        status: "success",
+        variant: "subtle",
+      });
+  }, [updateSubscription.isSuccess, toggleModal]);
+
   useEffect(() => {
     if (json === false) {
       const clearingInterval = setInterval(() => setJSON(), 200);
@@ -45,11 +62,14 @@ const ABIUPLoad = () => {
   };
   const handleSubmit = () => {
     if (json) {
-      modifySubscription({ id: abi: json });
+      console.log("id:", props.id);
+      updateSubscription.mutate({
+        id: props.id,
+        abi: JSON.stringify(json),
+      });
     }
   };
 
-  console.log("json", json);
   return (
     <Flex
       // minH="420px"
@@ -65,7 +85,7 @@ const ABIUPLoad = () => {
       borderWidth={json === false ? "1px" : "0px"}
       transition="0.1s"
     >
-      {isSubmitting && (
+      {updateSubscription.isLoading && (
         <Spinner position="absolute" top="50%" left="50%" zIndex={1} />
       )}
       {/* ABI HERE PLEASE: */}
@@ -79,13 +99,13 @@ const ABIUPLoad = () => {
         onChange={(e) => handleChange(e)}
         name="AbiUploadField"
         editorProps={{ $blockScrolling: false }}
-        readOnly={isSubmitting}
+        readOnly={updateSubscription.isLoading}
         showGutter={true}
       />
       {/* <Divider /> */}
       <ButtonGroup pt={2} placeContent="flex-end">
         <Button
-          isLoading={isSubmitting}
+          isLoading={updateSubscription.isLoading}
           onClick={() => setJSON(handleVerify(text))}
           transition="0.3s"
           colorScheme={json ? "green" : json === false ? "red" : "blue"}
@@ -93,7 +113,7 @@ const ABIUPLoad = () => {
           Verify
         </Button>
         <Button
-          isLoading={isSubmitting}
+          isLoading={updateSubscription.isLoading}
           disabled={!json}
           onClick={() => handleSubmit()}
           transition="0.3s"
diff --git a/frontend/src/core/hooks/useToast.js b/frontend/src/core/hooks/useToast.js
index 24cfc3ef..6a5a8e7a 100644
--- a/frontend/src/core/hooks/useToast.js
+++ b/frontend/src/core/hooks/useToast.js
@@ -11,9 +11,11 @@ const useToast = () => {
       const userTitle = title ?? message?.response?.statusText ?? type;
 
       const userMessage =
-        message?.response?.data?.detail ??
-        message ??
-        (userTitle === type ? "" : type);
+        message?.response?.data?.detail ?? typeof message === "string"
+          ? message
+          : userTitle === type
+          ? ""
+          : type;
 
       if (mixpanel.get_distinct_id() && type === "error") {
         mixpanel.track(`${MIXPANEL_EVENTS.TOAST_ERROR_DISPLAYED}`, {
@@ -24,11 +26,12 @@ const useToast = () => {
       }
 
       chakraToast({
+        id: `${userTitle}${userMessage}${type}`,
         position: "bottom",
         title: userTitle,
         description: userMessage,
         status: type,
-        duration: 3000,
+        // duration: 3000,
       });
     },
     [chakraToast]