various small fixes

Kredeum · May 14, 2024 · 436e45d · 436e45d
1 parent 09817f4
commit 436e45d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 23 deletions.
diff --git a/common/src/common/local.ts b/common/src/common/local.ts
@@ -33,5 +33,5 @@ export {
   localStorageKey,
   localStorageInit,
   localStorageRemove,
-  localStorageClear,
+  localStorageClear
 };
diff --git a/skale/src/skaleReceiveFunds.ts b/skale/src/skaleReceiveFunds.ts
@@ -61,7 +61,7 @@ const _rmBytesSymbol = (address: string) => address.replace(/^0x/, "");
 ////////////////////////////////////////////////
 const receiveFunds = async (account: string, chainId: number): Promise<TransactionReceipt | undefined> => {
   if (!isSkaleChain(chainId)) {
-    console.info("@kredeum/Skale receiveFunds : ", "Not on a Skale chain, no sFuel to claim");
+    // console.log("@kredeum/Skale receiveFunds : ", "Not on a Skale chain, no sFuel to claim");
     return;
   }
   if (!account) throw new Error("@kredeum/Skale receiveFunds : No account provided");
@@ -100,12 +100,12 @@ const receiveFunds = async (account: string, chainId: number): Promise<Transacti
   const hash = await walletClient.sendRawTransaction({
     serializedTransaction: signedTx
   });
-  console.info("@kredeum/Skale receiveFunds - Tx ~ hash: ", `${hash} => ${scaleFaucets[chainId].explorer}/tx/${hash}`);
+  console.info("@kredeum/Skale receiveFunds - TxHash: ", `${hash} => ${scaleFaucets[chainId].explorer}/tx/${hash}`);
 
   const transactionReceipt = await publicClient.waitForTransactionReceipt({
     hash: hash
   });
-  console.info("@kredeum/Skale receiveFunds - TransactionReceipt:", transactionReceipt);
+  console.info("@kredeum/Skale receiveFunds - TxReceipt:", transactionReceipt);
 
   return transactionReceipt;
 };

diff --git a/svelte/src/components/Global/Create.svelte b/svelte/src/components/Global/Create.svelte
@@ -9,13 +9,13 @@
   //  <Create {chainId} {signer} />
   // Create Collection or Nft
   /////////////////////////////////////////////////
-  export let chainId: number | undefined = undefined;
-  export let signer: string | undefined = undefined;
+  export let chainId: number;
+  export let signer: string;
 
   let open = false;
   const toggle = () => (open = !open);
 
-  $: mint = signer && networks.getCreate(chainId);
+  $: mint = networks.getCreate(chainId);
 </script>
 
 <a href="#create-modal" class="btn btn-default" title="Mint" id="addPopup"><i class="fas fa-plus fa-left" />Add</a>
@@ -61,18 +61,16 @@
   </div>
 </div>
 
-{#if chainId && signer}
-  <!-- SubModal create NFT -->
-  {#if open}
-    <NftMintPopup {chainId} {signer} {toggle} />
-  {/if}
-
-  <!-- SubModal create collection  -->
-  <div id="add-collection" class="modal-window">
-    <CollectionCreate {chainId} {signer} />
-  </div>
+<!-- SubModal create NFT -->
+{#if open}
+  <NftMintPopup {chainId} {signer} {toggle} />
 {/if}
 
+<!-- SubModal create collection  -->
+<div id="add-collection" class="modal-window">
+  <CollectionCreate {chainId} {signer} />
+</div>
+
 <style>
   .add-collection-address {
     margin-top: 8rem;

diff --git a/svelte/src/components/Main/Dapp.svelte b/svelte/src/components/Main/Dapp.svelte
@@ -129,7 +129,9 @@
   <span slot="header">
     <Title />
 
-    <Create {chainId} />
+    {#if $metamaskSignerAddress}
+      <Create {chainId} signer={$metamaskSignerAddress} />
+    {/if}
 
     <div class="row alignbottom">
       <div class="col col-xs-12 col-sm-3 kre-copy-ref-container">

diff --git a/svelte/src/components/Nft/NftMintPopup.svelte b/svelte/src/components/Nft/NftMintPopup.svelte
@@ -21,8 +21,6 @@
   import { getSupportedImage, getMediaSelection } from "../../helpers/mediaTypes";
   import { defaultAudioCoverImg } from "../../helpers/defaultCoverImage";
 
-  import { metamaskSignerAddress, metamaskProvider } from "../../stores/metamask";
-
   import CollectionSelect from "../Collection/CollectionSelect.svelte";
   import InputPrice from "../Input/InputPrice.svelte";
   import InputAudioMint from "../Input/InputAudioMint.svelte";
@@ -124,7 +122,7 @@
   };
 
   let collection: CollectionType;
-  $: chainId && address && $metamaskProvider && handleDefaultAutomarketValues();
+  $: chainId && address && signer && handleDefaultAutomarketValues();
   const handleDefaultAutomarketValues = async () => {
     if (!(chainId && address)) return;
 
@@ -422,7 +420,7 @@
             </div>
           {/if}
 
-          {#if collectionIsAutoMarket(collection) && collectionOpenOrOwner(collection, $metamaskSignerAddress)}
+          {#if collectionIsAutoMarket(collection) && collectionOpenOrOwner(collection, signer)}
             <div class="section">
               <div class="titre">NFT Sell Price</div>
               <InputPrice {chainId} bind:price={inputPrice} error={inputPriceError} />

diff --git a/sveltekit/tests/mint.spec.ts b/sveltekit/tests/mint.spec.ts
@@ -18,6 +18,6 @@ test.only("mint one NFT", async ({ page }) => {
 
   await page.locator("#mintNft").click();
   await page.screenshot({ path: "./test-results/screenshot.png" });
-  await page.pause();
+  // await page.pause();
   await metamask.confirmTransaction();
 });