Added request at home render, removed validation on empty collections…

… for loading (#218)

source/Popup/Views/Home/index.jsx

@@ -1,13 +1,13 @@
 import React, { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import {
   Actions, Tokens, Activity, Apps, Layout, useRouter, NFTs,
 } from '@components';
 import { Tabs } from '@ui';
 import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
 import getICPPrice from '@shared/services/ICPPrice';
-import { setAccountInfo } from '@redux/wallet';
+import { setAccountInfo, setCollections, setCollectionsLoading } from '@redux/wallet';
 import { setICPPrice } from '@redux/icp';
 
 const getTabs = (t) => [
@@ -33,6 +33,7 @@ const Home = () => {
   const { t } = useTranslation();
   const dispatch = useDispatch();
   const { navigator, tabIndex } = useRouter();
+  const { walletNumber } = useSelector((state) => state.wallet);
 
   const onChangeTab = (index) => {
     navigator.navigate('home', index);
@@ -53,6 +54,14 @@ const Home = () => {
       console.warn(err);
     }
 
+    sendMessage({
+      type: HANDLER_TYPES.GET_NFTS,
+      params: { refresh: true },
+    }, (nftCollections) => {
+      dispatch(setCollections({ collections: nftCollections, walletNumber }));
+      dispatch(setCollectionsLoading(false));
+    });
+
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} },
       (state) => {
         if (!state?.wallets?.length) {

source/components/NFTs/index.jsx

@@ -12,12 +12,12 @@ const NFTs = () => {
   const dispatch = useDispatch();
 
   const { collections, collectionsLoading, walletNumber } = useSelector((state) => state.wallet);
-  const [loading, setLoading] = useState(true);
+  const [loading, setLoading] = useState(collectionsLoading);
 
   useEffect(() => {
     sendMessage({
       type: HANDLER_TYPES.GET_NFTS,
-      params: { refresh: true },
+      params: {},
     }, (nftCollections) => {
       dispatch(setCollections({ collections: nftCollections, walletNumber }));
       dispatch(setCollectionsLoading(false));
@@ -29,7 +29,7 @@ const NFTs = () => {
   }, [collectionsLoading]);
 
   return (
-    <LoadingWrapper loading={!collections.length && loading} className="big">
+    <LoadingWrapper loading={loading} className="big">
       {
         !collections?.length
           ? <EmptyState />