Merge pull request #452 from near/dev

v7.0.2 Release (dev -> main)
near · Sep 12, 2022 · d4c1566 · d4c1566
2 parents a78588b + b9ca53b
commit d4c1566
Show file tree

Hide file tree

Showing 19 changed files with 49 additions and 32 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "near-wallet-selector",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "description": "NEAR Wallet Selector makes it easy for users to interact with your dApp by providing an abstraction over various wallets within the NEAR ecosystem",
   "keywords": [
     "near",
@@ -154,4 +154,4 @@
     "typescript": "~4.7.2",
     "uuid": "^8.3.2"
   }
-}
+}
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@near-wallet-selector/core",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "peerDependencies": {
     "near-api-js": "^0.44.2"
   }
-}
+}
diff --git a/packages/default-wallets/package.json b/packages/default-wallets/package.json
@@ -1,4 +1,4 @@
 {
   "name": "@near-wallet-selector/default-wallets",
-  "version": "7.0.1"
-}
+  "version": "7.0.2"
+}
diff --git a/packages/ledger/package.json b/packages/ledger/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@near-wallet-selector/ledger",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "peerDependencies": {
     "near-api-js": "^0.44.2"
   }
-}
+}
diff --git a/packages/math-wallet/package.json b/packages/math-wallet/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@near-wallet-selector/math-wallet",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "peerDependencies": {
     "near-api-js": "^0.44.2"
   }
-}
+}
diff --git a/packages/meteor-wallet/package.json b/packages/meteor-wallet/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@near-wallet-selector/meteor-wallet",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "peerDependencies": {
     "near-api-js": "^0.44.2"
   }
-}
+}
diff --git a/packages/modal-ui-js/package.json b/packages/modal-ui-js/package.json
@@ -1,4 +1,4 @@
 {
   "name": "@near-wallet-selector/modal-ui-js",
-  "version": "7.0.1"
-}
+  "version": "7.0.2"
+}
diff --git a/packages/modal-ui-js/src/lib/components/GetAWallet.ts b/packages/modal-ui-js/src/lib/components/GetAWallet.ts
@@ -64,7 +64,11 @@ export async function renderGetAWallet() {
     </div>
   `;
 
-  const filteredModules = modalState.modules.slice(0, 3);
+  const filterByType = (item: { type: string }) => {
+    return item.type !== "bridge" && item.type !== "hardware";
+  };
+
+  const filteredModules = modalState.modules.filter(filterByType).slice(0, 3);
 
   for (let i = 0; i < filteredModules.length; i++) {
     document.getElementById("wallets")?.insertAdjacentHTML(

diff --git a/packages/modal-ui-js/src/lib/styles.css b/packages/modal-ui-js/src/lib/styles.css
@@ -1117,6 +1117,10 @@
       text-align: center;
     }
 
+    .nws-modal-wrapper .nws-modal .nws-modal-body button.get-wallet {
+      background-color: var(--wallet-selector-home-button-bg, var(--content-bg));
+    }
+
     .nws-modal-wrapper .wallet-not-installed-wrapper>p {
       margin: 20px 0px 30px 0px;
       max-width: 500px;

diff --git a/packages/modal-ui/package.json b/packages/modal-ui/package.json
@@ -1,4 +1,4 @@
 {
   "name": "@near-wallet-selector/modal-ui",
-  "version": "7.0.1"
-}
+  "version": "7.0.2"
+}
diff --git a/packages/modal-ui/src/lib/components/WalletHome.tsx b/packages/modal-ui/src/lib/components/WalletHome.tsx
@@ -25,7 +25,11 @@ export const WalletHome: React.FC<WalletHomeProps> = ({
 
   useEffect(() => {
     const subscription = selector.store.observable.subscribe((state) => {
-      const filteredModules = state.modules.slice(0, 3);
+      const filterByType = (item: { type: string }) => {
+        return item.type !== "bridge" && item.type !== "hardware";
+      };
+
+      const filteredModules = state.modules.filter(filterByType).slice(0, 3);
 
       setModules(filteredModules);
     });

diff --git a/packages/modal-ui/src/lib/components/styles.css b/packages/modal-ui/src/lib/components/styles.css
@@ -1066,6 +1066,7 @@
 
 
 @media (max-width: 768px) {
+
     .nws-modal-wrapper .nws-modal .wallet-home-wrapper .wallet-info-wrapper {
       margin-top: 45px;
     }
@@ -1120,6 +1121,10 @@
         max-width: 500px;
     }
 
+    .nws-modal-wrapper .nws-modal .nws-modal-body button.get-wallet {
+      background-color: var(--wallet-selector-home-button-bg, var(--content-bg));
+    }
+
     .nws-modal-wrapper .nws-modal .modal-right .nws-modal-body .what-wallet-hide {
         display: none;
     }

diff --git a/packages/my-near-wallet/package.json b/packages/my-near-wallet/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@near-wallet-selector/my-near-wallet",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "peerDependencies": {
     "near-api-js": "^0.44.2"
   }
-}
+}
diff --git a/packages/near-wallet/package.json b/packages/near-wallet/package.json
@@ -1,4 +1,4 @@
 {
   "name": "@near-wallet-selector/near-wallet",
-  "version": "7.0.1"
-}
+  "version": "7.0.2"
+}
diff --git a/packages/nightly-connect/package.json b/packages/nightly-connect/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@near-wallet-selector/nightly-connect",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "peerDependencies": {
     "near-api-js": "^0.44.2"
   }
-}
+}
diff --git a/packages/nightly/package.json b/packages/nightly/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@near-wallet-selector/nightly",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "peerDependencies": {
     "near-api-js": "^0.44.2"
   }
-}
+}
diff --git a/packages/sender/package.json b/packages/sender/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@near-wallet-selector/sender",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "peerDependencies": {
     "near-api-js": "^0.44.2"
   }
-}
+}
diff --git a/packages/wallet-connect/package.json b/packages/wallet-connect/package.json
@@ -1,4 +1,4 @@
 {
   "name": "@near-wallet-selector/wallet-connect",
-  "version": "7.0.1"
-}
+  "version": "7.0.2"
+}
diff --git a/packages/wallet-utils/package.json b/packages/wallet-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@near-wallet-selector/wallet-utils",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "peerDependencies": {
     "near-api-js": "^0.44.2"
   }
-}
+}