Merge branch 'develop' into audio-player

2020-07-02 16:32:50 -05:00
parent 3be1c9a1f1 e965c74760
commit 4e94c5d2ca
76 changed files with 392 additions and 344 deletions
--- a/app/soapbox/features/status/components/card.js
+++ b/app/soapbox/features/status/components/card.js
@@ -75,7 +75,7 @@ export default class Card extends React.PureComponent {
    embedded: false,
  };

-  componentWillReceiveProps(nextProps) {
+  componentDidUpdate(nextProps) {
    if (!Immutable.is(this.props.card, nextProps.card)) {
      this.setState({ embedded: false });
    }