Merge pull request #1382 from madfish-solutions/v3.4.1

Merge pull request #1380 from madfish-solutions/main

craco.config.js

@@ -9,7 +9,9 @@ module.exports = {
     plugins: [
       'babel-plugin-transform-typescript-metadata',
       ['@babel/plugin-proposal-decorators', { legacy: true }],
-      ['@babel/plugin-proposal-class-properties', { loose: true }]
+      ['@babel/plugin-proposal-class-properties', { loose: true }],
+      ['@babel/plugin-transform-private-property-in-object', { loose: true }],
+      ['@babel/plugin-transform-private-methods', { loose: true }]
     ],
     loaderOptions: babelLoaderOptions => {
       return babelLoaderOptions;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "quipuswap-webapp-2",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "private": true,
   "scripts": {
     "pre-build": "node -v && npm -v && yarn -v && node ./scripts/build.js",

src/modules/liquidity/pages/liquidity/hooks/helpers/find-dex.ts

@@ -0,0 +1,53 @@
+import {
+  chooseDex,
+  ContractOrAddress,
+  DexNotFoundError,
+  Factories,
+  FoundDex,
+  isFA2Token,
+  Token as QuipuswapSdkToken,
+  toContract,
+  toContractAddress
+} from '@quipuswap/sdk';
+import { TezosToolkit } from '@taquito/taquito';
+
+import { resolveOrNull } from '@shared/helpers';
+
+export async function findDex(
+  tezos: TezosToolkit,
+  { fa1_2Factory, fa2Factory }: Factories,
+  token: QuipuswapSdkToken
+): Promise<FoundDex> {
+  let factories = isFA2Token(token) ? fa2Factory : fa1_2Factory;
+  if (!Array.isArray(factories)) {
+    factories = [factories];
+  }
+
+  const tokenAddress = toContractAddress(token.contract);
+  const t2dexQuery = isFA2Token(token) ? [tokenAddress, token.id] : tokenAddress;
+
+  const dexes: FoundDex[] = [];
+  await Promise.all(
+    factories.map(async factory => {
+      const facContract = await toContract(tezos, factory);
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const facStorage = await facContract.storage<any>();
+      const dexAddress = await resolveOrNull(facStorage.token_to_exchange.get(t2dexQuery));
+
+      if (dexAddress) {
+        const dexContract = await toContract(tezos, dexAddress as ContractOrAddress);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const dexStorage = await dexContract.storage<any>();
+        dexes.push(new FoundDex(dexContract, dexStorage));
+      }
+    })
+  );
+
+  if (dexes.length > 1) {
+    return dexes.sort(chooseDex)[0];
+  } else if (dexes.length === 1) {
+    return dexes[0];
+  } else {
+    throw new DexNotFoundError();
+  }
+}

src/modules/liquidity/pages/liquidity/hooks/helpers/load-tez-dex.ts

@@ -1,9 +1,10 @@
-import { findDex, FoundDex, Token as QuipuswapSdkToken } from '@quipuswap/sdk';
+import { FoundDex, Token as QuipuswapSdkToken } from '@quipuswap/sdk';
 import { TezosToolkit } from '@taquito/taquito';
 
 import { FACTORIES } from '@config/config';
 import { Nullable, SupportedNetworks, Token } from '@shared/types';
 
+import { findDex } from './find-dex';
 import { findNotTezToken } from '../../liquidity-cards/helpers';
 
 export const loadTezDex = async ({

src/modules/stableswap/api/blockchain/stabledividends/get-staker-info.api.ts

@@ -3,7 +3,7 @@ import BigNumber from 'bignumber.js';
 
 import { DEFAULT_STABLESWAP_POOL_ID, STABLESWAP_DIVIDENDS_ACCUM_PRECISION, ZERO_AMOUNT } from '@config/constants';
 import { getStorageInfo } from '@shared/dapp/get-storage-info';
-import { isExist, isNull, toArray } from '@shared/helpers';
+import { isExist, isNull, resolveOrNull, toArray } from '@shared/helpers';
 import { nat, Nullable } from '@shared/types';
 
 import { earningsMapSchema, rewardMapSchema } from '../../../schemas/get-staker-info.schemas';
@@ -49,7 +49,9 @@ const getSinglePoolStakerInfo = async (
 ) => {
   const { storage } = await getStorageInfo<StableswapStorage>(tezos, contractAddress);
   const { pools, stakers_balance } = storage;
-  const stakerAccum = (await stakers_balance.get([accountPkh, poolId])) ?? {
+  const _stakerAccum = await resolveOrNull(stakers_balance.get([accountPkh, poolId]));
+
+  const stakerAccum = _stakerAccum ?? {
     balance: new BigNumber(ZERO_AMOUNT),
     earnings: new MichelsonMap<nat, EarningsValue>(earningsMapSchema)
   };

src/shared/helpers/index.ts

@@ -72,3 +72,4 @@ export * from './math';
 export * from './get-precentage-from-number';
 export * from './set-caret-position';
 export * from './can-use-three-route-api';
+export * from './resolve-or-null';

src/shared/helpers/resolve-or-null.ts

@@ -0,0 +1,7 @@
+export const resolveOrNull = async <T>(value: Promise<T>): Promise<T | null> => {
+  try {
+    return await value;
+  } catch (e) {
+    return null;
+  }
+};