diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 84fbfeffff..2358b3cc34 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,11 +10,14 @@ on: required: true SENTRY_KEY: required: true + GF_SURVEY_KEY: + required: true env: SEGMENT_ANALYTICS_KEY: ${{ secrets.SEGMENT_ANALYTICS_KEY }} LD_CLIENT_ID: ${{ secrets.LD_CLIENT_ID }} SENTRY_KEY: ${{ secrets.SENTRY_KEY }} + GF_SURVEY_KEY: ${{ secrets.GF_SURVEY_KEY }} jobs: build: diff --git a/.github/workflows/case.yml b/.github/workflows/case.yml index cd619c9664..e47dc365de 100644 --- a/.github/workflows/case.yml +++ b/.github/workflows/case.yml @@ -10,11 +10,14 @@ on: required: true SENTRY_KEY: required: true + GF_SURVEY_KEY: + required: true env: SEGMENT_ANALYTICS_KEY: ${{ secrets.SEGMENT_ANALYTICS_KEY }} LD_CLIENT_ID: ${{ secrets.LD_CLIENT_ID }} SENTRY_KEY: ${{ secrets.SENTRY_KEY }} + GF_SURVEY_KEY: ${{ secrets.GF_SURVEY_KEY }} jobs: case: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index fc3bb8dfc6..dd7df62a4d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,11 +10,14 @@ on: required: true SENTRY_KEY: required: true + GF_SURVEY_KEY: + required: true env: SEGMENT_ANALYTICS_KEY: ${{ secrets.SEGMENT_ANALYTICS_KEY }} LD_CLIENT_ID: ${{ secrets.LD_CLIENT_ID }} SENTRY_KEY: ${{ secrets.SENTRY_KEY }} + GF_SURVEY_KEY: ${{ secrets.GF_SURVEY_KEY }} jobs: lint: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 028ac11186..0577bbc909 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,6 +26,7 @@ jobs: SEGMENT_ANALYTICS_KEY: ${{ secrets.SEGMENT_ANALYTICS_DEV_KEY }} LD_CLIENT_ID: ${{ secrets.LD_CLIENT_ID }} SENTRY_KEY: ${{ secrets.SENTRY_KEY }} + GF_SURVEY_KEY: ${{ secrets.GF_SURVEY_KEY }} lint: name: Lint @@ -34,6 +35,7 @@ jobs: SEGMENT_ANALYTICS_KEY: ${{ secrets.SEGMENT_ANALYTICS_DEV_KEY }} LD_CLIENT_ID: ${{ secrets.LD_CLIENT_ID }} SENTRY_KEY: ${{ secrets.SENTRY_KEY }} + GF_SURVEY_KEY: ${{ secrets.GF_SURVEY_KEY }} case: name: Case @@ -42,6 +44,7 @@ jobs: SEGMENT_ANALYTICS_KEY: ${{ secrets.SEGMENT_ANALYTICS_DEV_KEY }} LD_CLIENT_ID: ${{ secrets.LD_CLIENT_ID }} SENTRY_KEY: ${{ secrets.SENTRY_KEY }} + GF_SURVEY_KEY: ${{ secrets.GF_SURVEY_KEY }} all-jobs-completed: name: All jobs completed diff --git a/docusaurus.config.js b/docusaurus.config.js index 841d837371..eaa9225690 100644 --- a/docusaurus.config.js +++ b/docusaurus.config.js @@ -36,6 +36,7 @@ const config = { VERCEL_ENV: process.env.VERCEL_ENV, DASHBOARD_PREVIEW_URL: process.env.DASHBOARD_PREVIEW_URL, SENTRY_KEY: process.env.SENTRY_KEY, + GF_SURVEY_KEY: process.env.GF_SURVEY_KEY, }, trailingSlash: true, diff --git a/src/components/ParserOpenRPC/DetailsBox/MDContent.tsx b/src/components/ParserOpenRPC/DetailsBox/MDContent.tsx index 3e6e4ac52c..fcd8e3eeba 100644 --- a/src/components/ParserOpenRPC/DetailsBox/MDContent.tsx +++ b/src/components/ParserOpenRPC/DetailsBox/MDContent.tsx @@ -1,9 +1,51 @@ import React from "react"; +const parseLists = (content: string) => { + const lines = content.split('\n'); + let result = ''; + let isFirstLevelOpen = false; + let isSecondLevelOpen = false; + lines.forEach((line) => { + if (line.match(/^ {2}-\s+/)) { + if (!isSecondLevelOpen) { + result += ''; + isSecondLevelOpen = false; + } + if (!isFirstLevelOpen) { + result += ''; + isSecondLevelOpen = false; + } + if (isFirstLevelOpen) { + result += ''; + isFirstLevelOpen = false; + } + result += line; + } + }); + if (isSecondLevelOpen) result += ''; + if (isFirstLevelOpen) result += ''; + return result; +}; + const parseMarkdown = (content: string) => { - return content - .replace(/\[(.*?)\]\((.*?)\)/g, '$1') - .replace(/`(.*?)`/g, "$1"); + return parseLists( + content + .replace(/\[(.*?)\]\((.*?)\)/g, '$1') + .replace(/`(.*?)`/g, '$1') + .replace(/\*\*(.*?)\*\*/g, '$1') + ); }; interface MDContentProps { diff --git a/src/css/custom.css b/src/css/custom.css index 889142255c..637fe43655 100644 --- a/src/css/custom.css +++ b/src/css/custom.css @@ -169,6 +169,10 @@ svg { margin-bottom: -2rem; } +.usabilla_live_button_container { + display: none !important; +} + .getfeedback-hidden { display: none !important; } diff --git a/src/theme/Root.tsx b/src/theme/Root.tsx index f6ea1acd79..d09eacc118 100644 --- a/src/theme/Root.tsx +++ b/src/theme/Root.tsx @@ -8,6 +8,7 @@ import React, { import { Provider as AlertProvider } from "react-alert"; import useDocusaurusContext from "@docusaurus/useDocusaurusContext"; import BrowserOnly from "@docusaurus/BrowserOnly"; +import siteConfig from "@generated/docusaurus.config"; import { AlertTemplate, options } from "@site/src/components/Alert"; import { MetaMaskSDK, SDKProvider } from "@metamask/sdk"; import { @@ -129,9 +130,14 @@ export const LoginProvider = ({ children }) => { } catch (e) {} }; + const { GF_SURVEY_KEY } = siteConfig.customFields; + useEffect(() => { const provider = sdk?.getProvider(); setMetaMaskProvider(provider); + if ((window as any)?.usabilla && window?.innerWidth > 1720) { + (window as any)?.usabilla?.load("w.usabilla.com", GF_SURVEY_KEY); + } }, []); useEffect(() => { diff --git a/wallet/reference/new-reference.mdx b/wallet/reference/new-reference.mdx index a456edff0f..e46cf7086d 100644 --- a/wallet/reference/new-reference.mdx +++ b/wallet/reference/new-reference.mdx @@ -10,5 +10,5 @@ import { NETWORK_NAMES } from "@site/src/plugins/plugin-json-rpc"