diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-04-04 12:45:12 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-04-04 12:45:12 +0200 |
| commit | d13ef49b155d74847c9af049ea526c66a1a804f6 (patch) | |
| tree | b6eace938bea09a67e7ec335abd1e24b3d5afb2c /app/javascript/mastodon | |
| parent | af01ab7efebab356e73b498afe4258ae7515cc6a (diff) | |
| parent | 0e919397db4977182386b93d2092fdeb5dff1f16 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/mastodon')
| -rw-r--r-- | app/javascript/mastodon/components/common_counter.jsx | 1 | ||||
| -rw-r--r-- | app/javascript/mastodon/components/hashtag.jsx | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/app/javascript/mastodon/components/common_counter.jsx b/app/javascript/mastodon/components/common_counter.jsx index d97e7e7d6..dd9b62de9 100644 --- a/app/javascript/mastodon/components/common_counter.jsx +++ b/app/javascript/mastodon/components/common_counter.jsx @@ -1,6 +1,5 @@ // @ts-check import React from 'react'; -// @ts-expect-error import { FormattedMessage } from 'react-intl'; /** diff --git a/app/javascript/mastodon/components/hashtag.jsx b/app/javascript/mastodon/components/hashtag.jsx index 19d87508b..94c61b654 100644 --- a/app/javascript/mastodon/components/hashtag.jsx +++ b/app/javascript/mastodon/components/hashtag.jsx @@ -1,7 +1,6 @@ // @ts-check import React from 'react'; import { Sparklines, SparklinesCurve } from 'react-sparklines'; -// @ts-expect-error import { FormattedMessage } from 'react-intl'; import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; @@ -92,9 +91,7 @@ const Hashtag = ({ name, to, people, uses, history, className, description, with {withGraph && ( <div className='trends__item__sparkline'> <SilentErrorBoundary> - {/* @ts-expect-error */} <Sparklines width={50} height={28} data={history ? history : Array.from(Array(7)).map(() => 0)}> - {/* @ts-expect-error */} <SparklinesCurve style={{ fill: 'none' }} /> </Sparklines> </SilentErrorBoundary> |