Merge pull request #3330 from Emurgo/fix/uat-revamp

fix(revamp): address all user-acceptance-testing revamp issues
Emurgo · Nov 1, 2023 · 5763405 · 5763405
2 parents 5cdcfbd + 0218cc3
commit 5763405
Show file tree

Hide file tree

Showing 40 changed files with 1,011 additions and 372 deletions.
diff --git a/packages/yoroi-extension/app/assets/images/calendar.inline.svg b/packages/yoroi-extension/app/assets/images/calendar.inline.svg
diff --git a/packages/yoroi-extension/app/assets/images/no.inline.svg b/packages/yoroi-extension/app/assets/images/no.inline.svg
diff --git a/...ts/images/sidebar/open_sidebar.inline.svg → ...ts/images/sidebar/open-sidebar.inline.svg b/...ts/images/sidebar/open_sidebar.inline.svg → ...ts/images/sidebar/open-sidebar.inline.svg
diff --git a/packages/yoroi-extension/app/assets/images/sidebar/revamp/yoroi-logo.inline.svg b/packages/yoroi-extension/app/assets/images/sidebar/revamp/yoroi-logo.inline.svg
diff --git a/...es/sidebar/yoroi_logo_expanded.inline.svg → ...es/sidebar/yoroi-logo-expanded.inline.svg b/...es/sidebar/yoroi_logo_expanded.inline.svg → ...es/sidebar/yoroi-logo-expanded.inline.svg
diff --git a/...sets/images/sidebar/yoroi_logo.inline.svg → ...sets/images/sidebar/yoroi-logo.inline.svg b/...sets/images/sidebar/yoroi_logo.inline.svg → ...sets/images/sidebar/yoroi-logo.inline.svg
diff --git a/packages/yoroi-extension/app/assets/images/yes.inline.svg b/packages/yoroi-extension/app/assets/images/yes.inline.svg
diff --git a/packages/yoroi-extension/app/assets/images/yoroi-logo-revamp-blue.inline.svg b/packages/yoroi-extension/app/assets/images/yoroi-logo-revamp-blue.inline.svg
diff --git a/...ges/yoroi-extension/app/assets/images/yoroi-logo-revamp-nightly-blue.inline.svg b/...ges/yoroi-extension/app/assets/images/yoroi-logo-revamp-nightly-blue.inline.svg
diff --git a/packages/yoroi-extension/app/assets/images/yoroi-nightly-icon-dark.inline.svg b/packages/yoroi-extension/app/assets/images/yoroi-nightly-icon-dark.inline.svg
diff --git a/packages/yoroi-extension/app/components/common/TextField.js b/packages/yoroi-extension/app/components/common/TextField.js
@@ -88,7 +88,7 @@ function TextField({
               position="end"
               sx={{ minWidth: '52px', display: 'flex', justifyContent: 'flex-end' }}
             >
-              {Boolean(error) === true ? (
+              {Boolean(error) === true && !isRevampTheme ? (
                 <ErrorIcon />
               ) : done === true && !isRevampTheme ? (
                 <DoneIcon />
@@ -111,7 +111,7 @@ function TextField({
               position="end"
               sx={{ minWidth: '52px', display: 'flex', justifyContent: 'flex-end' }}
             >
-              {Boolean(error) === true ? (
+              {Boolean(error) === true && !isRevampTheme ? (
                 <ErrorIcon />
               ) : done === true && !isRevampTheme ? (
                 <DoneIcon />
@@ -122,7 +122,7 @@ function TextField({
             </InputAdornment>
           ) : (
             <InputAdornment position="end">
-              {Boolean(error) === true ? (
+              {Boolean(error) === true && !isRevampTheme ? (
                 <ErrorIcon />
               ) : done === true && !isRevampTheme ? (
                 <DoneIcon />