chore: merge latest of develop

Psychedelic · Jul 12, 2022 · 52e324e · 52e324e
2 parents 06f465f + d2a1438
commit 52e324e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/.scripts/kyasshu/start.sh b/.scripts/kyasshu/start.sh
@@ -5,7 +5,7 @@
 host=$1
 
 if [[ -z $host || "$host" == "local" ]]; then
-  export CAP_ID=$(cd nft-marketplace/cap && dfx canister id ic-history-router)
+  export CAP_ID=$(cd nft-marketplace/cap && dfx canister id cap-router)
   export MARKETPLACE_CANISTER_ID=$(cd nft-marketplace && dfx canister id marketplace)
   export NFT_CANISTER_ID=$(cd nft-marketplace/crowns && dfx canister id crowns)
   export NFT_CANISTER_STANDARD='DIP721v2'

diff --git a/.scripts/start.sh b/.scripts/start.sh
@@ -10,7 +10,7 @@ if [[ $env == "development" ]]; then
   MKP_ID=$(cd nft-marketplace && dfx canister id marketplace)
   CROWNS_ID=$(cd nft-marketplace/crowns && dfx canister id crowns)
   WICP_ID=$(cd nft-marketplace/wicp && dfx canister id wicp) 
-  CAP_ID=$(cd nft-marketplace/cap && dfx canister id ic-history-router)
+  CAP_ID=$(cd nft-marketplace/cap && dfx canister id cap-router)
 
   printf "🤖 Marketplace id (%s), CrownsId (%s), WicpId (%s), CapId (%s)\n" "$MKP_ID" "$CROWNS_ID" "$WICP_ID" "$CAP_ID"
 

diff --git a/src/components/core/accordions/offer-accordion.tsx b/src/components/core/accordions/offer-accordion.tsx
@@ -80,6 +80,7 @@ const OnConnected = ({
 }: ConnectedProps) => {
   const { id } = useParams();
   const dispatch = useAppDispatch();
+  const [loadingOffers, setLoadingOffers] = useState<boolean>(true);
   const { principalId: plugPrincipalId } = usePlugStore();
 
   const recentlyAcceptedOffers = useSelector(
@@ -108,10 +109,6 @@ const OnConnected = ({
     [id, tokenOffers, plugPrincipalId],
   );
 
-  const offersLoaded = useSelector(
-    (state: RootState) => state.marketplace.offersLoaded,
-  );
-
   useEffect(() => {
     // TODO: handle the error gracefully when there is no id
     if (!id || !plugPrincipalId) return;
@@ -120,6 +117,10 @@ const OnConnected = ({
       marketplaceActions.getTokenOffers({
         ownerTokenIdentifiers: [BigInt(id)],
 
+        onSuccess: () => {
+          setLoadingOffers(false);
+        },
+
         onFailure: () => {
           // TODO: handle failure messages
         },
@@ -149,7 +150,7 @@ const OnConnected = ({
         <MakeOfferModal
           isNFTListed={isListed}
           isTriggerVisible={Boolean(
-            showNonOwnerButtons && !offersLoaded && !userMadeOffer,
+            showNonOwnerButtons && !loadingOffers && !userMadeOffer,
           )}
         />
       </ButtonDetailsWrapper>
@@ -159,11 +160,11 @@ const OnConnected = ({
           isNFTListed={isListed}
           offerPrice={userMadeOffer?.price}
           isTriggerVisible={Boolean(
-            showNonOwnerButtons && !offersLoaded && userMadeOffer,
+            showNonOwnerButtons && !loadingOffers && userMadeOffer,
           )}
         />
       </ButtonDetailsWrapper>
-      {showNonOwnerButtons && !offersLoaded && userMadeOffer && (
+      {showNonOwnerButtons && !loadingOffers && userMadeOffer && (
         <ButtonDetailsWrapper>
           <CancelOfferModal
             item={userMadeOffer?.item}
@@ -192,17 +193,14 @@ export const OfferAccordion = ({
   const { t } = useTranslation();
   const { id } = useParams();
   const dispatch = useAppDispatch();
+  const [loadingOffers, setLoadingOffers] = useState<boolean>(true);
   // TODO: On loading and awaiting for token offers response
   // should display a small loader in the place of price
   const [isAccordionOpen, setIsAccordionOpen] = useState(true);
   const [marketPrice, setMarketPrice] = useState<
     string | undefined
   >();
 
-  const offersLoaded = useSelector(
-    (state: RootState) => state.marketplace.offersLoaded,
-  );
-
   const {
     isConnected,
     principalId: plugPrincipal,
@@ -226,6 +224,10 @@ export const OfferAccordion = ({
       marketplaceActions.getTokenOffers({
         ownerTokenIdentifiers: [BigInt(id as string)],
 
+        onSuccess: () => {
+          setLoadingOffers(false);
+        },
+
         onFailure: () => {
           // TODO: handle failure messages
         },
@@ -298,7 +300,7 @@ export const OfferAccordion = ({
                 <OfferLabel>
                   {t('translation:accordions.offer.header.topOffer')}
                 </OfferLabel>
-                {(!offersLoaded && (
+                {(!loadingOffers && (
                   <OfferPrice>
                     {(topOffer?.price &&
                       `${parseE8SAmountToWICP(