Merge branch 'main' into switch-to-vite

2023-05-24 21:37:28 -04:00
parent d625a003b8 6bb5274d83
commit d1e59fe08c
10 changed files with 116 additions and 22 deletions
--- a/web/src/components/SubscriptionPopup.jsx
+++ b/web/src/components/SubscriptionPopup.jsx
@@ -247,6 +247,8 @@ const DisplayNameDialog = (props) => {
          inputProps={{
            maxLength: 64,
            "aria-label": t("display_name_dialog_placeholder"),
+          }}
+          InputProps={{
            endAdornment: (
              <InputAdornment position="end">
                <IconButton onClick={() => setDisplayName("")} edge="end">