Merge pull request #170 from Qsilver97/staging

Staging
Qsilver97 · May 29, 2024 · 8f25a5c · 8f25a5c
2 parents a3e38bc + e18ad29
commit 8f25a5c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/app/client/src/contexts/AuthContext.tsx b/app/client/src/contexts/AuthContext.tsx
@@ -53,7 +53,7 @@ interface AuthContextType {
     setTxModalStatus: Dispatch<SetStateAction<'middle' | 'bottom' | 'closed' | string>>;
     setTxStatus: Dispatch<SetStateAction<string>>;
     setCurrentToken: Dispatch<SetStateAction<TokenOption>>;
-    fetchTradingInfoPage: () => Promise<void>;
+    fetchTradingInfoPage: (token?: string) => Promise<void>;
     setRecoverStatus: Dispatch<SetStateAction<boolean>>;
     setSeedType: Dispatch<SetStateAction<"55chars" | "24words">>;
     setMode: Dispatch<SetStateAction<ModeProps>>;
@@ -292,16 +292,18 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({
         }
     };
 
-    const fetchTradingInfoPage = async (): Promise<any> => {
+    const fetchTradingInfoPage = async (token?: string): Promise<any> => {
         setTradingPageLoading(true);
+        let _token = currentToken.value;
+        if (token) _token = token;
         let orders;
         try {
             const resp = await axios.post(`${SERVER_URL}/api/trading-page-info`, {
-                token: currentToken.value
+                token: _token
             });
-            console.log(resp.data, 'fffffffffffffffffffffffff')
+            console.log(resp.data, _token, 'fffffffffffffffffffffffff')
             if (resp.data.error) {
-                console.log(resp.data, currentToken);
+                console.log(resp.data, _token);
             } else {
                 orders = resp.data;
             }
@@ -385,6 +387,9 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({
         newSocket.on('txSocketStatus', (data) => {
             console.log('txSocketStatus', data);
             setTxSocketStatus(data);
+            if (data.txStatus.status) {
+                fetchTradingInfoPage(data.currentToken);
+            }
         })
 
         return () => {

diff --git a/app/client/src/pages/Trading/TradingAside.tsx b/app/client/src/pages/Trading/TradingAside.tsx
@@ -35,7 +35,7 @@ const TradingAside = ({ options, quantity, price, setQuantity, setPrice, setComm
             toast.error('Input valid quantity or price.');
             return false;
         }
-        if (command == 'buy' && tokenBalances['QU'][currentAddress] < parseInt(price)) {
+        if (command == 'buy' && tokenBalances['QU'][currentAddress] < parseInt(price) * parseInt(quantity)) {
             toast.error('Not enough QU balance');
             return false;
         }

diff --git a/qshared/qhelpers.c b/qshared/qhelpers.c
@@ -33,6 +33,8 @@ struct issuerpub ASSETS[] =
     { "QTRY" },
     { "RANDOM" },
     { "QUTIL" },
+    { "MLM" },
+    { "QPOOL" },
     { "QFT", "TFUYVBXYIYBVTEMJHAJGEJOOZHJBQFVQLTBBKMEHPEVIZFXZRPEYFUWGTIWG" },
     { "QWALLET", "QWALLETSGQVAGBHUCVVXWZXMBKQBPQQSHRYKZGEJWFVNUFCEDDPRMKTAUVHA" },
     { "TEST", "LIYVCGRCGBDMKCPOBSXRJLKFPTABHMQSVWOATAMVGFCTSXXJZZTMLOGCSEKB" },