From f80082d228641f0abda35e87339553cd7abb0935 Mon Sep 17 00:00:00 2001 From: Monika Smolarek Date: Mon, 26 Feb 2024 20:02:46 +0100 Subject: [PATCH 01/19] removed sentry from workflows --- .github/workflows/pr-build.yml | 13 ------------- .github/workflows/release.yml | 11 ----------- 2 files changed, 24 deletions(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 1ce650dc3..7f53c3cf3 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -183,10 +183,6 @@ jobs: # Build - name: yarn build run: yarn build - env: - SENTRY_DSN: ${{ secrets.SENTRY_DSN }} - SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} - SENTRY_ENV: pr-builds # Create binaries - if: matrix.platform == 'linux' @@ -195,9 +191,6 @@ jobs: echo "USE_SYSTEM_FPM?$(echo $USE_SYSTEM_FPM)" yarn package-linux env: - SENTRY_DSN: ${{ secrets.SENTRY_DSN }} - SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} - SENTRY_ENV: pr-builds USE_SYSTEM_FPM: ${{ matrix.id == 'linux-arm64' && 'true' }} - if: matrix.platform == 'windows' @@ -205,18 +198,12 @@ jobs: run: yarn package-win env: DONT_SIGN_APP: true # Do not sign the development artifacts - SENTRY_DSN: ${{ secrets.SENTRY_DSN }} - SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} - SENTRY_ENV: pr-builds - if: matrix.platform == 'macos' name: Build mac app run: yarn package-mac env: DONT_SIGN_APP: true # Do not sign the development artifacts - SENTRY_DSN: ${{ secrets.SENTRY_DSN }} - SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} - SENTRY_ENV: pr-builds - name: ls ./release run: ls ${{matrix.platform != 'windows' && '-la' || ''}} ./release diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d301b75dc..e6e58fba5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -187,31 +187,20 @@ jobs: - name: Build run: yarn build - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SENTRY_DSN: ${{ secrets.SENTRY_DSN }} - SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} # Create binaries - if: matrix.platform == 'linux' name: Build linux app run: yarn package-linux env: - SENTRY_DSN: ${{ secrets.SENTRY_DSN }} - SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} USE_SYSTEM_FPM: ${{ matrix.id == 'linux-arm64' && 'true' }} - if: matrix.platform == 'windows' name: Build windows app run: yarn package-win - env: - SENTRY_DSN: ${{ secrets.SENTRY_DSN }} - SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} - if: matrix.platform == 'macos' name: Build mac app run: yarn package-mac env: - SENTRY_DSN: ${{ secrets.SENTRY_DSN }} - SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} CSC_LINK: ${{ secrets.SIGNING_CERTIFICATE_P12_DATA }} CSC_KEY_PASSWORD: ${{ secrets.SIGNING_CERTIFICATE_PASSWORD }} APPLEID: ${{ secrets.APPLE_ID }} From 5b3186704a7c0377b32d5dc7267f06c3c7ee5cf0 Mon Sep 17 00:00:00 2001 From: Monika Smolarek Date: Mon, 26 Feb 2024 20:05:21 +0100 Subject: [PATCH 02/19] deleted env.local --- env.local | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 env.local diff --git a/env.local b/env.local deleted file mode 100644 index 757ad527f..000000000 --- a/env.local +++ /dev/null @@ -1,5 +0,0 @@ -SENTRY_DSN= -SENTRY_AUTH_TOKEN= -SENTRY_LOG_LEVEL=debug -SENTRY_SLUG= -SENTRY_PROJECT_SLUG= \ No newline at end of file From 047c269e0adde6d899a4e8a6714c742ac52f1022 Mon Sep 17 00:00:00 2001 From: Monika Smolarek Date: Mon, 26 Feb 2024 20:06:31 +0100 Subject: [PATCH 03/19] modified: configs/webpack.config.base.js --- configs/webpack.config.base.js | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/configs/webpack.config.base.js b/configs/webpack.config.base.js index bacae5042..65f9953d0 100644 --- a/configs/webpack.config.base.js +++ b/configs/webpack.config.base.js @@ -4,8 +4,6 @@ import path from 'path'; import webpack from 'webpack'; -import SentryWebpackPlugin from '@sentry/webpack-plugin'; - export default { externals: [], @@ -40,18 +38,6 @@ export default { NODE_ENV: 'production' }), new webpack.IgnorePlugin({ resourceRegExp: /^\.\/wordlists\/(?!english)/, contextRegExp: /bip39\/src$/ }), - ].concat( - process.env.SENTRY_AUTH_TOKEN ? [ - new SentryWebpackPlugin({ - include: '.', - ignoreFile: '.sentrycliignore', - ignore: ['node_modules', 'webpack.config.js'], - release: 'smashapp@' + process.env.npm_package_version, - org: 'spacemesh', - project: 'smapp', - authToken: process.env.SENTRY_AUTH_TOKEN - }) - ] : [] - ) + ] }; From 511edd63b249d6d167a794dd88919fa00e2b5743 Mon Sep 17 00:00:00 2001 From: Monika Smolarek Date: Mon, 26 Feb 2024 20:07:36 +0100 Subject: [PATCH 04/19] modified: app/ErrorBoundary.tsx --- app/ErrorBoundary.tsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/ErrorBoundary.tsx b/app/ErrorBoundary.tsx index df141f57b..5c33b0ed0 100644 --- a/app/ErrorBoundary.tsx +++ b/app/ErrorBoundary.tsx @@ -7,7 +7,6 @@ import React, { Component } from 'react'; import styled from 'styled-components'; -import { captureException } from '@sentry/react'; import { connect } from 'react-redux'; import { Modal } from './components/common'; import { Button } from './basicComponents'; @@ -82,8 +81,6 @@ class ErrorBoundary extends Component { { componentStack }: { componentStack: string } ) { console.log(`${error.message} ${componentStack}`); // eslint-disable-line no-console - captureException(error); - const { setUiError } = this.props; const failedComponentMatch = componentStack .split('\n') From 7de502c4036d52cc7b8075e54d905a453a0486cd Mon Sep 17 00:00:00 2001 From: Monika Smolarek Date: Mon, 26 Feb 2024 20:11:59 +0100 Subject: [PATCH 05/19] modified: README.md --- README.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/README.md b/README.md index 508702c95..964682e1e 100644 --- a/README.md +++ b/README.md @@ -112,15 +112,7 @@ PPROF_SERVER=1 yarn start Alias for `--pprof-server` argument. -#### Sentry - -``` -SENTRY_DSN='collection errors/logs url taken from sentry' -SENTRY_LOG_LEVEL=boolean # enables debug information -SENTRY_AUTH_TOKEN='special auth token for sentry cli integration' -``` - -### Building Artifacts in CI +#### Building Artifacts in CI Smapp uses two workflows. Both of them build an application for all supported platforms: Windows, macOS, and Linux. From ee11278186c6325c375c4f41e196071d11668546 Mon Sep 17 00:00:00 2001 From: Monika Smolarek Date: Mon, 26 Feb 2024 20:13:08 +0100 Subject: [PATCH 06/19] deleted: configs/getSentryEnvs.js --- configs/getSentryEnvs.js | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 configs/getSentryEnvs.js diff --git a/configs/getSentryEnvs.js b/configs/getSentryEnvs.js deleted file mode 100644 index fc03ac75a..000000000 --- a/configs/getSentryEnvs.js +++ /dev/null @@ -1,6 +0,0 @@ -export default () => - !process.env.SENTRY_AUTH_TOKEN ? {} : { - SENTRY_AUTH_TOKEN: process.env.SENTRY_AUTH_TOKEN, - SENTRY_DSN: process.env.SENTRY_DSN, - SENTRY_ENV: process.env.SENTRY_ENV || process.env.NODE_ENV, - }; From 2d7fd7d2b73efa0fd58d1ae3b6294227c0f3a539 Mon Sep 17 00:00:00 2001 From: Monika Smolarek Date: Mon, 26 Feb 2024 20:16:14 +0100 Subject: [PATCH 07/19] modified: configs/webpack.config.main.prod.babel.js --- configs/webpack.config.main.prod.babel.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/configs/webpack.config.main.prod.babel.js b/configs/webpack.config.main.prod.babel.js index e0834fee3..da74f4ea5 100644 --- a/configs/webpack.config.main.prod.babel.js +++ b/configs/webpack.config.main.prod.babel.js @@ -8,7 +8,6 @@ import TerserPlugin from 'terser-webpack-plugin'; import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'; import checkNodeEnv from './checkNodeEnv'; import baseConfig from './webpack.config.base'; -import getSentryEnvs from './getSentryEnvs'; checkNodeEnv('production'); @@ -56,7 +55,6 @@ export default merge(baseConfig, { NODE_ENV: 'production', DEBUG_PROD: false, START_MINIMIZED: false, - ...getSentryEnvs(), }), ], From e70f8665ea89940c7d0bd88d8041e6364cacad4e Mon Sep 17 00:00:00 2001 From: Monika Smolarek Date: Mon, 26 Feb 2024 20:17:14 +0100 Subject: [PATCH 08/19] modified: configs/webpack.config.renderer.prod.babel.js --- configs/webpack.config.renderer.prod.babel.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/configs/webpack.config.renderer.prod.babel.js b/configs/webpack.config.renderer.prod.babel.js index 053b3d4a0..caffdecbe 100644 --- a/configs/webpack.config.renderer.prod.babel.js +++ b/configs/webpack.config.renderer.prod.babel.js @@ -9,7 +9,6 @@ import merge from 'webpack-merge'; import TerserPlugin from 'terser-webpack-plugin'; import baseConfig from './webpack.config.base'; import checkNodeEnv from './checkNodeEnv'; -import getSentryEnvs from './getSentryEnvs'; checkNodeEnv('production'); @@ -90,7 +89,6 @@ export default merge(baseConfig, { new webpack.EnvironmentPlugin({ NODE_ENV: 'production', DEBUG_PROD: false, - ...getSentryEnvs(), }), new BundleAnalyzerPlugin({ From 8674cfa30d44b3697b6bafa989ac4ff5042c8326 Mon Sep 17 00:00:00 2001 From: Monika Smolarek Date: Mon, 26 Feb 2024 20:18:53 +0100 Subject: [PATCH 09/19] modified: desktop/main/startApp.ts --- desktop/main/startApp.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/desktop/main/startApp.ts b/desktop/main/startApp.ts index d438fd947..32a64cbcf 100644 --- a/desktop/main/startApp.ts +++ b/desktop/main/startApp.ts @@ -36,7 +36,7 @@ import getSmesherInfo from './sources/smesherInfo'; import handleSmesherIpc from './reactions/handleSmesherIpc'; import handleShowFile from './reactions/handleShowFile'; import handleOpenDashboard from './reactions/handleOpenDashboard'; -import nodeIPCStreams, { sentryLogsListener } from './sources/node.ipc'; +import nodeIPCStreams from './sources/node.ipc'; import handleWipeOut from './reactions/wipeOut.ipc'; import handleDeleteWalletFile from './reactions/deleteWalletFile.ipc'; import handleAppWalletChange from './reactions/handleAppWalletChange'; @@ -210,8 +210,6 @@ const startApp = (): AppStore => { fetchDiscoveryEvery(CHECK_UPDATES_INTERVAL, $networks, $warnings), // And update them by users request listNetworksByRequest($networks, $warnings), - // Get actual logs to client app - sentryLogsListener(), // List Public APIs for current network // Do not update anything listPublicApisByRequest($wallet, $warnings), From dc068dcaf64157616fdf844dc950aee4ef7b2f5c Mon Sep 17 00:00:00 2001 From: Monika Smolarek Date: Mon, 26 Feb 2024 20:27:03 +0100 Subject: [PATCH 10/19] deleted: app/sentry.ts --- app/sentry.ts | 84 --------------------------------------------------- 1 file changed, 84 deletions(-) delete mode 100644 app/sentry.ts diff --git a/app/sentry.ts b/app/sentry.ts deleted file mode 100644 index 730c66c95..000000000 --- a/app/sentry.ts +++ /dev/null @@ -1,84 +0,0 @@ -import { - init as initSentry, - captureMessage, - addBreadcrumb, - setTags, - captureException, - captureUserFeedback, - reactRouterV5Instrumentation, -} from '@sentry/react'; -import { BrowserTracing } from '@sentry/browser'; -import { matchPath } from 'react-router-dom'; -import { RouteConfig } from '@sentry/react/types/reactrouter'; -import { Primitive } from '@sentry/types'; -import routes from './routes'; -import { eventsService } from './infra/eventsService'; - -export const init = (history) => - initSentry({ - dsn: process.env.SENTRY_DSN, - environment: process.env.SENTRY_ENV || process.env.NODE_ENV, - enabled: true, - debug: process.env.SENTRY_LOG_LEVEL === 'debug', - attachStacktrace: true, - maxValueLength: 25000, - tracesSampleRate: parseFloat(process.env.TRACES_SAMPLE_RATE || '1.0'), - integrations: [ - new BrowserTracing({ - routingInstrumentation: reactRouterV5Instrumentation( - history, - Object.values(routes).reduce( - (prev, next) => [...prev, ...next], - [] as RouteConfig[] - ), - matchPath - ), - }), - ], - async beforeSend(event, hint) { - const isFeedbackFormMessage = (event?.message || '').includes( - 'User Reported: ' - ); - - if (!isFeedbackFormMessage) { - return event; - } - - const { payload, error } = await eventsService.getNodeAndAppLogs(); - - if (error) { - return event; - } - - // add attachments only for User Feedback - hint.attachments = [ - { - filename: `log-genesisID-${payload?.genesisID}-eventId-${ - event?.event_id || 0 - }.txt`, - data: payload?.nodeLogs, - }, - { - filename: `appVersion-${payload?.appLogsFileName}-eventId-${ - event?.event_id || 0 - }.txt`, - data: payload?.appLogs, - }, - ]; - - // clean up stack trace for User Feedback do not clutter the report in the Sentry - if (event.exception?.values) { - event.exception.values = []; - } - - return event; - }, - }); - -export const captureReactException = (e: Error) => captureException(e); -export const captureReactMessage = (message: string) => captureMessage(message); -export const captureReactBreadcrumb = (o: any) => addBreadcrumb(o); -export const setReactTags = (tags: { [key: string]: Primitive }) => - setTags(tags); -export const captureReactUserFeedback = (formData: any) => - captureUserFeedback(formData); From 953586898fa0421fc100f5cc07c3f47be436fddb Mon Sep 17 00:00:00 2001 From: Monika Smolarek Date: Mon, 26 Feb 2024 20:28:25 +0100 Subject: [PATCH 11/19] deleted: desktop/sentry.ts --- desktop/sentry.ts | 58 ----------------------------------------------- 1 file changed, 58 deletions(-) delete mode 100644 desktop/sentry.ts diff --git a/desktop/sentry.ts b/desktop/sentry.ts deleted file mode 100644 index 03e6b8b4b..000000000 --- a/desktop/sentry.ts +++ /dev/null @@ -1,58 +0,0 @@ -import * as Sentry from '@sentry/electron/main'; -import logger from 'electron-log'; -import { generateGenesisIDFromConfig } from './main/Networks'; -import { getNodeLogsPath, readLinesFromBottom } from './main/utils'; -import NodeConfig from './main/NodeConfig'; - -require('dotenv').config(); - -export const addNodeLogFile = async () => { - const nodeConfig = await NodeConfig.load(); - const genesisID = generateGenesisIDFromConfig(nodeConfig); - const logFilePath = getNodeLogsPath(generateGenesisIDFromConfig(nodeConfig)); - // Otherwise if Node exited, but there are no critical errors - // in the pool — search for fatal error in the logs - const lastLines = await readLinesFromBottom(logFilePath, 20000); - return { - genesisID, - content: lastLines.reverse().join('\n\t'), - }; -}; - -export const addAppLogFile = async () => { - const logFilePath = logger.transports.file.getFile().path; - - const lastLines = await readLinesFromBottom(logFilePath, 5000); - const appStartFrom = logFilePath.indexOf('app-log'); - const fileName = logFilePath.slice( - appStartFrom > 0 ? appStartFrom : 0, - logFilePath.length - 4 - ); - return { - fileName, - content: lastLines.reverse().join('\n\t'), - }; -}; - -export const init = () => - Sentry.init({ - dsn: process.env.SENTRY_DSN, - environment: process.env.SENTRY_ENV || process.env.NODE_ENV, - tracesSampleRate: parseFloat(process.env.TRACES_SAMPLE_RATE || '1.0'), - debug: process.env.SENTRY_LOG_LEVEL === 'debug', - enabled: true, - maxValueLength: 25000, - attachStacktrace: true, - }); - -export const captureMainException = (e: Error) => { - return Sentry.captureException(e); -}; - -export const captureMainBreadcrumb = (o: any) => { - return Sentry.addBreadcrumb(o); -}; - -export const setMainTags = (tags: any) => { - return Sentry.setTags(tags); -}; From 88778fecb7ae7bd5a3562fc003e95ca2a68b36da Mon Sep 17 00:00:00 2001 From: Monika Smolarek Date: Mon, 26 Feb 2024 22:14:51 +0100 Subject: [PATCH 12/19] modified: desktop/main.dev.ts --- desktop/main.dev.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/desktop/main.dev.ts b/desktop/main.dev.ts index 1c8c51765..337292499 100644 --- a/desktop/main.dev.ts +++ b/desktop/main.dev.ts @@ -23,7 +23,6 @@ import subscribeIPC from './main/subscribeIPC'; import { getDefaultAppContext } from './main/context'; import Wallet from './main/Wallet'; import startApp from './main/startApp'; -import { init, captureMainException } from './sentry'; import { cleanupTmpDir } from './testMode'; import Logger from './logger'; @@ -44,8 +43,6 @@ StoreService.init(); // State const context = getDefaultAppContext(); -init(); - // Check arguments if ( app.commandLine.hasSwitch('discovery') && @@ -68,4 +65,7 @@ app context.state = startApp(); return context.state; }) - .catch(captureMainException); + .catch((error) => { + logger.error('An error occurred during app initialization', error); + process.exit(1); + }); From ed6614fe1a892b415b49c56ae4373f397aa45751 Mon Sep 17 00:00:00 2001 From: Monika Smolarek Date: Tue, 27 Feb 2024 21:41:54 +0100 Subject: [PATCH 13/19] unistalled sentry packages --- package.json | 8 -- yarn.lock | 214 +-------------------------------------------------- 2 files changed, 3 insertions(+), 219 deletions(-) diff --git a/package.json b/package.json index 52ba193aa..e597a3a48 100644 --- a/package.json +++ b/package.json @@ -55,9 +55,6 @@ "npm": "9.8.1", "node": "18.18.0" }, - "resolutions": { - "@sentry/types": "^7.49.0" - }, "engineStrict": true, "homepage": "https://spacemesh.io/", "browserslist": [], @@ -88,8 +85,6 @@ "@babel/register": "7.13.8", "@jest-runner/electron": "^3.0.1", "@pmmmwh/react-refresh-webpack-plugin": "0.4.3", - "@sentry/cli": "^2.20.7", - "@sentry/webpack-plugin": "1.20.1", "@storybook/addon-actions": "^6.5.16", "@storybook/addon-essentials": "^6.5.6", "@storybook/addon-interactions": "^6.5.6", @@ -185,9 +180,6 @@ "@grpc/grpc-js": "1.8.14", "@grpc/proto-loader": "0.6.2", "@reduxjs/toolkit": "^1.9.5", - "@sentry/browser": "^7.99.0", - "@sentry/electron": "4.5.0", - "@sentry/react": "^7.49.0", "@spacemesh/address-wasm": "^0.2.0", "@spacemesh/ed25519-bip32": "^0.1.0", "@spacemesh/sm-codec": "^0.4.1", diff --git a/yarn.lock b/yarn.lock index 6592b4437..2e3487211 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2517,194 +2517,6 @@ redux-thunk "^2.4.2" reselect "^4.1.8" -"@sentry-internal/feedback@7.99.0": - version "7.99.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.99.0.tgz#c3fec1500cb24c9a5e09479d478fddca909477da" - integrity sha512-exIO1o+bE0MW4z30FxC0cYzJ4ZHSMlDPMHCBDPzU+MWGQc/fb8s58QUrx5Dnm6HTh9G3H+YlroCxIo9u0GSwGQ== - dependencies: - "@sentry/core" "7.99.0" - "@sentry/types" "7.99.0" - "@sentry/utils" "7.99.0" - -"@sentry-internal/replay-canvas@7.99.0": - version "7.99.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.99.0.tgz#d6ba7eec7ab2f7210a7deb6daa4dd82f7b1e9e29" - integrity sha512-PoIkfusToDq0snfl2M6HJx/1KJYtXxYhQplrn11kYadO04SdG0XGXf4h7wBTMEQ7LDEAtQyvsOu4nEQtTO3YjQ== - dependencies: - "@sentry/core" "7.99.0" - "@sentry/replay" "7.99.0" - "@sentry/types" "7.99.0" - "@sentry/utils" "7.99.0" - -"@sentry-internal/tracing@7.48.0": - version "7.48.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.48.0.tgz#d0c1eac1c046fda5c79d16dc1c918fee3bae3e9d" - integrity sha512-MFAPDTrvCtfSm0/Zbmx7HA0Q5uCfRadOUpN8Y8rP1ndz+329h2kA3mZRCuC+3/aXL11zs2CHUhcAkGjwH2vogg== - dependencies: - "@sentry/core" "7.48.0" - "@sentry/types" "7.48.0" - "@sentry/utils" "7.48.0" - tslib "^1.9.3" - -"@sentry-internal/tracing@7.99.0": - version "7.99.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.99.0.tgz#ad13f8343444ecf7323a4220d4e57a55166565d7" - integrity sha512-z3JQhHjoM1KdM20qrHwRClKJrNLr2CcKtCluq7xevLtXHJWNAQQbafnWD+Aoj85EWXBzKt9yJMv2ltcXJ+at+w== - dependencies: - "@sentry/core" "7.99.0" - "@sentry/types" "7.99.0" - "@sentry/utils" "7.99.0" - -"@sentry/browser@7.48.0": - version "7.48.0" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.48.0.tgz#03f39bec6949ff48e343c5862c5d54dfd4a2f9ff" - integrity sha512-tdx/2nhuiykncmXFlV4Dpp+Hxgt/v31LiyXE79IcM560wc+QmWKtzoW9azBWQ0xt5KOO3ERMib9qPE4/ql1/EQ== - dependencies: - "@sentry-internal/tracing" "7.48.0" - "@sentry/core" "7.48.0" - "@sentry/replay" "7.48.0" - "@sentry/types" "7.48.0" - "@sentry/utils" "7.48.0" - tslib "^1.9.3" - -"@sentry/browser@7.99.0", "@sentry/browser@^7.99.0": - version "7.99.0" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.99.0.tgz#3e78beb490d141c988038ea902689a1e9171c6cf" - integrity sha512-bgfoUv3wkwwLgN5YUOe0ibB3y268ZCnamZh6nLFqnY/UBKC1+FXWFdvzVON/XKUm62LF8wlpCybOf08ebNj2yg== - dependencies: - "@sentry-internal/feedback" "7.99.0" - "@sentry-internal/replay-canvas" "7.99.0" - "@sentry-internal/tracing" "7.99.0" - "@sentry/core" "7.99.0" - "@sentry/replay" "7.99.0" - "@sentry/types" "7.99.0" - "@sentry/utils" "7.99.0" - -"@sentry/cli@^1.75.1": - version "1.75.2" - resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.75.2.tgz#2c38647b38300e52c9839612d42b7c23f8d6455b" - integrity sha512-CG0CKH4VCKWzEaegouWfCLQt9SFN+AieFESCatJ7zSuJmzF05ywpMusjxqRul6lMwfUhRKjGKOzcRJ1jLsfTBw== - dependencies: - https-proxy-agent "^5.0.0" - mkdirp "^0.5.5" - node-fetch "^2.6.7" - progress "^2.0.3" - proxy-from-env "^1.1.0" - which "^2.0.2" - -"@sentry/cli@^2.20.7": - version "2.21.2" - resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.21.2.tgz#89e5633ff48a83d078c76c6997fffd4b68b2da1c" - integrity sha512-X1nye89zl+QV3FSuQDGItfM51tW9PQ7ce0TtV/12DgGgTVEgnVp5uvO3wX5XauHvulQzRPzwUL3ZK+yS5bAwCw== - dependencies: - https-proxy-agent "^5.0.0" - node-fetch "^2.6.7" - progress "^2.0.3" - proxy-from-env "^1.1.0" - which "^2.0.2" - -"@sentry/core@7.48.0": - version "7.48.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.48.0.tgz#1a5ec347ab7212d73a99583c2e64989e34e3263a" - integrity sha512-8FYuJTMpyuxRZvlen3gQ3rpOtVInSDmSyXqWEhCLuG/w34AtWoTiW7G516rsAAh6Hy1TP91GooMWbonP3XQNTQ== - dependencies: - "@sentry/types" "7.48.0" - "@sentry/utils" "7.48.0" - tslib "^1.9.3" - -"@sentry/core@7.99.0": - version "7.99.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.99.0.tgz#6881aae5ac1436637b3d88e0b12df4ab56016c5f" - integrity sha512-vOAtzcAXEUtS/oW7wi3wMkZ3hsb5Ch96gKyrrj/mXdOp2zrcwdNV6N9/pawq2E9P/7Pw8AXw4CeDZztZrjQLuA== - dependencies: - "@sentry/types" "7.99.0" - "@sentry/utils" "7.99.0" - -"@sentry/electron@4.5.0": - version "4.5.0" - resolved "https://registry.yarnpkg.com/@sentry/electron/-/electron-4.5.0.tgz#7a1c4b78bda06f5f4f6585acc19a7f276bc5bfe6" - integrity sha512-Xe5PsaiCw8CfqpgF9BQ0hn2fhBWqGHXPQgCh5oSLWOrck3MRhpWqH3g1sZJYlTBueJVXh5hxv1LveZwuKDiG2w== - dependencies: - "@sentry/browser" "7.48.0" - "@sentry/core" "7.48.0" - "@sentry/node" "7.48.0" - "@sentry/types" "7.48.0" - "@sentry/utils" "7.48.0" - deepmerge "4.3.0" - tslib "^2.5.0" - -"@sentry/node@7.48.0": - version "7.48.0" - resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.48.0.tgz#b2f15502b77796bf7bcaa29f2e9ce1420f7c49d1" - integrity sha512-DJyyZaVhv/pUzJPof7es6zYDHeWbNqE0T3tQfLCkShdyfR+Ew8In8W/x2s7S8vq0cfRq0rqv1E6B2/HpVdYO7g== - dependencies: - "@sentry-internal/tracing" "7.48.0" - "@sentry/core" "7.48.0" - "@sentry/types" "7.48.0" - "@sentry/utils" "7.48.0" - cookie "^0.4.1" - https-proxy-agent "^5.0.0" - lru_map "^0.3.3" - tslib "^1.9.3" - -"@sentry/react@^7.49.0": - version "7.99.0" - resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.99.0.tgz#5adab8f0e3314ad12a128ae6a79f587c46b32243" - integrity sha512-RtHwgzMHJhzJfSQpVG0SDPQYMTGDX3Q37/YWI59S4ALMbSW4/F6n/eQAvGVYZKbh2UCSqgFuRWaXOYkSZT17wA== - dependencies: - "@sentry/browser" "7.99.0" - "@sentry/core" "7.99.0" - "@sentry/types" "7.99.0" - "@sentry/utils" "7.99.0" - hoist-non-react-statics "^3.3.2" - -"@sentry/replay@7.48.0": - version "7.48.0" - resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.48.0.tgz#ca8f1543bad4717dcd65739bf1256a1933bba757" - integrity sha512-8fRHMGJ0NJeIZi6UucxUTvfDPaBa7+jU1kCTLjCcuH3X/UVz5PtGLMtFSO5U8HP+mUDlPs97MP1uoDvMa4S2Ng== - dependencies: - "@sentry/core" "7.48.0" - "@sentry/types" "7.48.0" - "@sentry/utils" "7.48.0" - -"@sentry/replay@7.99.0": - version "7.99.0" - resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.99.0.tgz#c63f2bd79a791538ba54bcd91f02379dc4d5c1cc" - integrity sha512-gyN/I2WpQrLAZDT+rScB/0jnFL2knEVBo8U8/OVt8gNP20Pq8T/rDZKO/TG0cBfvULDUbJj2P4CJryn2p/O2rA== - dependencies: - "@sentry-internal/tracing" "7.99.0" - "@sentry/core" "7.99.0" - "@sentry/types" "7.99.0" - "@sentry/utils" "7.99.0" - -"@sentry/types@7.48.0", "@sentry/types@7.99.0", "@sentry/types@^7.49.0": - version "7.73.0" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.73.0.tgz#6d811bbe413d319df0a592a672d6d72a94a8e716" - integrity sha512-/v8++bly8jW7r4cP2wswYiiVpn7eLLcqwnfPUMeCQze4zj3F3nTRIKc9BGHzU0V+fhHa3RwRC2ksqTGq1oJMDg== - -"@sentry/utils@7.48.0": - version "7.48.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.48.0.tgz#2866975ea8899aba35b083dd0558cbbe29ee8de1" - integrity sha512-d977sghkFVMfld0LrEyyY2gYrfayLPdDEpUDT+hg5y79r7zZDCFyHtdB86699E5K89MwDZahW7Erk+a1nk4x5w== - dependencies: - "@sentry/types" "7.48.0" - tslib "^1.9.3" - -"@sentry/utils@7.99.0": - version "7.99.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.99.0.tgz#ef96c3b59e23c79f3ef500db508234a48fa1cfbe" - integrity sha512-cYZy5WNTkWs5GgggGnjfGqC44CWir0pAv4GVVSx0fsup4D4pMKBJPrtub15f9uC+QkUf3vVkqwpBqeFxtmJQTQ== - dependencies: - "@sentry/types" "7.99.0" - -"@sentry/webpack-plugin@1.20.1": - version "1.20.1" - resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-1.20.1.tgz#e70a2fe516f3a39a132acfa841e4f2ea2a1cecd2" - integrity sha512-klOLkfM/oSYzcR2M9oDmJA5/Mdaw0Mtck/h820Z+gqpd6WJepjhqVDel1z2VddaP/XMY0Dj6elCGp2/nDWNr0w== - dependencies: - "@sentry/cli" "^1.75.1" - webpack-sources "^2.0.0 || ^3.0.0" - "@sindresorhus/is@^4.0.0": version "4.6.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" @@ -6766,11 +6578,6 @@ cookie@0.5.0: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== -cookie@^0.4.1: - version "0.4.2" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" - integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== - copy-concurrently@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" @@ -7171,11 +6978,6 @@ deep-is@^0.1.3, deep-is@~0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== -deepmerge@4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.0.tgz#65491893ec47756d44719ae520e0e2609233b59b" - integrity sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og== - deepmerge@^4.2.2: version "4.3.1" resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" @@ -11963,11 +11765,6 @@ lru-cache@^6.0.0: resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.1.tgz#0a3be479df549cca0e5d693ac402ff19537a6b7a" integrity sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g== -lru_map@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd" - integrity sha512-Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ== - lz-string@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941" @@ -12352,7 +12149,7 @@ mkdirp@1.x, mkdirp@^1.0.3: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@^0.5.6: +mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.6: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== @@ -13558,11 +13355,6 @@ proxy-addr@~2.0.7: forwarded "0.2.0" ipaddr.js "1.9.1" -proxy-from-env@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" - integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== - prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" @@ -15864,7 +15656,7 @@ tslib@^1.13.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.3, tslib@^2.1.0, tslib@^2.5.0: +tslib@^2.0.3, tslib@^2.1.0: version "2.6.2" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== @@ -16653,7 +16445,7 @@ webpack-sources@^1.4.0, webpack-sources@^1.4.1: source-list-map "^2.0.0" source-map "~0.6.1" -"webpack-sources@^2.0.0 || ^3.0.0", webpack-sources@^3.2.3: +webpack-sources@^3.2.3: version "3.2.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== From 2c7534f6ea6ea9d00f0886703272d1254c0bc185 Mon Sep 17 00:00:00 2001 From: Monika Smolarek Date: Tue, 27 Feb 2024 21:58:34 +0100 Subject: [PATCH 14/19] modified: app/infra/eventsService/eventsService.ts --- app/infra/eventsService/eventsService.ts | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/app/infra/eventsService/eventsService.ts b/app/infra/eventsService/eventsService.ts index 6dca4a43d..b790874b9 100644 --- a/app/infra/eventsService/eventsService.ts +++ b/app/infra/eventsService/eventsService.ts @@ -2,7 +2,6 @@ import { ipcRenderer } from 'electron'; import { ProgressInfo, UpdateInfo } from 'electron-updater'; import { TemplateRegistry } from '@spacemesh/sm-codec'; -import { setReactTags } from '../../sentry'; import { ipcConsts } from '../../vars'; import { setNodeError, @@ -50,7 +49,6 @@ import { CurrentLayer, GlobalStateHash } from '../../types/events'; import { AddContactRequest, AddWalletResponseType, - AppLogs, ChangePasswordRequest, CreateAccountResponse, CreateWalletRequest, @@ -178,11 +176,6 @@ class EventsService { static wipeOut = () => ipcRenderer.send(ipcConsts.W_M_WIPE_OUT); - /** ************************************ SENTRY ****************************************** */ - - static getNodeAndAppLogs = (): Promise> => - ipcRenderer.invoke(ipcConsts.GET_NODE_AND_APP_LOGS); - /** ************************************ SMESHER ****************************************** */ static selectPostFolder = () => ipcRenderer.invoke(ipcConsts.SMESHER_SELECT_POST_FOLDER); @@ -321,10 +314,6 @@ ipcRenderer.on( ipcConsts.N_M_GET_VERSION_AND_BUILD, (_event, payload: NodeVersionAndBuild) => { store.dispatch(setVersionAndBuild(payload)); - setReactTags({ - 'go-sapacemesh:version': payload.version, - 'go-sapacemesh:build': payload.build, - }); } ); From e58caeefcb5b479c8c38b1585f13a959436f6628 Mon Sep 17 00:00:00 2001 From: Monika Smolarek Date: Tue, 27 Feb 2024 22:12:05 +0100 Subject: [PATCH 15/19] modified: desktop/main/sources/node.ipc.ts --- desktop/main/sources/node.ipc.ts | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/desktop/main/sources/node.ipc.ts b/desktop/main/sources/node.ipc.ts index 66586fb95..f67416bdb 100644 --- a/desktop/main/sources/node.ipc.ts +++ b/desktop/main/sources/node.ipc.ts @@ -1,38 +1,8 @@ -import { combineLatestWith, from, map } from 'rxjs'; import { ipcConsts } from '../../../app/vars'; -import { - fromIPC, - handleIPC, - handlerResult, - makeSubscription, -} from '../rx.utils'; -import { addAppLogFile, addNodeLogFile } from '../../sentry'; +import { fromIPC } from '../rx.utils'; const nodeIPCStreams = () => ({ $nodeRestartRequest: fromIPC(ipcConsts.N_M_RESTART_NODE), }); -export const sentryLogsListener = () => - makeSubscription( - handleIPC( - ipcConsts.GET_NODE_AND_APP_LOGS, - () => { - return from(addNodeLogFile()) - .pipe(combineLatestWith(addAppLogFile())) - .pipe( - map(([nodelog, appLog]) => - handlerResult({ - genesisID: nodelog.genesisID, - nodeLogs: nodelog.content, - appLogs: appLog.content, - appLogsFileName: appLog.fileName, - }) - ) - ); - }, - (res) => res - ), - (_) => {} - ); - export default nodeIPCStreams; From 9fad0d796c874dfc9e80d8b1e4e1c5734418695c Mon Sep 17 00:00:00 2001 From: Monika Smolarek Date: Tue, 27 Feb 2024 22:18:15 +0100 Subject: [PATCH 16/19] modified: desktop/AutoStartManager.ts --- desktop/AutoStartManager.ts | 3 --- desktop/logger.ts | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/desktop/AutoStartManager.ts b/desktop/AutoStartManager.ts index 3be8390d4..e7dfe4db6 100644 --- a/desktop/AutoStartManager.ts +++ b/desktop/AutoStartManager.ts @@ -5,7 +5,6 @@ import { isLinuxAppImage } from '../shared/utils'; import Warning, { WarningType } from '../shared/warning'; import { isLinux, isMacOS, isWindows } from './osSystem'; import Logger from './logger'; -import { captureMainException } from './sentry'; import StoreService from './storeService'; // Utils @@ -63,8 +62,6 @@ const handleFailure = (err: unknown) => { }; } - err instanceof Error && captureMainException(err); - return { status: false, error: `Can not setup auto launch: ${err}`, diff --git a/desktop/logger.ts b/desktop/logger.ts index b8d71e394..33b943ee4 100644 --- a/desktop/logger.ts +++ b/desktop/logger.ts @@ -26,7 +26,7 @@ const Logger = ({ className }: { className: string }) => ({ const e = err instanceof Error ? String(err) : err; const msg = formatErrorMessage(className, fn, e, args); logger.error?.(msg); - // @todo clean up error invocation because of GRPC connection and streams and add sentry capture after it + // @todo clean up error invocation because of GRPC connection }, debug: (title: string, ...args: any[]) => { if (!isDebug()) return; From e54d0b186d5d2fc8f21d3afdece92ac6e0cbce1e Mon Sep 17 00:00:00 2001 From: Monika Smolarek Date: Tue, 27 Feb 2024 22:45:32 +0100 Subject: [PATCH 17/19] modified: app/StyledApp.tsx --- app/StyledApp.tsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/StyledApp.tsx b/app/StyledApp.tsx index e62e8453a..dc2dc8826 100644 --- a/app/StyledApp.tsx +++ b/app/StyledApp.tsx @@ -12,13 +12,10 @@ import ErrorBoundary from './ErrorBoundary'; import { ipcConsts } from './vars'; import { goToSwitchAPI, goToSwitchNetwork } from './routeUtils'; import { getThemeById } from './theme'; -import { init } from './sentry'; import Modals from './Modals'; const history = createMemoryHistory(); -init(history); - const EventRouter = () => { const onSwitchNet = (_, { isWalletOnly }) => goToSwitchNetwork(history, isWalletOnly); From a1c7f895994b4acbe05a10f55520fd60f1d63f64 Mon Sep 17 00:00:00 2001 From: Monika Smolarek Date: Fri, 1 Mar 2024 01:34:41 +0100 Subject: [PATCH 18/19] make links more readable --- app/basicComponents/Link.tsx | 1 + app/vars/colors.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/basicComponents/Link.tsx b/app/basicComponents/Link.tsx index 76218e983..5f08746be 100644 --- a/app/basicComponents/Link.tsx +++ b/app/basicComponents/Link.tsx @@ -11,6 +11,7 @@ const Wrapper = styled.div<{ line-height: 17px; font-weight: ${({ isPrimary }) => (isPrimary ? 400 : 800)}; text-decoration: underline; + text-underline-offset: 3px; ${({ isDisabled, isPrimary }) => isDisabled ? `color: ${smColors.disabledGray};` diff --git a/app/vars/colors.ts b/app/vars/colors.ts index 8027288a9..9675bb6c4 100644 --- a/app/vars/colors.ts +++ b/app/vars/colors.ts @@ -15,7 +15,7 @@ const smColors = { disabledGray10Alpha: 'rgba(188, 188, 189, 0.1)', purple: '#AA58B1', darkerPurple: '#814387', - blue: '#1776E3', + blue: '#588ecc', darkerBlue: '#0E4F9A', orange: '#F79F53', darkOrange: '#EC5C3D', From a15a2dbdd4781797cd95a4e97596d2507ed4b9c9 Mon Sep 17 00:00:00 2001 From: Monika Smolarek Date: Fri, 1 Mar 2024 11:09:55 +0100 Subject: [PATCH 19/19] modified the feedback modal --- app/components/common/Feedback.tsx | 411 ++++------------------------- 1 file changed, 54 insertions(+), 357 deletions(-) diff --git a/app/components/common/Feedback.tsx b/app/components/common/Feedback.tsx index 93a073fbe..8eb37e932 100644 --- a/app/components/common/Feedback.tsx +++ b/app/components/common/Feedback.tsx @@ -1,10 +1,10 @@ import React, { useState } from 'react'; -import styled, { css, keyframes } from 'styled-components'; -import { Button, Link, Tooltip } from '../../basicComponents'; -import { captureReactMessage, captureReactUserFeedback } from '../../sentry'; -import { smColors } from '../../vars'; +import styled from 'styled-components'; +import { eventsService } from '../../infra/eventsService'; +import SubHeader from '../../basicComponents/SubHeader'; +import { Button, Link } from '../../basicComponents'; import { ExternalLinks } from '../../../shared/constants'; -import CopyButton from '../../basicComponents/CopyButton'; +import { smColors } from '../../vars'; import Modal from './Modal'; import BackButton from './BackButton'; @@ -14,11 +14,6 @@ const Container = styled.div` margin-left: auto; `; -const Row = styled.div` - display: flex; - width: 100%; -`; - const ReportButton = styled.div` font-size: 12px; text-decoration: underline; @@ -28,36 +23,17 @@ const ReportButton = styled.div` user-select: none; `; -const Label = styled.div` - font-size: 16px; - line-height: 22px; +const Message = styled.span` color: ${({ theme }) => theme.color.contrast}; + margin-bottom: 20px; + font-size: 14px; + line-height: 25px; + padding-right: 40px; `; -const Star = styled((props) => *)` - color: ${({ theme }) => theme.popups.states.error.backgroundColor}; - position: relative; - bottom: 4px; - > * { - position: absolute; - } -`; - -const InputWrapper = styled( - (props: { children?: any; label: string; required?: boolean }) => ( -
- - {props.children} -
- ) -)` +const Row = styled.div` display: flex; - flex-direction: column; - gap: 10px; - margin-bottom: 24px; + width: 100%; `; const ModalContainer = styled.div` @@ -70,352 +46,73 @@ const ModalContainer = styled.div` margin-top: 8px; `; -const ErrorMessage = styled.span` - color: ${({ theme }) => theme.colors.error}; - margin-top: -20px; - margin-bottom: 10px; - font-size: 14px; -`; - -const SuccemssMessage = styled.span` - color: ${({ theme }) => theme.color.contrast}; - margin-bottom: 20px; - font-size: 14px; -`; - -const ActualInput = styled((props) => )<{ - value?: string; - onKeyPress?: (event: any) => void; - onChange: (event: any) => void; - onFocus?: (event: any) => void; - onBlur?: (event: any) => void; - isDisabled?: any; - iconRight?: string; -}>` - flex: 1; - width: 100%; - height: 38px; - padding: 8px 10px; - transition: background-color 100ms linear, border-color 100ms linear; - - color: ${({ - theme: { - form: { - input: { states }, - }, - }, - }) => states.normal.color}; - background-color: ${({ - theme: { - form: { - input: { states }, - }, - }, - }) => states.normal.backgroundColor}; - ${({ - theme: { - form: { - input: { states }, - }, - }, - }) => - css` - &:hover, - &:focus, - &:active { - background-color: ${states.focus.backgroundColor}; - color: ${states.focus.color}; - } - `} - font-size: 14px; - line-height: 16px; - outline: none; - cursor: text; - ${({ theme: { form } }) => css` - border-radius: ${form.input.boxRadius}px; - `} -`; - -const StyledTextArea = styled((props) =>