Resolved conflicts from main

.github/workflows/auto_add_project.yml

@@ -0,0 +1,16 @@
+name: Auto-add issues to org project
+
+on:
+  issues:
+    types:
+      - opened
+
+jobs:
+  add-to-project:
+    name: Auto-add issues to org project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+        with:
+          project-url: https://github.com/orgs/ethereum-push-notification-service/projects/10
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}

package.json

@@ -33,10 +33,9 @@
     "@mui/icons-material": "^5.8.4",
     "@mui/lab": "^5.0.0-alpha.72",
     "@mui/material": "^5.5.0",
-    "@pushprotocol/ledgerlive": "latest",
-    "@pushprotocol/restapi": "1.4.38",
+    "@pushprotocol/restapi": "1.4.45",
     "@pushprotocol/socket": "0.5.3",
-    "@pushprotocol/uiweb": "1.1.19",
+    "@pushprotocol/uiweb": "1.1.23",
     "@reduxjs/toolkit": "^1.7.1",
     "@testing-library/dom": "^9.0.1",
     "@testing-library/jest-dom": "^4.2.4",

src/components/MetamaskSnap/InstallMetamaskSnapModal.tsx

@@ -11,6 +11,7 @@ import { Button } from 'components/SharedStyling';
 import Metamask from 'assets/PushSnaps/metamasksnap.svg';
 import PushIcon from 'assets/PushSnaps/PushIcon.svg';
 import VersoIcon from 'assets/PushSnaps/VersoIcon.svg';
+import UDIcon from 'assets/PushSnaps/UDIcon.svg';
 import AppStoreQRCode from 'assets/PushSnaps/AppStoreQRCode.svg';
 import PlayStoreQRCode from 'assets/PushSnaps/PlayStoreQRCode.svg';
 import AppleIcon from 'assets/PushSnaps/AppleIcon.svg';
@@ -115,6 +116,29 @@ const InstallMetamaskSnapModal = ({
                     </a>
                 </SnapInner>
             </SnapContainer>
+            <SnapContainer>
+                <SnapInner>
+                    <Logo
+                        src={UDIcon}
+                        alt="UD Icon"
+                    />
+                    <SpanV2
+                        fontSize="16px"
+                        fontWeight="400"
+                        color={theme.modalMessageColor}
+                    >
+                        Unstoppable Domains
+                    </SpanV2>
+                </SnapInner>
+                <SnapInner>
+                    <a href="https://apps.apple.com/nz/app/unstoppable-domains/id1544748602" target="_blank">
+                        <AppstoreInstallBtn><Image src={AppleIcon} width="16px" height="20px" alt='App store' /></AppstoreInstallBtn>
+                    </a>
+                    <a href="https://play.google.com/store/apps/details?id=com.unstoppabledomains.manager&hl=en&gl=US" target="_blank">
+                        <AppstoreInstallBtn><Image src={PlayStore} width="16px" height="20px" alt='Play store' /></AppstoreInstallBtn>
+                    </a>
+                </SnapInner>
+            </SnapContainer>
 
             <ItemHV2 gap='14px'>
 

src/components/SendNotifications.tsx

@@ -171,7 +171,12 @@ const {handleConnectWallet} = useContext(AppContext);
     if (channelSettings) {
       const settingsOptions = channelSettings.map((setting) => ({
         label:
-          setting.type === 2 ? (
+          setting.type === 3 ? (
+            <DropdownLabel>
+              <div>{setting.description}</div>
+              <Tag>Multi-Range</Tag>
+            </DropdownLabel>
+          ) : setting.type === 2 ? (
             <DropdownLabel>
               <div>{setting.description}</div>
               <Tag>Range</Tag>