From 2fec2ff3e900fe07846bcf30af8e831f3a6182f7 Mon Sep 17 00:00:00 2001 From: larisa17 <42570262+larisa17@users.noreply.github.com> Date: Tue, 18 Feb 2025 14:07:03 +0200 Subject: [PATCH] Hotfix 20250217 (#3281) * chore: disable all linters * feat(nonce): add more logs for nonce error * feat(weights): add more logs for weights error * feat(useLoginFlow): add more detail logs * feat(workflow): undo bad rebase change * feat(workflow): add linter bacl * feat(workflow): add linter back * feat(lint): fix linter error --------- Co-authored-by: Lucian Hymer --- .../workflows/build_and_deploy_staging.yml | 4 +-- .github/workflows/deploy_staging.yml | 4 +-- .github/workflows/deploy_ui_staging.yml | 4 +-- app/context/datastoreConnectionContext.tsx | 5 +-- app/context/scorerContext.tsx | 1 + app/hooks/useLoginFlow.tsx | 34 ++++++++++++++++--- 6 files changed, 39 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build_and_deploy_staging.yml b/.github/workflows/build_and_deploy_staging.yml index 4a4fe6e522..a01437279a 100644 --- a/.github/workflows/build_and_deploy_staging.yml +++ b/.github/workflows/build_and_deploy_staging.yml @@ -44,8 +44,8 @@ jobs: run: yarn install --frozen-lockfile - name: Run Tests run: yarn test - # - name: Run Linter - # run: yarn lint + - name: Run Linter + run: yarn lint - name: Workarround for build error run: rm -rf node_modules/@tendermint - name: Run Build (ensure that build succeeds) diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml index cc9ee665fb..865797d097 100644 --- a/.github/workflows/deploy_staging.yml +++ b/.github/workflows/deploy_staging.yml @@ -43,8 +43,8 @@ jobs: run: yarn install --frozen-lockfile - name: Run Tests run: yarn test - # - name: Run Linter - # run: yarn lint + - name: Run Linter + run: yarn lint - name: Workarround for build error run: rm -rf node_modules/@tendermint - name: Run Build (ensure that build succeeds) diff --git a/.github/workflows/deploy_ui_staging.yml b/.github/workflows/deploy_ui_staging.yml index 5663e3da60..fd12e3a0b5 100644 --- a/.github/workflows/deploy_ui_staging.yml +++ b/.github/workflows/deploy_ui_staging.yml @@ -43,8 +43,8 @@ jobs: run: yarn install --frozen-lockfile - name: Run Tests run: yarn test - # - name: Run Linter - # run: yarn lint + - name: Run Linter + run: yarn lint - name: Workarround for build error run: rm -rf node_modules/@tendermint - name: Run Build (ensure that build succeeds) diff --git a/app/context/datastoreConnectionContext.tsx b/app/context/datastoreConnectionContext.tsx index 13be89861b..578985607f 100644 --- a/app/context/datastoreConnectionContext.tsx +++ b/app/context/datastoreConnectionContext.tsx @@ -59,12 +59,13 @@ export const useDatastoreConnection = () => { const getPassportDatabaseAccessToken = async (did: DID, address: string): Promise => { let nonce = null; + console.error("Getting nonce for did:", did); try { // Get nonce from server const nonceResponse = await axios.get(`${process.env.NEXT_PUBLIC_SCORER_ENDPOINT}/account/nonce`); nonce = nonceResponse.data.nonce; } catch (error) { - const msg = `Failed to get nonce from server for user with did: ${did.parent}`; + const msg = `Failed to get nonce from server for user with did: ${did.parent}. Error: ${error}`; datadogRum.addError(msg); throw new Error(msg); } @@ -82,7 +83,7 @@ export const useDatastoreConnection = () => { setConnectedAddress(address); return accessToken; } catch (error) { - const msg = `Failed to authenticate user with did: ${did.parent}`; + const msg = `Failed to authenticate user with did: ${did.parent}. Error: ${error}`; datadogRum.addError(msg); throw new Error(msg); } diff --git a/app/context/scorerContext.tsx b/app/context/scorerContext.tsx index 473487bb06..d7941fc556 100644 --- a/app/context/scorerContext.tsx +++ b/app/context/scorerContext.tsx @@ -177,6 +177,7 @@ export const ScorerContextProvider = ({ children }: { children: any }) => { } } catch (error) { setPassportSubmissionState("APP_REQUEST_ERROR"); + console.error("Error fetching stamp weights", error); } }; diff --git a/app/hooks/useLoginFlow.tsx b/app/hooks/useLoginFlow.tsx index 817f897f3f..f06e926198 100644 --- a/app/hooks/useLoginFlow.tsx +++ b/app/hooks/useLoginFlow.tsx @@ -25,7 +25,7 @@ export const useLoginFlow = ({ isLoggingIn: boolean; signIn: () => void; } => { - const { address, isConnected } = useAccount(); + const { address, isConnected, connector } = useAccount(); const { data: walletClient } = useWalletClient(); const { open: web3ModalIsOpen } = useAppKitState(); const { disconnect } = useDisconnect(); @@ -47,10 +47,13 @@ export const useLoginFlow = ({ }, []); useEffect(() => { + console.error("Debug Login Flow loginStep: ", loginStep); + console.error("Debug Login Flow web3modalEvent: ", web3modalEvent); + console.error("Debug Login Flow resetLogin: ", resetLogin); if (web3modalEvent.data.event === "MODAL_CLOSE" && web3modalEvent.data.properties.connected === false) { resetLogin(); } - }, [web3modalEvent, resetLogin]); + }, [web3modalEvent, resetLogin, loginStep]); const showConnectionError = useCallback( (e: any) => { @@ -63,12 +66,17 @@ export const useLoginFlow = ({ ); useEffect(() => { + console.error("Debug Login Flow enabled: ", enabled); + console.error("Debug Login Flow isConnected: ", isConnected); + console.error("Debug Login Flow dbAccessTokenStatus: ", dbAccessTokenStatus); + const newLoginStep = (() => { if (!enabled) return "NOT_STARTED"; else if (!isConnected) return "PENDING_WALLET_CONNECTION"; else if (dbAccessTokenStatus !== "connected") return "PENDING_DATABASE_CONNECTION"; else return "DONE"; })(); + console.error("Debug Login Flow newLoginStep: ", newLoginStep); setLoginStep(newLoginStep); }, [enabled, isConnected, dbAccessTokenStatus]); @@ -76,6 +84,8 @@ export const useLoginFlow = ({ // the dashboard, the web3ModalIsOpen state is incorrect // until we call disconnect useEffect(() => { + console.error("Debug Login Flow web3ModalIsOpen: ", web3ModalIsOpen); + console.error("Debug Login Flow loginStep: ", loginStep); (async () => { if (web3ModalIsOpen && loginStep === "NOT_STARTED") { try { @@ -85,9 +95,11 @@ export const useLoginFlow = ({ } } })(); - }, [web3ModalIsOpen, loginStep]); + }, [web3ModalIsOpen, loginStep, disconnect]); useEffect(() => { + console.error("Debug Login Flow loginStep: ", loginStep); + console.error("Debug Login Flow navigateToPage: ", navigateToPage); if (loginStep === "DONE") { if (onLoggedIn) { onLoggedIn(); @@ -99,9 +111,16 @@ export const useLoginFlow = ({ } } } - }, [loginStep, navigateToPage]); + }, [loginStep, navigateToPage, onLoggedIn]); useEffect(() => { + console.error("Debug Login Flow loginStep: ", loginStep); + console.error("Debug Login Flow address: ", address); + console.error("Debug Login Flow connector: ", connector?.name); + console.error("Debug Login Flow walletClient: ", walletClient); + console.error("Debug Login Flow connectDatastore: ", connectDatastore); + console.error("Debug Login Flow showConnectionError: ", showConnectionError); + console.error("Debug Login Flow resetLogin: ", resetLogin); (async () => { if ( !isConnectingToDatabaseRef.current && @@ -126,6 +145,11 @@ export const useLoginFlow = ({ const isLoggingIn = loginStep !== "DONE" && loginStep !== "NOT_STARTED"; const signIn = useCallback(async () => { + console.error("Debug Login Flow initiateLogin: ", initiateLogin); + console.error("Debug Login Flow isConnected: ", isConnected); + console.error("Debug Login Flow openWeb3Modal: ", openWeb3Modal); + console.error("Debug Login Flow showConnectionError: ", showConnectionError); + console.error("Debug Login Flow resetLogin: ", resetLogin); try { initiateLogin(); if (!isConnected) { @@ -136,7 +160,7 @@ export const useLoginFlow = ({ showConnectionError(e); resetLogin(); } - }, [openWeb3Modal, isConnected, showConnectionError]); + }, [initiateLogin, isConnected, openWeb3Modal, showConnectionError, resetLogin]); return useMemo(() => ({ loginStep, isLoggingIn, signIn }), [loginStep, isLoggingIn, signIn]); };