Skip to content

Commit

Permalink
Resolved conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
0xNilesh committed Dec 22, 2023
2 parents 8369fd3 + debe43c commit e7f1c7a
Show file tree
Hide file tree
Showing 23 changed files with 335 additions and 921 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/auto_add_project.yml
Original file line number Diff line number Diff line change
@@ -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 }}
32 changes: 0 additions & 32 deletions ledger.manifest.json

This file was deleted.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.41",
"@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",
Expand Down
4 changes: 4 additions & 0 deletions src/assets/PushSnaps/UDIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions src/components/MetamaskSnap/InstallMetamaskSnapModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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'>

Expand Down
Loading

0 comments on commit e7f1c7a

Please sign in to comment.