Skip to content

Commit

Permalink
Merge changes from the yours repo (#211) (#212)
Browse files Browse the repository at this point in the history
* Merge changes from the yours repo (#211)

* position receive button within the tabpanel

* renaming (#1)

* renaming

* update github funding

* update PandaEmitEvent to YoursEmitEvent

* update PandaRequest to YoursRequest

* update HOSTED_PANDA_IMAGE to HOSTED_YOURS_IMAGE

* update locked message

* update createPandaMethod to createYoursMethod

* update PANDA_DEV_WALLET to YOURS_DEV_WALLET

* update PANDA_GITHUB_REPO to YOURS_GITHUB_REPO

* update text

* update InternalPandaTags to InternalYoursTags

* seedlings

* yours_wallet_keys.json

* update github repo url

* update PandaHeadProps to YoursHeadProps

* update panda to yoursLogo

* update PandaImg to YoursImg

* use yours-logo.png instead (for now)

* can be replaced with a colored .svg when available

* update PandaHead to YoursHead

* update text

* cleanup

* this image is not used

* update createPandaEventEmitter to createYoursEventEmitter

* update text

* rename file

* typo

* bullets

* minor copy update

* YoursHead to YoursIcon

* update logo

---------

Co-authored-by: Dan Wagner <[email protected]>

---------

Co-authored-by: Ryan Wold <[email protected]>

* feat: expose indentity key and rename

---------

Co-authored-by: Ryan Wold <[email protected]>
  • Loading branch information
danwag06 and afomi authored May 31, 2024
1 parent 48ec709 commit 421c5f6
Show file tree
Hide file tree
Showing 25 changed files with 112 additions and 109 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# These are supported funding model platforms

open_collective: panda-wallet
github: panda-wallet
github: yours-wallet
12 changes: 6 additions & 6 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
## Panda Wallet Code of Conduct
## Yours Wallet Code of Conduct

**Introduction:**

The Panda Wallet community is committed to providing a safe, respectful, and inclusive environment for all contributors and users. This code of conduct outlines our expectations for behavior and sets the standard for how we interact within our community.
The Yours Wallet community is committed to providing a safe, respectful, and inclusive environment for all contributors and users. This code of conduct outlines our expectations for behavior and sets the standard for how we interact within our community.

**1. Purpose:**

The purpose of this code of conduct is to ensure that all individuals, regardless of their background, identity, or perspective, can participate in our project without fear of discrimination, harassment, or exclusion. We aim to foster an open and welcoming community that encourages collaboration and diverse viewpoints.

**2. Expected Behavior:**

When interacting within the Panda Wallet community, we expect all community members, including contributors, maintainers, and users, to:
When interacting within the Yours Wallet community, we expect all community members, including contributors, maintainers, and users, to:

- Be respectful and considerate of others.
- Use welcoming and inclusive language.
Expand All @@ -36,7 +36,7 @@ Consequences for violating this code of conduct may include warnings, temporary

**5. Enforcement Responsibilities:**

The enforcement of this code of conduct is the responsibility of Panda Wallet's Maintainers and ultimately the Project Lead. They are responsible for reviewing reports, conducting investigations, and taking appropriate action to address violations. Their decisions will be guided by the principles of fairness and due process.
The enforcement of this code of conduct is the responsibility of Yours Wallet's Maintainers and ultimately the Project Lead. They are responsible for reviewing reports, conducting investigations, and taking appropriate action to address violations. Their decisions will be guided by the principles of fairness and due process.

**6. Contact Information:**

Expand All @@ -48,8 +48,8 @@ This code of conduct may be revised or improved over time to better serve the co

**8. Acknowledgment:**

By participating in the Panda Wallet community, you acknowledge your commitment to abiding by this code of conduct and helping to create a positive and inclusive environment.
By participating in the Yours Wallet community, you acknowledge your commitment to abiding by this code of conduct and helping to create a positive and inclusive environment.

**Conclusion:**

The Panda Wallet community thrives on collaboration, respect, and diverse perspectives. We appreciate your cooperation in making this a welcoming place for everyone, and we look forward to working together for the betterment of our project.
The Yours Wallet community thrives on collaboration, respect, and diverse perspectives. We appreciate your cooperation in making this a welcoming place for everyone, and we look forward to working together for the betterment of our project.
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Contributing to Panda Wallet
## Contributing to Yours Wallet

Thank you for your interest in contributing to Panda Wallet! Your contributions are what move the project forward. Please follow these steps to set up your development environment and ensure that your code adheres to our formatting standards.
Thank you for your interest in contributing to Yours Wallet! Your contributions are what move the project forward. Please follow these steps to set up your development environment and ensure that your code adheres to our formatting standards.

## Getting Started

Expand Down Expand Up @@ -57,11 +57,11 @@ git commit -m "Your descriptive commit message"
git push origin my-feature
```

10. **Create a Pull Request:**: Navigate to your forked repository on GitHub, and you should see an option to create a pull request and merge into `Panda-Wallet:main`. Click it, fill out the pull request template, and submit your changes for review.
10. **Create a Pull Request:**: Navigate to your forked repository on GitHub, and you should see an option to create a pull request and merge into `Yours-Wallet:main`. Click it, fill out the pull request template, and submit your changes for review.

11. **Code Review:** Your changes will be reviewed, and you may be asked to make further adjustments. Once the changes are approved, they will be merged into the main project.

12. **Celebrate:** 🎉 Congratulations, you've contributed to Panda Wallet!
12. **Celebrate:** 🎉 Congratulations, you've contributed to Yours Wallet!

**\*If you plan to contribute, please review the PR Guidelines**

Expand Down
2 changes: 1 addition & 1 deletion GOVERNANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#### Decision-Making Process:

**Issues and Features:** Contributors and the community can [Create an issue](https://github.com/Panda-Wallet/panda-wallet/issues) and track the [Kanban Board](https://github.com/orgs/Panda-Wallet/projects/1) to propose new features, discuss improvements, or report bugs. All PRs will require at least one approval from the Project Lead or a Maintainers.
**Issues and Features:** Contributors and the community can [Create an issue](https://github.com/yours-org/yours-wallet/issues) and track the [Kanban Board](https://github.com/orgs/Panda-Wallet/projects/1) to propose new features, discuss improvements, or report bugs. All PRs will require at least one approval from the Project Lead or a Maintainers.

#### Pull Requests:

Expand Down
22 changes: 11 additions & 11 deletions PRIVACY_POLICY.md
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
# Privacy Policy for Panda Wallet
# Privacy Policy for Yours Wallet

Effective Date: October 25th, 2023
Effective Date: March 7th, 2024

### Introduction:

This Privacy Policy is intended to inform users of the Panda Wallet Browser Extension (referred to as "the Extension") about the collection, use, and disclosure of user data. Panda Wallet is a client-side, open-source application that does not have a backend and does not collect personal user data beyond the information automatically collected by Browser Extensions like Chrome, Firefox, etc regarding installation, usage, and performance.
This Privacy Policy is intended to inform users of the Yours Wallet Browser Extension (referred to as "the Extension") about the collection, use, and disclosure of user data. Yours Wallet is a client-side, open-source application that does not have a backend and does not collect personal user data beyond the information automatically collected by Browser Extensions like Chrome, Firefox, etc regarding installation, usage, and performance.

### Information Collection and Usage:

Extension Data: Panda Wallet does not collect, store, or transmit any personal user data. However, browser extensions may collect certain data, including but not limited to installation, usage, and performance statistics. These statistics are aggregated and anonymized and help us understand user engagement and improve the extension.
Extension Data: Yours Wallet does not collect, store, or transmit any personal user data. However, browser extensions may collect certain data, including but not limited to installation, usage, and performance statistics. These statistics are aggregated and anonymized and help us understand user engagement and improve the extension.

User Activity: Panda Wallet may collect and store data related to user interactions with the extension. This data is used solely for improving the functionality and user experience of the extension. It may include user settings, preferences, and interactions within the extension's user interface.
User Activity: Yours Wallet may collect and store data related to user interactions with the extension. This data is used solely for improving the functionality and user experience of the extension. It may include user settings, preferences, and interactions within the extension's user interface.

### Data Security:

Panda Wallet is committed to maintaining the security of user data. While the extension does not store personal information, we implement security measures to safeguard any data we may collect related to user activity within the extension.
Yours Wallet is committed to maintaining the security of user data. While the extension does not store personal information, we implement security measures to safeguard any data we may collect related to user activity within the extension.

### Data Sharing:

Panda Wallet does not share, sell, or trade user data with third parties. We do not have access to, or control over, data collected by browser extensions service providers, which is subject to separate privacy policies and practices.
Yours Wallet does not share, sell, or trade user data with third parties. We do not have access to, or control over, data collected by browser extensions service providers, which is subject to separate privacy policies and practices.

### Cookies:

The extension does not use cookies or similar tracking technologies. No personal information is collected through cookies.

### Contact Information:

For any questions or concerns regarding this Privacy Policy or the Panda Wallet extension, you may contact us on X @wallet_panda.
For any questions or concerns regarding this Privacy Policy or the Yours Wallet extension, you may contact us on X @[yoursxbt](https://x.com/yoursxbt).

Changes to the Privacy Policy:

This Privacy Policy may be updated from time to time to reflect changes in our data practices or in response to user feedback. Any updates to this policy will be posted on the Panda Wallet extension page and in our GitHub repo.
This Privacy Policy may be updated from time to time to reflect changes in our data practices or in response to user feedback. Any updates to this policy will be posted on the Yours Wallet extension page and in our GitHub repo.

Acceptance of Terms:

By using the Panda Wallet extension, you signify your acceptance of this Privacy Policy. If you do not agree with this policy, please do not use the extension.
By using the Yours Wallet extension, you signify your acceptance of this Privacy Policy. If you do not agree with this policy, please do not use the extension.

Last Updated: October 25th, 2023

Please review this Privacy Policy regularly to stay informed about how your data is managed within the Panda Wallet extension.
Please review this Privacy Policy regularly to stay informed about how your data is managed within the Yours Wallet extension.
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

Version: v3.2.0

<a href="https://chrome.google.com/webstore/detail/panda-wallet/mlbnicldlpdimbjdcncnklfempedeipj" target="_blank">🐼 Download Chrome Extension 🐼</a>
<a href="https://chrome.google.com/webstore/detail/panda-wallet/mlbnicldlpdimbjdcncnklfempedeipj" target="_blank">🌱 Download Chrome Extension 🌱</a>

# Panda Wallet | Non-Custodial Web3 Wallet For BSV
# Yours Wallet | Non-Custodial Web3 Wallet For BSV

## IMPORTANT NOTICE: Panda is in the process of rebranding to Yours Wallet. The wallet will automatically be updated but namespace changes to the repo will take some time!

Panda Wallet is an open-source and non-custodial web3 wallet for Bitcoin SV (BSV) and [1Sat Ordinals](https://docs.1satordinals.com/). This wallet allows users to have full control over their funds, providing security and independence in managing their assets.
Yours Wallet is an open-source and non-custodial web3 wallet for Bitcoin SV (BSV) and [1Sat Ordinals](https://docs.1satordinals.com/). This wallet allows users to have full control over their funds, providing security and independence in managing their assets.

## Features

Expand All @@ -24,27 +24,27 @@ Panda Wallet is an open-source and non-custodial web3 wallet for Bitcoin SV (BSV

#### Wallet Provider API 🚀

Documentation on integrating Panda Wallet into your decentralized web3 application can be [found here](https://panda-wallet.gitbook.io/provider-api/).
Documentation on integrating Yours Wallet into your decentralized web3 application can be [found here](https://panda-wallet.gitbook.io/provider-api/).

You can also check out the live sample app: https://panda-wallet-sample-app.vercel.app/

#### Contributing 🙌

If you'd like to contribute to Panda Wallet's development check out [contributing](CONTRIBUTING.md).
If you'd like to contribute to the development of Yours Wallet, check out [contributing](CONTRIBUTING.md).

## Issues, Bugs, and Feature Requests

[Create an issue](https://github.com/Panda-Wallet/panda-wallet/issues) and track the [Kanban Board](https://github.com/orgs/Panda-Wallet/projects/1)
[Create an issue](https://github.com/yours-org/yours-wallet/issues) and track the [Kanban Board](https://github.com/orgs/Panda-Wallet/projects/1)

## Support The Project

**BSV:** `1MtzWXQEYGp89bQ9U2nfrnuChFv37j6pV6`

## Contact Us

[X](https://twitter.com/wallet_panda) - @wallet_panda
[Discord](https://discord.gg/qHs6hTkmsf)
- [@yoursxbt on X](https://twitter.com/yoursxbt)
- [Discord](https://discord.gg/qHs6hTkmsf)

## License

Panda Wallet is released under the [MIT License](https://opensource.org/licenses/MIT)
Yours Wallet is released under the [MIT License](https://opensource.org/licenses/MIT)
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "panda-wallet",
"name": "yours-wallet",
"version": "3.2.0",
"private": true,
"dependencies": {
Expand Down
8 changes: 4 additions & 4 deletions public/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ const emitEventToActiveTabs = (message) => {
const { action, params } = message;
chrome.tabs.query({ active: true }, function (tabs) {
tabs.forEach(function (tab) {
chrome.tabs.sendMessage(tab.id, { type: 'PandaEmitEvent', action, params });
chrome.tabs.sendMessage(tab.id, { type: 'YoursEmitEvent', action, params });
});
});
return true;
Expand Down Expand Up @@ -583,11 +583,11 @@ const processGetSignaturesRequest = (message, sendResponse) => {
};

const processGetSocialProfileRequest = (sendResponse) => {
const HOSTED_PANDA_IMAGE = 'https://i.ibb.co/3fLL5X2/Panda-Wallet-Logo.png';
const HOSTED_YOURS_IMAGE = 'https://i.ibb.co/zGcthBv/yours-org-light.png';
try {
chrome.storage.local.get(['socialProfile'], (result) => {
const displayName = result?.socialProfile?.displayName ? result.socialProfile.displayName : 'Anon Panda';
const avatar = result?.socialProfile?.avatar ? result.socialProfile.avatar : HOSTED_PANDA_IMAGE;
const avatar = result?.socialProfile?.avatar ? result.socialProfile.avatar : HOSTED_YOURS_IMAGE;
sendResponse({
type: 'getSocialProfile',
success: true,
Expand Down Expand Up @@ -646,7 +646,7 @@ const processGetTaggedKeys = async (message, sendResponse) => {
sendResponse({
type: 'getTaggedKeys',
success: false,
error: 'Unauthorized! Panda is locked.',
error: 'Unauthorized! Yours Wallet is locked.',
});
}

Expand Down
6 changes: 3 additions & 3 deletions public/content.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/* global chrome */

console.log('🐼 Panda Wallet Loaded');
console.log('🌱 Yours Wallet Loaded');

const script = document.createElement('script');
script.src = chrome.runtime.getURL('inject.js');
(document.head || document.documentElement).appendChild(script);

document.addEventListener('PandaRequest', (e) => {
document.addEventListener('YoursRequest', (e) => {
if (!e?.detail?.type) return;
const { type, params: originalParams = {} } = e.detail;

Expand Down Expand Up @@ -40,7 +40,7 @@ const buildResponseCallback = (messageId) => {

chrome.runtime.onMessage.addListener((message) => {
const { type, action, params } = message;
if (type === 'PandaEmitEvent') {
if (type === 'YoursEmitEvent') {
const event = new CustomEvent(type, { detail: { action, params } });
document.dispatchEvent(event);
}
Expand Down
56 changes: 28 additions & 28 deletions public/inject.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const createPandaMethod = (type) => {
const createYoursMethod = (type) => {
return async (params) => {
return new Promise((resolve, reject) => {
// Send request
const messageId = `${type}-${Date.now()}-${Math.random()}`;
const requestEvent = new CustomEvent('PandaRequest', {
const requestEvent = new CustomEvent('YoursRequest', {
detail: { messageId, type, params },
});
document.dispatchEvent(requestEvent);
Expand All @@ -24,7 +24,7 @@ const createPandaMethod = (type) => {
};
};

const createPandaEventEmitter = () => {
const createYoursEventEmitter = () => {
const eventListeners = new Map(); // Object to store event listeners
const whitelistedEvents = ['signedOut', 'networkChanged']; // Whitelisted event names

Expand Down Expand Up @@ -64,35 +64,35 @@ const createPandaEventEmitter = () => {

const provider = {
isReady: true,
...createPandaEventEmitter(),
connect: createPandaMethod('connect'),
disconnect: createPandaMethod('disconnect'),
isConnected: createPandaMethod('isConnected'),
getPubKeys: createPandaMethod('getPubKeys'),
getAddresses: createPandaMethod('getAddresses'),
getNetwork: createPandaMethod('getNetwork'),
getBalance: createPandaMethod('getBalance'),
getOrdinals: createPandaMethod('getOrdinals'),
sendBsv: createPandaMethod('sendBsv'),
transferOrdinal: createPandaMethod('transferOrdinal'),
signMessage: createPandaMethod('signMessage'),
broadcast: createPandaMethod('broadcast'),
getSignatures: createPandaMethod('getSignatures'),
getSocialProfile: createPandaMethod('getSocialProfile'),
getPaymentUtxos: createPandaMethod('getPaymentUtxos'),
getExchangeRate: createPandaMethod('getExchangeRate'),
purchaseOrdinal: createPandaMethod('purchaseOrdinal'),
generateTaggedKeys: createPandaMethod('generateTaggedKeys'),
getTaggedKeys: createPandaMethod('getTaggedKeys'),
inscribe: createPandaMethod('sendBsv'),
encrypt: createPandaMethod('encrypt'),
decrypt: createPandaMethod('decrypt'),
...createYoursEventEmitter(),
connect: createYoursMethod('connect'),
disconnect: createYoursMethod('disconnect'),
isConnected: createYoursMethod('isConnected'),
getPubKeys: createYoursMethod('getPubKeys'),
getAddresses: createYoursMethod('getAddresses'),
getNetwork: createYoursMethod('getNetwork'),
getBalance: createYoursMethod('getBalance'),
getOrdinals: createYoursMethod('getOrdinals'),
sendBsv: createYoursMethod('sendBsv'),
transferOrdinal: createYoursMethod('transferOrdinal'),
signMessage: createYoursMethod('signMessage'),
broadcast: createYoursMethod('broadcast'),
getSignatures: createYoursMethod('getSignatures'),
getSocialProfile: createYoursMethod('getSocialProfile'),
getPaymentUtxos: createYoursMethod('getPaymentUtxos'),
getExchangeRate: createYoursMethod('getExchangeRate'),
purchaseOrdinal: createYoursMethod('purchaseOrdinal'),
generateTaggedKeys: createYoursMethod('generateTaggedKeys'),
getTaggedKeys: createYoursMethod('getTaggedKeys'),
inscribe: createYoursMethod('sendBsv'),
encrypt: createYoursMethod('encrypt'),
decrypt: createYoursMethod('decrypt'),
};

window.panda = provider;
window.yours = provider;

document.addEventListener('PandaEmitEvent', (event) => {
document.addEventListener('YoursEmitEvent', (event) => {
const { action, params } = event.detail;
// Check if window.panda is defined and has event listeners for the action
if (window.panda && window.panda.eventListeners && window.panda.eventListeners.has(action)) {
Expand All @@ -102,7 +102,7 @@ document.addEventListener('PandaEmitEvent', (event) => {
}
});

document.addEventListener('PandaEmitEvent', (event) => {
document.addEventListener('YoursEmitEvent', (event) => {
const { action, params } = event.detail;
// Check if window.yours is defined and has event listeners for the action
if (window.yours && window.yours.eventListeners && window.yours.eventListeners.has(action)) {
Expand Down
Binary file removed src/assets/panda-logo-wide.png
Binary file not shown.
Loading

0 comments on commit 421c5f6

Please sign in to comment.