Merge branch 'fix/remove-screen-size-conditions' into beta

perawallet · Nov 16, 2023 · 6eb42f6 · 6eb42f6
2 parents 68eeea9 + 717c2eb
commit 6eb42f6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.7",
+  "version": "1.0.8",
   "name": "@perawallet/connect-beta",
   "description": "Beta version of Pera Wallet Connect",
   "main": "dist/index.js",

diff --git a/src/modal/PeraWalletConnectModal.ts b/src/modal/PeraWalletConnectModal.ts
@@ -1,5 +1,4 @@
 import {isMobile} from "../util/device/deviceUtils";
-import {isSmallScreen} from "../util/screen/screenSizeUtils";
 import {
   PERA_WALLET_CONNECT_MODAL_ID,
   PERA_WALLET_MODAL_CLASSNAME
@@ -27,7 +26,7 @@ export class PeraWalletConnectModal extends HTMLElement {
         peraWalletConnectModalClassNames = `${peraWalletConnectModalClassNames} ${PERA_WALLET_MODAL_CLASSNAME}--compact`;
       }
 
-      if (isSmallScreen() && isMobile()) {
+      if (isMobile()) {
         peraWalletConnectModal.innerHTML = `
         <div class="${peraWalletConnectModalClassNames}">
           <div class="pera-wallet-modal__body" part="body">

diff --git a/src/modal/header/PeraWalletModalHeader.ts b/src/modal/header/PeraWalletModalHeader.ts
@@ -3,7 +3,6 @@ import CloseIcon from "../../asset/icon/Close.svg";
 import CloseIconDark from "../../asset/icon/Close--dark.svg";
 
 import styles from "./_pera-wallet-modal-header.scss";
-import {isSmallScreen} from "../../util/screen/screenSizeUtils";
 import {isMobile} from "../../util/device/deviceUtils";
 import {
   PERA_WALLET_REDIRECT_MODAL_ID,
@@ -19,7 +18,7 @@ const headerClassName = isMobile()
 peraWalletModalHeader.innerHTML = `
   <div class="${headerClassName}">
       ${
-        isSmallScreen() && isMobile()
+        isMobile()
           ? ""
           : `<div class="pera-wallet-modal-header__brand">
               <img src="${PeraConnectIcon}" />
@@ -38,7 +37,7 @@ peraWalletModalHeader.innerHTML = `
         class="pera-wallet-button pera-wallet-modal-header__close-button">
         <img
           class="pera-wallet-modal-header__close-button__close-icon"
-          src="${isSmallScreen() && isMobile() ? CloseIconDark : CloseIcon}"
+          src="${isMobile() ? CloseIconDark : CloseIcon}"
         />
       </button>
     </div>

diff --git a/src/modal/section/information/PeraWalletConnectModalInformationSection.ts b/src/modal/section/information/PeraWalletConnectModalInformationSection.ts
@@ -4,7 +4,6 @@ import NoteIcon from "../../../asset/icon/Note.svg";
 import PeraWalletWithText from "../../../asset/icon/PeraWallet--with-text.svg";
 import PeraWalletLogo from "../../../asset/icon/PeraWallet.svg";
 
-import {isSmallScreen} from "../../../util/screen/screenSizeUtils";
 import styles from "./_pera-wallet-connect-modal-information-section.scss";
 import {isMobile} from "../../../util/device/deviceUtils";
 
@@ -94,7 +93,7 @@ export class PeraWalletConnectModalInformationSection extends HTMLElement {
         styleSheet
       );
 
-      if (isSmallScreen() && isMobile()) {
+      if (isMobile()) {
         this.shadowRoot
           .getElementById("pera-wallet-connect-modal-information-section-title")
           ?.setAttribute("style", "display: none;");