Merge pull request #352 from Kredeum/2fixes

2fixes
Kredeum · Apr 26, 2023 · e249ce3 · e249ce3
2 parents cb7721f + cb380b7
commit e249ce3
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 22 deletions.
diff --git a/svelte/components/Nft/NftBurn.svelte b/svelte/components/Nft/NftBurn.svelte
@@ -25,8 +25,6 @@
   let burnTxHash: string;
   let burnError: string;
 
-  let refreshAll: Writable<number> = getContext("refreshAll");
-
   const _burnError = (err: string): void => {
     burnError = err;
     console.error(burnError);
@@ -97,8 +95,6 @@
     burning = S5_BURNED;
 
     nftStoreRemove(chainId, address, tokenID);
-
-    $refreshAll += 1;
   };
 
   onMount(() => {

diff --git a/svelte/components/Nft/NftMintPopup.svelte b/svelte/components/Nft/NftMintPopup.svelte
@@ -76,8 +76,6 @@
 
   let account: string;
 
-  let refreshAll: Writable<number> = getContext("refreshAll");
-
   let address: string;
   let price: BigNumber;
 

diff --git a/svelte/components/Nft/NftSetPrice.svelte b/svelte/components/Nft/NftSetPrice.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Readable } from "svelte/store";
+  import { Readable } from "svelte/store";
 
   import { BigNumber, constants } from "ethers";
 
@@ -21,7 +21,7 @@
   import { setTokenPrice } from "@lib/nft/nft-automarket-set";
 
   import { metamaskSignerAddress } from "@stores/metamask";
-  import { nftStoreAndRefresh, nftStoreRefresh, nftStoreSet } from "@stores/nft/nft";
+  import { nftStoreAndRefresh, nftStoreRefresh } from "@stores/nft/nft";
 
   import InputPrice from "../Input/InputPrice.svelte";
   import NftIncomes from "./NftIncomes.svelte";
@@ -146,10 +146,7 @@
     tokenSettingPrice = S4_PRICE_SETTED;
     // console.log("tokenSetPriceTx S4", tokenSettingPrice);
 
-    // Set price to nft in store, as onchain data not yet updated
-    // TODO : make some nsfStoreRemoveAndRefresh() ?
-    $nft.price = price;
-    nftStoreSet($nft);
+    nftStoreRefresh(chainId, address, tokenID);
   };
 
   const removeFromSale = async (): Promise<void> => {

diff --git a/svelte/components/Nft/NftTransfer.svelte b/svelte/components/Nft/NftTransfer.svelte
@@ -16,7 +16,7 @@
   import { transferNft } from "@lib/nft/nft-transfer";
 
   import { metamaskChainId, metamaskSignerAddress } from "@stores/metamask";
-  import { nftStore, nftStoreRemove } from "@stores/nft/nft";
+  import { nftStore, nftStoreRefresh } from "@stores/nft/nft";
 
   import InputEthAddress from "../Input/InputEthAddress.svelte";
   import { nftRoyaltyMinimum } from "@lib/nft/nft";
@@ -32,7 +32,6 @@
   $: nft = nftStore(chainId, address, tokenID);
   /////////////////////////////////////////////////
 
-  let refreshAll: Writable<number> = getContext("refreshAll");
   let transfering: number;
   let transferTxHash: string;
   let transferError: string;
@@ -98,9 +97,7 @@
 
     transfering = S4_TRANSFERED;
 
-    nftStoreRemove(chainId, address, tokenID);
-
-    $refreshAll += 1;
+    nftStoreRefresh(chainId, address, tokenID);
   };
 
   onMount(() => {

diff --git a/svelte/helpers/shortcode.ts b/svelte/helpers/shortcode.ts
@@ -9,7 +9,7 @@ const shortcodeOpenSkyNft = (nft: NftType): string =>
     nft
   )}[/kredeum_opensky]`;
 
-const shortcodeOpenSky = (nft: NftType, coll: boolean): string =>
+const shortcodeOpenSky = (nft: NftType, coll = false): string =>
   coll ? shortcodeOpenSkyCollection(nft) : shortcodeOpenSkyNft(nft);
 
 export { shortcodeOpenSky, shortcodeOpenSkyNft, shortcodeOpenSkyCollection };
diff --git a/svelte/stores/nft/nft.ts b/svelte/stores/nft/nft.ts
@@ -35,13 +35,12 @@ const nftStoreRefresh = async (chainId: number, address: string, tokenID: string
   // console.log("nftStoreRefresh ~ _coll", _coll);
 
   try {
-    const _nftOld = get(nftListStore).get(keyNft(chainId, address, tokenID));
+    const _nftOld = get(nftListStore).get(keyNft(chainId, address, tokenID)) || {};
     const _nftLib = await nftGet(chainId, address, tokenID, _coll, true);
 
-    Object.assign(_nftLib, _nftOld);
+    const _nftNew = Object.assign(_nftOld, _nftLib);
 
-    // console.log("nftStoreRefresh _nftLib", _nftLib);
-    nftStoreSet(_nftLib);
+    nftStoreSet(_nftNew);
   } catch (err) {
     console.info("nftStoreRefresh known", err);
   }