feat: add mirror working with corrected logic

Datalayer-Storage · Mar 13, 2024 · 6204175 · 6204175
1 parent 65890dd
commit 6204175
Show file tree

Hide file tree

Showing 7 changed files with 209 additions and 179 deletions.
diff --git a/src/handles/datalayer.handles.ts b/src/handles/datalayer.handles.ts
@@ -73,20 +73,20 @@ export async function mountDatalayerRpcHandles() {
       };
     }
 
+    const totalTransactionWithUsageFee =
+      addMirrorParams.amount + parseInt(addMirrorParams.fee) + xchToMojos(fixedFeeXch);
+    if (getWalletBalanceResponse?.wallet_balance?.spendable_balance > totalTransactionWithUsageFee){
+      sendFixedFee(network, spendableCoins.confirmed_records.length);
+    }
+
+    await new Promise(ignore => setTimeout(ignore, 1000));
+
     const addMirrorPromise = datalayer.addMirror(addMirrorParams, {
       ...options,
       waitForWalletAvailability: false,
       includeFee: false
     });
-
-    const totalTransactionWithUsageFee = parseInt(addMirrorParams.fee) + xchToMojos(fixedFeeXch);
-
-    const addMirrorResult = await addMirrorPromise;
-    if (addMirrorResult?.success &&
-      (getWalletBalanceResponse?.wallet_balance?.spendable_balance > totalTransactionWithUsageFee)){
-      sendFixedFee(network, spendableCoins.confirmed_records.length);
-    }
-
+    console.log('#######', addMirrorPromise);
     return addMirrorPromise;
   });
 
@@ -126,17 +126,17 @@ export async function mountDatalayerRpcHandles() {
         };
       }
 
-      const createStorePromise = datalayer.createDataStore(createDataStoreParams, {
-        ...options,
-        waitForWalletAvailability: false
-      });
-
-      const createStoreResult = await createStorePromise;
-      if (createStoreResult?.success){
+      const totalTransactionWithUsageFee = parseInt(createDataStoreParams.fee) + xchToMojos(fixedFeeXch);
+      if (getWalletBalanceResponse?.wallet_balance?.spendable_balance > totalTransactionWithUsageFee){
         sendFixedFee(network, spendableCoins.confirmed_records.length);
       }
-
-      return createStorePromise;
+      setTimeout(() => {
+        return datalayer.createDataStore(createDataStoreParams, {
+          ...options,
+          waitForWalletAvailability: false,
+          includeFee: false
+        });
+      }, 1000);
     },
   );
 
@@ -169,7 +169,12 @@ export async function mountDatalayerRpcHandles() {
       };
     }
 
-    return datalayer.deleteMirror(deleteMirrorParams, options);
+    console.log('********', deleteMirrorParams)
+    return datalayer.deleteMirror(deleteMirrorParams, {
+      ...options,
+      waitForWalletAvailability: false,
+      includeFee: false
+    });
   });
 
   ipcMain.handle('datalayerGetKeys', (_, getKeysParams: GetKeysParams, options: Options) => {

diff --git a/src/renderer/api/getUserIp/index.ts → src/renderer/api/datalayerStorage/index.ts b/src/renderer/api/getUserIp/index.ts → src/renderer/api/datalayerStorage/index.ts
diff --git a/src/renderer/api/index.ts b/src/renderer/api/index.ts
@@ -1,2 +1,2 @@
 export * from './ipc';
-export * from './getUserIp';
+export * from './datalayerStorage';
diff --git a/src/renderer/components/blocks/modals/AddMirrorErrorModal/AddMirrorErrorModal.tsx b/src/renderer/components/blocks/modals/AddMirrorErrorModal/AddMirrorErrorModal.tsx
@@ -2,14 +2,14 @@ import React from "react";
 import { Modal } from "flowbite-react";
 import {FormattedMessage} from "react-intl";
 
-interface AddSubscriptionErrorModalProps {
+interface AddMirrorErrorModalProps {
   showModal: boolean;
   setShowModal: (showModal: boolean) => void;
   errorMessage?: string;
 }
 
-const AddMirrorErrorModal: React.FC<AddSubscriptionErrorModalProps> = (
-  { showModal, setShowModal, errorMessage}: AddSubscriptionErrorModalProps) => {
+const AddMirrorErrorModal: React.FC<AddMirrorErrorModalProps> = (
+  { showModal, setShowModal, errorMessage}: AddMirrorErrorModalProps) => {
 
   return (
     <Modal show={showModal} onClose={() => setShowModal(false)}>
@@ -20,16 +20,16 @@ const AddMirrorErrorModal: React.FC<AddSubscriptionErrorModalProps> = (
         <div className="space-y-6">
           <p className="text-base leading-relaxed text-gray-500 dark:text-gray-400">
             {
-              errorMessage || <FormattedMessage id="error-occurred-while-adding-mirror"/>
+              errorMessage || <FormattedMessage id="an-error-occurred-while-adding-the-mirror"/>
             }
           </p>
-          <div className="space-y-2">
+          <div className="space-y-1">
             <p className="text-base leading-relaxed text-gray-500 dark:text-gray-400">
               <FormattedMessage id={'confirm-entered-store-id-is-correct-and-references-a-valid-store'}/>
+            </p>
             <p className="text-base leading-relaxed text-gray-500 dark:text-gray-400">
               <FormattedMessage id="ensure-chia-services-are-running-and-accessible"/>
             </p>
-            </p>
           </div>
         </div>
       </Modal.Body>