fix: conflict

api/get-account-meme.ts

@@ -1,4 +1,4 @@
-import { getAssetsMEMEDetailed } from "../store";
+import { getAssetsMEMEDetail } from "../store";
 
 import getBalance from "./get-balance";
 import getPortfolioMEME from "./get-portfolio-meme";
@@ -9,7 +9,7 @@ const getAccountMEME = async () => {
   const account = await getAccountWallet();
   const { accountId } = account;
   if (accountId) {
-    const assets = await getAssetsMEMEDetailed();
+    const assets = await getAssetsMEMEDetail();
     const tokenIds = assets.map((asset) => asset.token_id);
     const shadowRecords = await getShadowRecords();
     let accountBalance = "0";

api/get-account.ts

@@ -1,4 +1,4 @@
-import { getAssetsDetailed } from "../store";
+import { getAssetsDetail } from "../store";
 
 import getBalance from "./get-balance";
 import getPortfolio from "./get-portfolio";
@@ -9,7 +9,7 @@ const getAccount = async () => {
   const account = await getAccountWallet();
   const { accountId } = account;
   if (accountId) {
-    const assets = await getAssetsDetailed();
+    const assets = await getAssetsDetail();
     const tokenIds = assets.map((asset) => asset.token_id);
     const shadowRecords = await getShadowRecords();
     let accountBalance = "0";

api/get-assets-meme.ts

@@ -1,5 +1,5 @@
 import Decimal from "decimal.js";
-import { getAllMetadata, getAssetsMEMEDetailed, getPrices, getUnitLptAssets } from "../store";
+import { getAllMetadata, getAssetsMEMEDetail, getPrices, getUnitLptAssets } from "../store";
 import { shrinkToken } from "../store/helper";
 import { lpTokenPrefix } from "../utils/config";
 import { IToken, IUnitLptAssetDetail, IMetadata } from "../interfaces/asset";
@@ -40,7 +40,7 @@ const getLptMetadata = (lp_token_details: IUnitLptAssetDetail, priceMap, metadat
 };
 
 const getAssetsMEME = async () => {
-  const assets = await getAssetsMEMEDetailed();
+  const assets = await getAssetsMEMEDetail();
   const token_ids_from_regular = assets
     .filter((asset) => asset.token_id.indexOf(lpTokenPrefix) === -1)
     .map((asset) => asset.token_id);

api/get-assets.ts

@@ -1,5 +1,5 @@
 import Decimal from "decimal.js";
-import { getAllMetadata, getAssetsDetailed, getPrices, getUnitLptAssets } from "../store";
+import { getAllMetadata, getAssetsDetail, getPrices, getUnitLptAssets } from "../store";
 import { shrinkToken } from "../store/helper";
 import { lpTokenPrefix, blackAssets } from "../utils/config";
 import { IToken, IUnitLptAssetDetail, IMetadata } from "../interfaces/asset";
@@ -40,9 +40,8 @@ const getLptMetadata = (lp_token_details: IUnitLptAssetDetail, priceMap, metadat
 };
 
 const getAssets = async () => {
-  const assetsPendng = await getAssetsDetailed();
-  // TODO for satoshi
-  const assets = assetsPendng.filter((asset) => asset.token_id.indexOf(lpTokenPrefix) === -1);
+  const assets_pending = await getAssetsDetail();
+  const assets = assets_pending.filter((asset) => !blackAssets.includes(asset.token_id));
   const token_ids_from_regular = assets
     .filter((asset) => asset.token_id.indexOf(lpTokenPrefix) === -1)
     .map((asset) => asset.token_id);

components/Header/MenuMobile.tsx

@@ -6,8 +6,8 @@ import { MenuButton, CloseIcon, ArrowRightIcon, ArrowTopRightIcon, ArrowDownIcon
 import { WrapperMenuMobile } from "./style";
 import { bridgeList } from "./Bridge";
 import { mainMenuList, helpMenu, Imenu } from "./menuData";
-import { toggleShowDust } from "../../redux/appSlice";
-import { getShowDust } from "../../redux/appSelectors";
+import { toggleShowDust } from "../../redux/marginTrading";
+import { getShowDust } from "../../redux/categorySelectors";
 import { useAppSelector, useAppDispatch } from "../../redux/hooks";
 import { DiscordIcon, MediumIcon, TwitterIcon } from "../Footer/svg";
 

components/Header/Set.tsx

@@ -1,8 +1,8 @@
 import { useState } from "react";
 import { twMerge } from "tailwind-merge";
 import { SetIcon } from "./svg";
-import { toggleShowDust } from "../../redux/appSlice";
-import { getShowDust } from "../../redux/appSelectors";
+import { toggleShowDust } from "../../redux/marginTrading";
+import { getShowDust } from "../../redux/categorySelectors";
 import { useAppSelector, useAppDispatch } from "../../redux/hooks";
 
 const Set = () => {

components/Table/common/cells.tsx

@@ -5,7 +5,8 @@ import { Box, Tooltip, Skeleton } from "@mui/material";
 import { USD_FORMAT, TOKEN_FORMAT, APY_FORMAT, DUST_FORMAT, NUMBER_FORMAT } from "../../../store";
 import type { IReward, UIAsset } from "../../../interfaces";
 import { useAppSelector } from "../../../redux/hooks";
-import { getDisplayAsTokenValue, getShowDust } from "../../../redux/appSelectors";
+import { getDisplayAsTokenValue } from "../../../redux/appSelectors";
+import { getShowDust } from "../../../redux/categorySelectors";
 import { Rewards } from "../../index";
 import { useFullDigits } from "../../../hooks/useFullDigits";
 

next.config.js

@@ -1,7 +1,7 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
-  reactStrictMode: true,
-  trailingSlash: true,
+  reactStrictMode: false,
+  trailingSlash: false,
   eslint: {
     ignoreDuringBuilds: true,
   },

redux/appSelectors.ts

@@ -114,11 +114,6 @@ export const getAppState = (memeCategory?) => {
   );
 };
 
-export const getShowDust = createSelector(
-  (state: RootState) => state.app,
-  (app) => app.showDust,
-);
-
 export const getShowTicker = createSelector(
   (state: RootState) => state.app,
   (app) => app.showTicker,

redux/appSlice.ts

@@ -30,7 +30,6 @@ export interface AppState {
   protocolStats: boolean;
   displayAsTokenValue: boolean;
   showTicker: boolean;
-  showDust: boolean;
   slimStats: boolean;
   showDailyReturns: boolean;
   fullDigits: {
@@ -80,7 +79,6 @@ export const initialState: AppState = {
   showInfo: true,
   protocolStats: true,
   displayAsTokenValue: true,
-  showDust: false,
   showTicker: false,
   slimStats: false,
   showDailyReturns: false,
@@ -174,9 +172,6 @@ export const appSlice = createSlice({
     toggleDisplayValues(state) {
       state.displayAsTokenValue = !state.displayAsTokenValue;
     },
-    toggleShowDust(state) {
-      state.showDust = !state.showDust;
-    },
     toggleSlimStats(state) {
       state.slimStats = !state.slimStats;
     },
@@ -245,7 +240,6 @@ export const {
   updateAmount,
   toggleUseAsCollateral,
   toggleDisplayValues,
-  toggleShowDust,
   toggleSlimStats,
   setFullDigits,
   toggleShowTicker,

redux/appSliceMEME.ts

@@ -30,7 +30,6 @@ export interface AppState {
   protocolStats: boolean;
   displayAsTokenValue: boolean;
   showTicker: boolean;
-  showDust: boolean;
   slimStats: boolean;
   showDailyReturns: boolean;
   fullDigits: {
@@ -80,7 +79,6 @@ export const initialState: AppState = {
   showInfo: true,
   protocolStats: true,
   displayAsTokenValue: true,
-  showDust: false,
   showTicker: false,
   slimStats: false,
   showDailyReturns: false,
@@ -174,9 +172,6 @@ export const appSliceMEME = createSlice({
     toggleDisplayValues(state) {
       state.displayAsTokenValue = !state.displayAsTokenValue;
     },
-    toggleShowDust(state) {
-      state.showDust = !state.showDust;
-    },
     toggleSlimStats(state) {
       state.slimStats = !state.slimStats;
     },
@@ -245,7 +240,6 @@ export const {
   updateAmount,
   toggleUseAsCollateral,
   toggleDisplayValues,
-  toggleShowDust,
   toggleSlimStats,
   setFullDigits,
   toggleShowTicker,

redux/categorySelectors.ts

@@ -14,3 +14,7 @@ export const getActiveCategory = createSelector(
     return category.activeCategory;
   },
 );
+export const getShowDust = createSelector(
+  (state: RootState) => state.category,
+  (app) => app.showDust,
+);

redux/marginTrading.ts

@@ -10,6 +10,7 @@ interface commonAssets {
   ReduxTotalPLN: any;
   ReduxRangeMount: any;
   ReduxActiveTab: string;
+  showDust: boolean;
 }
 
 const initialState: commonAssets = {
@@ -22,6 +23,7 @@ const initialState: commonAssets = {
   ReduxTotalPLN: 0,
   ReduxRangeMount: 1,
   ReduxActiveTab: "long",
+  showDust: false,
 };
 
 const marginCategory = createSlice({
@@ -55,6 +57,9 @@ const marginCategory = createSlice({
     setReduxActiveTab(state, action) {
       state.ReduxActiveTab = action.payload;
     },
+    toggleShowDust(state) {
+      state.showDust = !state.showDust;
+    },
   },
 });
 
@@ -68,6 +73,7 @@ const {
   setReduxTotalPLN,
   setReduxRangeMount,
   setReduxActiveTab,
+  toggleShowDust,
 } = marginCategory.actions;
 const marginCategoryReducer = marginCategory.reducer;
 export {
@@ -80,5 +86,6 @@ export {
   setReduxTotalPLN,
   setReduxRangeMount,
   setReduxActiveTab,
+  toggleShowDust,
 };
 export default marginCategoryReducer;