@berachain/berajs 0.1.2 → 0.2.1

package/src/actions/transactions/beraWriteContract.integration.test.ts

@@ -10,9 +10,14 @@ import {
 import { mnemonicToAccount } from "viem/accounts";
 import { assert, describe, expect, it } from "vitest";
 
-import { ChainId, getRpcUrls } from "@berachain/config/internal";
+import { appConfig, ChainId, getRpcUrls } from "@berachain/config/internal";
+import {
+  defaultChain,
+  externalChains,
+  transports,
+} from "@berachain/config/internal/wagmi";
 
-import { defaultBeraNetworkConfig, wagmiConfig } from "@berachain/wagmi/config";
+import { getConfig } from "@berachain/wagmi/config";
 
 import { bgtAbi } from "~/abi/pol/bgt";
 import { TransactionActionType } from "~/enum/txnEnum";
@@ -30,7 +35,14 @@ const testFn: IContractWriteFn = async (_args) => {
 };
 
 describe("beraWriteContract", () => {
-  const { config, chainId } = parseBaseArgs({});
+  const { config } = parseBaseArgs({ chainId: defaultChain.id });
+  const beraWagmiConfig = getConfig({
+    transports,
+    defaultChain,
+    chains: externalChains,
+    thirdweb: { clientId: appConfig.apiKeys.public.thirdweb },
+  });
+  const wagmiConfig = beraWagmiConfig.wagmi;
   const anvilMockAccount = mnemonicToAccount(anvilMnemonic);
 
   /**
@@ -41,13 +53,13 @@ describe("beraWriteContract", () => {
     [ChainId.BEPOLIA]: "0x0d283A8AFf77f4fb7B7A9EC78B09b26E083dA304",
   };
 
-  const wallet = valMap[chainId];
+  const wallet = valMap[defaultChain.id as ChainId];
 
-  const publicClient = getServerSidePublicClient();
+  const publicClient = getServerSidePublicClient({ chainId: defaultChain.id });
   const walletClient = createWalletClient({
     transport: http(getRpcUrls().publicJsonRpcUrl),
     account: anvilMockAccount,
-    chain: defaultBeraNetworkConfig.chain,
+    chain: defaultChain,
   });
 
   it("should have proper types", async () => {

package/src/actions/transactions/beraWriteContract.ts

@@ -3,6 +3,7 @@ import {
   getWalletClient,
   type SwitchChainErrorType,
   switchChain,
+  type WriteContractParameters,
 } from "@wagmi/core";
 import {
   type Abi,
@@ -29,7 +30,7 @@ import { InvalidArgumentError } from "~/errors/InvalidArgumentError";
 import { parseDecodedError, parseViemError } from "~/errors/parseViemError";
 import { RequestError } from "~/errors/RequestError";
 import { TransactionFailedError } from "~/errors/TransactionFailedError";
-import type { IContractWrite } from "~/types";
+import type { IContractWrite } from "~/types/global";
 import { DEFAULT_METAMASK_GAS_LIMIT } from "~/utils/constants";
 import { getTestClient } from "~/utils/getTestClient";
 import { seconds } from "~/utils/time";
@@ -570,7 +571,6 @@ export async function beraWriteContract<
           ? increaseByPercentage(gasEstimateResult.value, 10)
           : DEFAULT_METAMASK_GAS_LIMIT);
 
-      // @ts-expect-error nested type issues. Be careful when changing this.
       txHash = await walletClient.writeContract({
         ...simulationResult.value.request,
         chainId,
@@ -581,7 +581,7 @@ export async function beraWriteContract<
             onWarning?.(e, args);
           },
         }),
-      });
+      } as WriteContractParameters);
       onSubmission?.({ txHash }, args);
     } else {
       const [nonceResult] = await Promise.allSettled([noncePromise]);

package/src/actions/validators/getUserActiveValidators.ts

@@ -1,5 +1,4 @@
-import type { GetPublicClientReturnType } from "@wagmi/core";
-import type { Address } from "viem";
+import type { Address, PublicClient } from "viem";
 
 import type {
   ApiValidatorFragment,
@@ -26,7 +25,7 @@ export async function getUserActiveValidators({
   ...args
 }: {
   account: string;
-  publicClient?: GetPublicClientReturnType;
+  publicClient?: PublicClient | undefined;
   chain?: GqlChain;
 } & BeraJS.BaseFunctionArgs): Promise<ValidatorWithUserBoost[] | undefined> {
   const { config } = parseBaseArgs(args);

package/src/actions/validators/getUserBoostsOnValidator.ts

@@ -1,5 +1,4 @@
-import type { GetPublicClientReturnType } from "@wagmi/core";
-import { type Address, formatEther } from "viem";
+import { type Address, formatEther, type PublicClient } from "viem";
 
 import { bgtAbi } from "~/abi/pol/bgt";
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
@@ -23,7 +22,7 @@ export async function getUserBoostsOnValidator({
 }: {
   account: Address;
   pubkey: Address;
-  publicClient: GetPublicClientReturnType;
+  publicClient: PublicClient | undefined;
 } & BeraJS.BaseFunctionArgs): Promise<UserBoostsOnValidator> {
   const { config } = parseBaseArgs(args);
 

package/src/contexts/BeraFlags/defaultFlags.ts

@@ -11,9 +11,11 @@ export type BeraFlags = Record<
     | "enableEip5792"
     | "proxyAggregatorsThroughVercel"
     | "isEmbeddedWalletsEnabled"
+    | "sponsorGas"
     | "enableSimulateCalls"
     | "isBendVaultDataHourly"
     | "isMultiChainZapBendEnabled"
+    | "isZapStakeBeraEnabled"
     | "mockValidatorOperator"
     | "mockValidatorRewardAllocator"
     | "mockRewardDurationManager"
@@ -31,9 +33,11 @@ export const defaultFlags: BeraFlags = {
   enableEip5792: false,
   proxyAggregatorsThroughVercel: false,
   isEmbeddedWalletsEnabled: true,
+  sponsorGas: false,
   enableSimulateCalls: false,
   isBendVaultDataHourly: true,
   isMultiChainZapBendEnabled: false,
+  isZapStakeBeraEnabled: false,
   mockValidatorOperator: false,
   mockValidatorRewardAllocator: false,
   mockRewardDurationManager: false,

package/src/contexts/SwrFallback.tsx

@@ -1,8 +1,10 @@
 import type React from "react";
 import { useEffect } from "react";
-import * as Sentry from "@sentry/nextjs";
 import { SWRConfig } from "swr";
 
+import { BeraError } from "~/errors/BeraError";
+import { BeraMonitoring } from "~/errors/BeraMonitoring";
+
 export function SWRFallback({
   fallback,
   children,
@@ -14,8 +16,16 @@ export function SWRFallback({
     Object.entries(fallback).some(([key, value]) => {
       if (!key) {
         console.warn("SWRFallback", key, value);
-        Sentry.captureException(
-          "Empty key in SWRFallback. This will lead to wrong query returns when key is null. Should be reported to SWR.",
+        BeraMonitoring.captureException(
+          new BeraError({
+            message:
+              "Empty key in SWRFallback. This will lead to wrong query returns when key is null. Should be reported to SWR.",
+            level: "warning",
+            extra: {
+              key,
+              value,
+            },
+          }),
         );
         return true;
       } else return false;

package/src/contexts/TokensProvider.tsx

@@ -1,8 +1,12 @@
 import { createContext, type PropsWithChildren, useMemo } from "react";
 
-import { defaultChainId } from "@berachain/config/internal";
+import {
+  type EdgeConfigSchema,
+  isFlagEnabled,
+} from "@berachain/config/internal/edge-config";
 
-import type { Token, TokenWithMetadata } from "~/types/dex";
+import { useEnsoUserTokensWithBalances } from "~/hooks/enso/useEnsoUserTokensWithBalances";
+import type { BalanceToken, Token, TokenWithMetadata } from "~/types/dex";
 import { formatTokenList } from "~/utils/formatTokenList";
 
 export interface TokensProviderContext {
@@ -11,7 +15,10 @@ export interface TokensProviderContext {
   featuredTokens: TokenWithMetadata[];
   onRemoveToken: (token: Token) => void;
   onAddToken: (token: Token) => void;
+  refresh: () => void;
+  ensoTokens: BalanceToken[] | undefined;
 }
+
 export const TokenContext = createContext<TokensProviderContext | undefined>(
   undefined,
 );
@@ -19,7 +26,7 @@ export const TokenContext = createContext<TokensProviderContext | undefined>(
 export interface TokensProviderProps
   extends Omit<
     TokensProviderContext,
-    "tokenList" | "onAddToken" | "featuredTokens"
+    "tokenList" | "onAddToken" | "featuredTokens" | "ensoTokens"
   > {
   onAddToken: (
     token: Token,
@@ -30,34 +37,54 @@ export interface TokensProviderProps
     },
   ) => void;
   defaultTokens: TokenWithMetadata[];
+  edgeConfigTokenList: EdgeConfigSchema["tokens"];
 }
 
 export function TokensProvider({
   children,
   defaultTokens,
+  edgeConfigTokenList,
   userTokens,
   onAddToken,
   onRemoveToken,
-}: PropsWithChildren<TokensProviderProps>) {
+}: PropsWithChildren<Omit<TokensProviderProps, "refresh">>) {
+  const { data: ensoTokens, refresh } = useEnsoUserTokensWithBalances();
+
   const { tokenList = [], featuredTokenList = [] } = useMemo(
     () =>
       formatTokenList({
-        defaultTokenList: defaultTokens,
-        externalList: userTokens,
-        chainId: defaultChainId,
+        defaultTokenList: [
+          ...defaultTokens,
+          ...(edgeConfigTokenList?.filter((token) =>
+            isFlagEnabled(token.enabled),
+          ) as TokenWithMetadata[]),
+        ],
+        externalList: [
+          ...userTokens,
+          ...(ensoTokens ?? []).map((t) => ({
+            ...t,
+            balance: undefined,
+            price: undefined,
+          })),
+        ],
       }),
-    [defaultTokens, userTokens],
+    [defaultTokens, userTokens, edgeConfigTokenList, ensoTokens],
   );
+
   return (
     <TokenContext.Provider
       value={{
         tokenList,
         userTokens,
         featuredTokens: featuredTokenList,
+        ensoTokens,
         onAddToken(tk) {
           onAddToken(tk, { defaultTokens, userTokens, tokenList });
         },
         onRemoveToken,
+        refresh: () => {
+          refresh();
+        },
       }}
     >
       {children}

package/src/contexts/block-time-provider.tsx

@@ -1,6 +1,6 @@
 import { createContext, type PropsWithChildren, useContext } from "react";
 
-import mainnet from "@berachain/config/mainnet";
+import { mainnet } from "@berachain/config/mainnet";
 
 import { parseBaseArgs } from "~/utils/parseBaseArgs";
 

package/src/contexts/{index.ts → exports.ts}

@@ -7,7 +7,6 @@ export {
   useBeraFlags,
 } from "./BeraFlags/BeraFlags";
 export * from "./BexStatusProvider";
-export * from "./berajsProvider";
 export * from "./block-time-provider";
 export * from "./HoneyConfigProvider";
 export * from "./SwrFallback";

package/src/data/contracts.ts

@@ -142,6 +142,21 @@ export const contracts = [
     "80094": "0xb5f2000b5744f207c931526cAE2134cAa8b6862a",
     name: "pol.timelock",
   },
+  {
+    "80069": "0x176c081E95C82CA68DEa20CA419C7506Aa063C24",
+    "80094": "0xb79b43dBA821Cb67751276Ce050fF4111445fB99",
+    name: "stakingPools.stakingPoolContractsFactory",
+  },
+  {
+    "80069": "0x8b472791aC2f9e9Bd85f8919401b8Ce3bdFd464c",
+    "80094": "0xAd17932a5B1aaeEa73D277a6AE670623F176E0D0",
+    name: "stakingPools.delegationHandlerFactory",
+  },
+  {
+    "80069": "0xAFAc2f11Cb39F0521b22494F6101002ce653D2f4",
+    "80094": "0xE858802Ed532C6DAD2D196AB5B1F2C15F9cb52b4",
+    name: "stakingPools.withdrawalVault",
+  },
   {
     "80069": "0x656b95E550C07a9ffe548bd4085c72418Ceb1dba",
     "80094": "0x656b95E550C07a9ffe548bd4085c72418Ceb1dba",
@@ -348,8 +363,8 @@ export const contracts = [
     name: "honey.pythOracle",
   },
   {
-    "80069": "0x4b7cb1c197f8EE4d309866B16C2c12E3B4E7E606",
-    "80094": "0x4b7cb1c197f8EE4d309866B16C2c12E3B4E7E606",
+    "80069": "0xE5Ad9BA751714ec8cdd554b5a9f12BFcA13980cB",
+    "80094": "0xF5686e448BE103beA465105bEb9d284a34ae7e95",
     name: "honey.pythWrapper",
   },
   {

package/src/enum/contracts.ts

@@ -0,0 +1,13 @@
+/**
+ * A list of contract names that are not mapped in the devrel's contract mapping or that are generated by factories (e.g. RewardVault).
+ */
+export enum ContractName {
+  ENSO_ROUTER = "enso.router",
+  POL_REWARD_VAULT = "pol.rewardVault",
+  BEX_POOL = "bex.pool",
+  ERC20 = "others.erc20",
+  ERC4626 = "others.erc4626",
+  POL_STAKE_VAULT = "pol.stakeVault",
+  BEX_EXPLOITED_FUND_DISTRIBUTOR = "bex.exploitedFundDistributor",
+  TW_MINIMAL_ACCOUNT = "thirdweb.minimalAccount",
+}

package/src/enum/dex.ts

@@ -8,3 +8,32 @@ export enum ParameterPreset {
   USDBACKED = "USD-Backed Stablecoin",
   ALGORITHMIC = "Algorithmic Stablecoin",
 }
+
+export enum PoolCreationStep {
+  POOL_TYPE = "Pool Type",
+  SELECT_TOKENS = "Select Tokens",
+  DEPOSIT_LIQUIDITY = "Deposit Liquidity",
+  SET_PARAMETERS = "Set Parameters",
+  SET_INFO = "Set Info",
+}
+
+export enum Aggregators {
+  ERC4626 = "Mint",
+  Oogabooga = "Oogabooga",
+  Fly = "Fly",
+  HubPools = "Hub Pools",
+  Wrap = "Wrap",
+  Unwrap = "Unwrap",
+  KyberSwap = "KyberSwap",
+  OpenOcean = "OpenOcean",
+  Haiku = "Haiku",
+  Enso = "Enso",
+  EnsoErc4626 = "Enso (Mint)",
+  RedeemBgt = "RedeemBgt",
+  Honey = "Honey",
+}
+
+export enum SwapReferrer {
+  SWAP = "SWAP",
+  ZAP = "ZAP",
+}

package/src/enum/{index.ts → exports.ts}

@@ -1,4 +1,7 @@
+export * from "./contracts";
 export * from "./dex";
+export * from "./governance";
+export * from "./honey";
 export * from "./polling";
 export * from "./slippage";
 export * from "./txnEnum";

package/src/enum/governance.ts

@@ -0,0 +1,61 @@
+/**
+ * Maps the proposal state from the governor contract to a more human-readable format.
+ * Don't edit this enum manually, it's synced with the governor contract.
+ *
+ * @see https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/governance/IGovernor.sol
+ */
+export enum ProposalState {
+  Pending = 0,
+  Active = 1,
+  Canceled = 2,
+  Defeated = 3,
+  Succeeded = 4,
+  Queued = 5,
+  Expired = 6,
+  Executed = 7,
+}
+export enum VoteEnum {
+  AGAINST = "no",
+  FOR = "yes",
+  ABSTAIN = "abstain",
+}
+
+export enum ProposalErrorCodes {
+  REQUIRED = "Required",
+  INVALID_AMOUNT = "Invalid amount",
+  NEGATIVE_AMOUNT = "Negative amount",
+  INVALID_ADDRESS = "Invalid address",
+  INVALID_ACTION = "Invalid action",
+  INVALID_ABI = "Invalid ABI",
+  MUST_BE_HTTPS = "Must be HTTPS",
+  MUST_BE_HTTPS_OR_IPFS = "Must be HTTPS or IPFS",
+  INVALID_BASEPATH = "Must be a berachain forum link",
+  /**
+   * Mainly used when it's not a reward vault
+   */
+  INVALID_CONTRACT = "This is not a valid contract",
+}
+
+export enum ProposalTypeEnum {
+  CUSTOM_PROPOSAL = "custom-action",
+  WHITELIST_REWARD_VAULT = "whitelist-reward-vault",
+  BLACKLIST_REWARD_VAULT = "blacklist-reward-vault",
+  ERC20_TRANSFER = "erc20-transfer",
+  WHITELIST_REWARD_VAULT_INCENTIVE = "whitelist-reward-vault-incentive",
+}
+
+export const VoteColorMap = {
+  yes: "#059669",
+  1: "#059669",
+  no: "#DC2629",
+  2: "#DC2629",
+  veto: "#0284C7",
+  4: "#0284C7",
+  abstain: "#78716c",
+  3: "#78716c",
+  yes_secondary: "#ECFDF5",
+  no_secondary: "#FEF2F2",
+  veto_secondary: "#F0F9FF",
+  abstain_secondary: "#E7E5E4",
+  default: "#57534e",
+} as const;

package/src/enum/honey.ts

@@ -0,0 +1,12 @@
+export enum HoneySwapAction {
+  RESET_AMOUNTS = "RESET_AMOUNTS",
+  ACTION_TYPE_CHANGE = "ACTION_TYPE_CHANGE",
+  COLLATERALS_CHANGE = "COLLATERALS_CHANGE",
+  FROM_AMOUNT_CHANGE = "FROM_AMOUNT_CHANGE",
+  TO_AMOUNT_CHANGE = "TO_AMOUNT_CHANGE",
+  PREVIEW_CHANGE = "PREVIEW_CHANGE",
+  IS_BASKET_MODE_ENABLED_CHANGE = "IS_BASKET_MODE_ENABLED_CHANGE",
+  IS_TYPING_CHANGE = "IS_TYPING_CHANGE",
+  IS_SUBMITTING_CHANGE = "IS_SUBMITTING_CHANGE",
+  IS_LOADING_CHANGE = "IS_LOADING_CHANGE",
+}

package/src/enum/txnEnum.ts

@@ -78,6 +78,7 @@ export enum TransactionActionType {
   APPLYING_COMMISSION_CHANGE = "Apply Commission Change",
 
   BONDING_BERA = "Stake BERA",
+  ZAP_STAKE_BERA = "Zap Stake BERA",
   UNBONDING_BERA = "Unstake BERA",
   QUEUE_UNBONDING_BERA = "Queue Unstake BERA",
 

package/src/errors/BeraError.ts

@@ -1,11 +1,11 @@
-import type * as Sentry from "@sentry/nextjs";
 import { type Abi, BaseError } from "viem";
 
 import { appConfig } from "@berachain/config/internal";
 
 import { GENERAL_ERROR } from "./errorMap";
-import { getErrorMessage } from "./getErrorMessage";
+import { findMatchingError } from "./getErrorMessage";
 import { parseViemError, rpcErrorToReason } from "./parseViemError";
+import type { SeverityLevel } from "./severity";
 
 export interface IBeraErrorArgs {
   message?: string;
@@ -13,10 +13,11 @@ export interface IBeraErrorArgs {
   cause?: unknown;
   reason?: string;
   chainId?: number;
+  fingerprint?: string[];
   /**
-   * The level of the error to be used for Sentry.
+   * The level of the error to be used for error reporting.
    */
-  level?: Sentry.SeverityLevel;
+  level?: SeverityLevel;
   tags?: {
     [key in TagsKey]?: Primitive;
   };
@@ -27,9 +28,6 @@ export interface IBeraErrorArgs {
   abi?: Abi;
 }
 
-/**
- * Copy pasted from sentry types
- */
 type Primitive = number | string | boolean | bigint | symbol | null | undefined;
 
 /**
@@ -51,7 +49,22 @@ type TagsKey =
   | "operation.source.type";
 
 /**
- * This is a generic error class that can be used to handle errors in the SDK.
+ * Base error class for the entire berajs SDK.
+ *
+ * All errors should be a BeraError or one of its subclasses. Unknown errors should be
+ * normalized via `initBeraError({ cause })`.
+ *
+ * Key design: the constructor runs an **automatic reason detection pipeline** when `reason`
+ * is not explicitly provided. It calls `parseViemError` on the `cause` to extract a
+ * machine-readable reason code (e.g. "NotEnoughBalance", "BAL#508", "UserRejectedRequestError").
+ * That reason is then matched against `errorMap.ts` to resolve a user-friendly `displayMessage`.
+ *
+ * This means: for most viem errors, you only need to pass `cause` and everything else
+ * (reason, displayMessage, level) is derived automatically.
+ *
+ * @see parseViemError — the reason extraction engine
+ * @see errorMap.ts — reason → displayMessage mapping
+ * @see initBeraError — normalizes any error into a BeraError (preferred entry point)
  */
 export class BeraError extends Error {
   /**
@@ -80,6 +93,13 @@ export class BeraError extends Error {
    */
   reason: string | null = null;
 
+  /**
+   * The fingerprint for the error.
+   *
+   * This is typically used to group errors in Sentry.
+   */
+  fingerprint: string[] | undefined;
+
   private _tags: {
     [key: string | TagsKey]: Primitive;
   } = {};
@@ -101,7 +121,7 @@ export class BeraError extends Error {
     };
   }
 
-  level: Sentry.SeverityLevel = "error";
+  level: SeverityLevel = "error";
 
   extra: Record<string, unknown> = {};
 
@@ -114,6 +134,7 @@ export class BeraError extends Error {
     abi,
     tags,
     chainId,
+    fingerprint,
   }: IBeraErrorArgs) {
     let message = m;
 
@@ -139,10 +160,19 @@ export class BeraError extends Error {
 
     this.name = "BeraError";
 
+    this.fingerprint = fingerprint;
+
     this.cause = cause;
 
     this.chainId = chainId;
 
+    // ── Automatic reason detection ──────────────────────────────────────
+    // If `reason` was provided explicitly, use it directly.
+    // Otherwise, attempt to extract it from the `cause` by unwrapping the viem error chain.
+    // parseViemError walks nested errors (ContractFunctionExecutionError →
+    // ContractFunctionRevertedError → RpcRequestError) and decodes revert data using ABI.
+    // The extracted reason (e.g. "NotEnoughBalance", "BAL#508") is the key that drives
+    // displayMessage resolution and Sentry fingerprinting.
     if (reason) {
       this.reason = reason;
     } else if (cause instanceof Error) {
@@ -155,10 +185,13 @@ export class BeraError extends Error {
 
         this.reason = parsed?.reason ?? null;
       } catch {
-        // Maybe we can do something here
+        // parseViemError throws when it can't identify the error type and revertIfUnknown=true.
+        // In that case, reason stays null and displayMessage falls back to GENERAL_ERROR.
       }
     }
 
+    // ── Level inference ─────────────────────────────────────────────────
+    // User rejections are "info" (not actionable by devs), everything else defaults to "error".
     if (level) {
       this.level = level;
     } else if (this.reason === rpcErrorToReason("UserRejectedRequestError")) {
@@ -167,19 +200,34 @@ export class BeraError extends Error {
       this.level = "error";
     }
 
+    // ── displayMessage resolution ─────────────────────────────────────────
+    // Priority:
+    //   1. Explicit `displayMessage` passed by caller
+    //   2. Cascaded from a BeraError cause (if it has a non-generic message)
+    //   3. Looked up from errorMap.ts using the detected `reason` and `message`
+    //   4. GENERAL_ERROR fallback: "Something went wrong. Please try again later."
     let displayMessage = dm;
 
     if (
       this.cause instanceof BeraError &&
       this.cause.displayMessage !== GENERAL_ERROR
     ) {
-      // If the cause is a BeraError, use the displayMessage of the cause
+      // Cascade: inner BeraError already resolved a good displayMessage, reuse it
       displayMessage = this.cause.displayMessage;
     }
 
-    // Skip if displayMessage is already provided
     if (!displayMessage) {
-      displayMessage = getErrorMessage(this);
+      // Match reason (exact) or message (keyword) against errorMap.ts
+      const matched = findMatchingError(this);
+      displayMessage = matched?.errorMSG;
+
+      // ── Reason normalization ──────────────────────────────────────────
+      // If the reason was resolved from a raw error message (e.g. "insufficient funds for
+      // gas * price + value: have X want Y") rather than a stable key (e.g. "InsufficientFundsError"),
+      // normalize it to the matched errorMap key (e.g. "NOT_ENOUGH_GAS") for stable Sentry fingerprinting.
+      if (matched && !matched.matchedByReason && this.reason) {
+        this.reason = matched.key;
+      }
     }
 
     this.displayMessage = displayMessage ?? GENERAL_ERROR;