Skip to content

Commit

Permalink
Merge pull request #789 from ethereum-push-notification-service/chore…
Browse files Browse the repository at this point in the history
…/rn-sdk-conflict-fix

Sdk merge conflict fix
  • Loading branch information
kalashshah authored Oct 16, 2023
2 parents 85d2ebd + 993ca7c commit 948892d
Show file tree
Hide file tree
Showing 220 changed files with 41,820 additions and 11,143 deletions.
6 changes: 5 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nrwl/nx/typescript"],
"rules": {}
"rules": {
"@typescript-eslint/no-unused-vars": "off",
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/no-explicit-any": "off"
}
},
{
"files": ["*.js", "*.jsx"],
Expand Down
79 changes: 79 additions & 0 deletions .github/ISSUE_TEMPLATE/BUG_REPORT.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: "🐛 Bug Report"
description: Create a bug report to help us improve.
title: "🐛 [BUG] - <title>"
labels: [
"bug"
]
body:
- type: textarea
id: expected-behaviour
attributes:
label: "Expected Behaviour"
description: Please describe the behavior you are expecting
placeholder: Short and explicit description of your desired behaviour...
validations:
required: true
- type: textarea
id: current-behaviour
attributes:
label: "Current Behaviour"
description: Please describe the current behavior
placeholder: What is the current behavior?...
validations:
required: true
- type: textarea
id: reprod
attributes:
label: "Reproduction steps"
description: Please enter an explicit description of your issue
value: |
1. Go to '...'
2. Invoke function '...'
3. See error
render: bash
validations:
required: true
- type: textarea
id: screenshot
attributes:
label: "Screenshots"
description: If applicable, add screenshots to help explain your problem.
value: |
![DESCRIPTION](LINK.png)
render: bash
validations:
required: false
- type: textarea
id: logs
attributes:
label: "Relevant Logs"
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
render: bash
validations:
required: false
- type: dropdown
id: dapp-env
attributes:
label: "Dapp Env"
description: What is the impacted DApp environment ?
multiple: true
options:
- Prod (app.push.org)
- Staging (staging.push.org)
- Dev (dev.push.org)
validations:
required: true
- type: dropdown
id: browsers
attributes:
label: "Browsers"
description: What browsers are you seeing the problem on ?
multiple: true
options:
- Firefox
- Chrome
- Safari
- Microsoft Edge
- Opera
validations:
required: false
35 changes: 35 additions & 0 deletions .github/ISSUE_TEMPLATE/DOCUMENTATION_README_ISSUE.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: "✏️ Documentation/Readme Enhancement"
description: Suggest an enhancement in documentation/readme.
title: "✏️ [Documentation/Readme Enhancement] - <title>"
labels: [
"documentation"
]
body:
- type: textarea
id: expected-behaviour
attributes:
label: "Expected Behaviour"
description: Please describe the behavior you are expecting
placeholder: Short and explicit description of your desired behaviour...
validations:
required: false
- type: textarea
id: current-behaviour
attributes:
label: "Current Behaviour"
description: Please describe the current behavior
placeholder: What is the current behavior?...
validations:
required: false
- type: textarea
id: reprod
attributes:
label: "Steps to Reproduce"
description: Please enter an explicit description of your issue
value: |
1. Go to '...'
2. Invoke function '...'
3. See error
render: bash
validations:
required: false
40 changes: 40 additions & 0 deletions .github/ISSUE_TEMPLATE/IMPROVEMENT_PROPOSAL.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: "😈 Improvement Proposal"
description: Suggest improvement,whether new or built upon existing features.
title: "😈 [Improvement Proposal] - <title>"
labels: [
"Improvement proposal"
]
body:
- type: input
id: proposal-name
attributes:
label: "Proposal name"
description: Brief title or summary of the proposed improvement.
placeholder: Summary of the proposal improvement.
validations:
required: true
- type: textarea
id: description
attributes:
label: "Describe the Proposal"
description: Please describe detailed description of the improvement, including the problem it solves and the benefits it brings.
placeholder: Detailed description of your desired proposal...
validations:
required: true
- type: textarea
id: usecase
attributes:
label: "Use Case"
description: Please explain the specific use cases or scenarios where this improvement would be valuable..
placeholder: List down the use case.
validations:
required: true
- type: textarea
id: current-limitations
attributes:
label: "Current Limitations"
description: Any existing limitations, issues, or challenges with the SDK that the proposed improvement aims to address.
placeholder: Overview for the current problem/limitations.
validations:
required: true

27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE/OTHER.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: "👾 Other"
description: Something that doesn't belong elsewhere.
title: "👾 [Other] - <title>"
labels: [
"Other"
]
body:
- type: textarea
id: description
attributes:
label: "Description"
description: Please describe something
placeholder: Detailed description of what you wanna share...
validations:
required: true
- type: dropdown
id: dapp-env
attributes:
label: "Dapp Env"
description: What is the impacted DApp environment ?
multiple: true
options:
- Prod (app.push.org)
- Staging (staging.push.org)
- Dev (dev.push.org)
validations:
required: false
15 changes: 15 additions & 0 deletions .github/ISSUE_TEMPLATE/QUESTION_SUPPORT.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: "❓ Question or Support Request"
description: Questions and requests for support.
title: "❓ [Question/Support] - <title>"
labels: [
"support"
]
body:
- type: textarea
id: support-request
attributes:
label: "Question or Support Request"
description: Describe your question or ask for support.
placeholder: Detailed description of your question/support request...
validations:
required: true
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<h4 align="center">

<a href="discord.gg/pushprotocol">
<a href="https://discord.com/invite/pushprotocol">
<img src="https://img.shields.io/badge/discord-7289da.svg?style=flat-square" alt="discord">
</a>
<a href="https://twitter.com/pushprotocol">
Expand Down Expand Up @@ -177,7 +177,7 @@ node main
- **[Website](https://push.org)** To checkout our Product.
- **[Docs](https://docs.push.org/developers/)** For comprehensive documentation.
- **[Blog](https://medium.com/push-protocol)** To learn more about our partners, new launches, etc.
- **[Discord](discord.gg/pushprotocol)** for support and discussions with the community and the team.
- **[Discord](https://discord.com/invite/pushprotocol)** for support and discussions with the community and the team.
- **[GitHub](https://github.com/ethereum-push-notification-service)** for source code, project board, issues, and pull requests.
- **[Twitter](https://twitter.com/pushprotocol)** for the latest updates on the product and published blogs.

Expand All @@ -196,7 +196,7 @@ Read how you can contribute <a href="https://github.com/ethereum-push-notificati
Not sure where to start? Join our discord and we will help you get started!


<a href="discord.gg/pushprotocol" title="Join Our Community"><img src="https://www.freepnglogos.com/uploads/discord-logo-png/playerunknown-battlegrounds-bgparty-15.png" width="200" alt="Discord" /></a>
<a href="https://discord.com/invite/pushprotocol" title="Join Our Community"><img src="https://www.freepnglogos.com/uploads/discord-logo-png/playerunknown-battlegrounds-bgparty-15.png" width="200" alt="Discord" /></a>

## License
Check out our License <a href='https://github.com/ethereum-push-notification-service/push-sdk/blob/main/license-v1.md'>HERE </a>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,6 @@
"react-test-renderer": "17.0.2",
"ts-jest": "27.1.4",
"ts-node": "9.1.1",
"typescript": "~4.6.2"
"typescript": "5.0.2"
}
}
4 changes: 2 additions & 2 deletions packages/examples/sdk-backend-node/.env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ VIDEO_CHAIN_ID=your_video_chain_id
# VIDEO SENDER ADDRESS
VIDEO_SENDER_ADDRESS=your_video_sender_address

# VIDEO RECIPEINT ADDRESS
VIDEO_RECIPEINT_ADDRESS=your_video_recipeint_address
# VIDEO RECIPIENT ADDRESS
VIDEO_RECIPIENT_ADDRESS=your_video_recipient_address

# VIDEO CHAT ID
VIDEO_CHAT_ID=your_video_chat_id
Loading

0 comments on commit 948892d

Please sign in to comment.