From e765ffa3d7a514b5d2d377ee180d340fd317e86c Mon Sep 17 00:00:00 2001
From: Tyler Shipe <tjshipe@gmail.com>
Date: Thu, 15 Apr 2021 11:57:00 -0400
Subject: [PATCH] revert button text change and remove extra notifications

---
 components/Button.tsx           |  2 +-
 components/DepositModal.tsx     | 12 ++----------
 components/DepositSrmModal.tsx  |  5 -----
 components/Notification.tsx     |  2 +-
 components/WithdrawModal.tsx    |  7 +------
 components/WithdrawSrmModal.tsx |  7 +------
 6 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/components/Button.tsx b/components/Button.tsx
index 7c5b56b..46d036b 100644
--- a/components/Button.tsx
+++ b/components/Button.tsx
@@ -17,7 +17,7 @@ const Button: FunctionComponent<ButtonProps> = ({
     <button
       onClick={onClick}
       disabled={disabled}
-      className={`${className} text-th-fgd-3 px-6 py-2 border border-th-fgd-4 bg-th-bkg-2 rounded-md 
+      className={`${className} px-6 py-2 border border-th-fgd-4 bg-th-bkg-2 rounded-md 
       active:border-mango-yellow hover:bg-th-bkg-3 focus:outline-none disabled:bg-th-bkg-2 
       disabled:text-th-fgd-4 disabled:cursor-not-allowed`}
       {...props}
diff --git a/components/DepositModal.tsx b/components/DepositModal.tsx
index 9de37e6..f3c8b18 100644
--- a/components/DepositModal.tsx
+++ b/components/DepositModal.tsx
@@ -64,15 +64,11 @@ const DepositModal = ({ isOpen, onClose }) => {
         selectedAccount.publicKey,
         Number(inputAmount)
       )
-        .then((response: Array<any>) => {
+        .then((_response: Array<any>) => {
           actions.fetchWalletBalances()
           actions.fetchMangoGroup()
           actions.fetchMarginAccounts()
           setSubmitting(false)
-          notify({
-            message: `Deposited ${inputAmount} into your account`,
-            txid: response[1],
-          })
           onClose()
         })
         .catch((err) => {
@@ -96,15 +92,11 @@ const DepositModal = ({ isOpen, onClose }) => {
         selectedAccount.publicKey,
         Number(inputAmount)
       )
-        .then((response: string) => {
+        .then((_response: string) => {
           actions.fetchWalletBalances()
           actions.fetchMangoGroup()
           actions.fetchMarginAccounts()
           setSubmitting(false)
-          notify({
-            message: `Deposited ${inputAmount} into your account`,
-            txid: `${response}`,
-          })
           onClose()
         })
         .catch((err) => {
diff --git a/components/DepositSrmModal.tsx b/components/DepositSrmModal.tsx
index 8c268b1..e76551e 100644
--- a/components/DepositSrmModal.tsx
+++ b/components/DepositSrmModal.tsx
@@ -65,11 +65,6 @@ const DepositSrmModal = ({ isOpen, onClose }) => {
           actions.fetchMangoSrmAccounts()
           actions.fetchWalletBalances()
           actions.fetchMangoGroup()
-          notify({
-            message: `Deposited ${inputAmount} SRM into your account`,
-            description: ``,
-            type: 'info',
-          })
           onClose()
         })
         .catch((err) => {
diff --git a/components/Notification.tsx b/components/Notification.tsx
index 3626001..a22b13a 100644
--- a/components/Notification.tsx
+++ b/components/Notification.tsx
@@ -16,7 +16,7 @@ const NotificationList = () => {
         setMangoStore((state) => {
           state.notifications = notifications.slice(1, notifications.length)
         })
-      }, 6000)
+      }, 5000)
 
       return () => {
         clearInterval(id)
diff --git a/components/WithdrawModal.tsx b/components/WithdrawModal.tsx
index 6b498f9..319f66a 100644
--- a/components/WithdrawModal.tsx
+++ b/components/WithdrawModal.tsx
@@ -63,15 +63,10 @@ const WithdrawModal = ({ isOpen, onClose }) => {
         selectedAccount.publicKey,
         Number(inputAmount)
       )
-        .then((transSig: string) => {
+        .then((_transSig: string) => {
           setSubmitting(false)
           actions.fetchMangoGroup()
           actions.fetchMarginAccounts()
-          notify({
-            message: `Withdrew ${inputAmount} ${symbol} into your account`,
-            txid: `${transSig}`,
-            type: 'info',
-          })
           onClose()
         })
         .catch((err) => {
diff --git a/components/WithdrawSrmModal.tsx b/components/WithdrawSrmModal.tsx
index 9d8959c..9394b83 100644
--- a/components/WithdrawSrmModal.tsx
+++ b/components/WithdrawSrmModal.tsx
@@ -54,13 +54,8 @@ const WithdrawModal = ({ isOpen, onClose }) => {
         walletSrmAccount.publicKey,
         Number(inputAmount)
       )
-        .then((transSig: string) => {
+        .then((_transSig: string) => {
           setSubmitting(false)
-          notify({
-            message: `Withdrew ${inputAmount} SRM into your account`,
-            txid: `${transSig}`,
-            type: 'info',
-          })
           onClose()
           actions.fetchWalletBalances()
           actions.fetchMangoSrmAccounts()