Merge pull request #1387 from madfish-solutions/v3.4.3

V3.4.3

package.json

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

src/modules/farming/pages/item/helpers.ts

@@ -1,9 +1,13 @@
 import { ZERO_ADDRESS } from '@config/constants';
 import { FarmingItemV1Model } from '@modules/farming/models';
-import { isTezosToken } from '@shared/helpers';
-import { Optional, WhitelistedBaker } from '@shared/types';
+import { isTezosToken, unpackOption } from '@shared/helpers';
+import { Option, WhitelistedBaker } from '@shared/types';
+
+export const makeBaker = (delegateAddress: Option<string> | string, knownBakers: WhitelistedBaker[]) => {
+  if (typeof delegateAddress === 'object' && delegateAddress != null && 'Some' in delegateAddress) {
+    delegateAddress = unpackOption(delegateAddress);
+  }
 
-export const makeBaker = (delegateAddress: Optional<string>, knownBakers: WhitelistedBaker[]) => {
   if (typeof delegateAddress === 'string' && delegateAddress !== ZERO_ADDRESS) {
     return knownBakers.find(({ address }) => address === delegateAddress) ?? { address: delegateAddress };
   }

src/modules/liquidity/pages/cpmm-item/components/dex-two-details/use-dex-two-pool-current-baker.ts

@@ -29,7 +29,7 @@ export const useDexTwoPoolCurrentBaker = () => {
   const error = errorData ? new Error(errorData) : null;
 
   return {
-    currentBaker: { data: makeBaker(bakerAddress, bakers), loading: bakersLoading || bakerAddressLoading, error },
+    currentBaker: { data: makeBaker(bakerAddress!, bakers), loading: bakersLoading || bakerAddressLoading, error },
     canHaveBaker
   };
 };

src/modules/voting/helpers/get-candidate-info.ts

@@ -1,7 +1,7 @@
 import { FoundDex } from '@quipuswap/sdk';
 
-import { Nullable, WhitelistedBaker } from '@shared/types';
-
+import { unpackOption } from '@shared/helpers';
+import { Nullable, WhitelistedBaker, Option } from '@shared/types';
 export interface CandidateInfo {
   currentCandidate: Nullable<WhitelistedBaker>;
   secondCandidate: Nullable<WhitelistedBaker>;
@@ -14,7 +14,13 @@ export const getCandidateInfo = (dex: Nullable<FoundDex>, bakers: Array<Whitelis
       secondCandidate: null
     };
   }
-  const { current_delegated, current_candidate } = dex.storage.storage;
+  const { current_delegated: _current_delegated, current_candidate: _current_candidate } = dex.storage.storage as {
+    current_delegated: Option<string>;
+    current_candidate: Option<string>;
+  };
+
+  const current_delegated = unpackOption(_current_delegated)!;
+  const current_candidate = unpackOption(_current_candidate)!;
 
   const emptyCurrentDelegated = { address: current_delegated };
   const emptyCurrentCandidate = { address: current_candidate };