[BX-1431] ESC to dismiss Token Details fails (#1521)

Co-authored-by: Daniel Sinclair <[email protected]>
rainbow-me · May 11, 2024 · fc32698 · fc32698
1 parent 41970b6
commit fc32698
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/entries/popup/components/Navbar/Navbar.tsx b/src/entries/popup/components/Navbar/Navbar.tsx
@@ -194,10 +194,10 @@ function NavbarButtonWithBack({
  e.key === shortcuts.global.CLOSE.key &&
  !radixIsActive() &&
  (withinModal || !getActiveModal());
- if (
- closeWithEscape ||
- (!getInputIsFocused() && e.key === shortcuts.global.BACK.key)
- ) {
+ const closeWithArrow =
+ !getInputIsFocused() && e.key === shortcuts.global.BACK.key;
+
+ if (closeWithEscape || closeWithArrow) {
  trackShortcut({
  key: closeWithEscape
  ? shortcuts.global.CLOSE.display

diff --git a/src/entries/popup/pages/home/TokenDetails/TokenDetails.tsx b/src/entries/popup/pages/home/TokenDetails/TokenDetails.tsx
@@ -480,6 +480,13 @@ export function TokenDetails() {
  const navigate = useRainbowNavigate();
  const token = userAsset || customAsset;
 
+ useEffect(() => {
+ const app = document.getElementById('app');
+ setTimeout(() => {
+ app?.focus();
+ }, 150);
+ }, []);
+
  const { data: approvals } = useApprovals(
  {
  address: currentAddress,
@@ -583,6 +590,7 @@ export function TokenDetails() {
  state: { skipTransitionOnRoute: ROUTES.HOME },
  })
  }
+ withinModal
  />
  }
  rightComponent={