Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/eos' into eos-using-different-ac…
Browse files Browse the repository at this point in the history
…tive-owner-keys
  • Loading branch information
dafuga committed Dec 5, 2024
2 parents 2a49201 + ec251c5 commit 37e4cb7
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-lint-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
key: snap-${{ runner.os }}-${{ github.sha }}
- run: yarn install --immutable
- name: Run e2e tests
run: yarn workspace snap run test
run: yarn workspace @greymass/eos-wallet run test
- name: Require clean working directory
shell: bash
run: |
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
"lint:eslint": "eslint . --cache -c js,jsx,ts,tsx",
"lint:fix": "yarn lint:misc --write",
"lint:misc": "prettier '**/*.json' '**/*.md' '!**/CHANGELOG.md' '**/*.yml' --ignore-path .gitignore",
"publish:snap": "yarn workspace snap npm publish --access public",
"publish:snap:next": "yarn workspace snap npm publish --access public --tag next",
"publish:snap": "yarn workspace @greymass/eos-wallet npm publish --access public",
"publish:snap:next": "yarn workspace @greymass/eos-wallet npm publish --access public --tag next",
"start": "yarn workspaces foreach --parallel --interlaced --verbose run start",
"test": "yarn workspace snap run test --passWithNoTests"
"test": "yarn workspace @greymass/eos-wallet run test --passWithNoTests"
},
"devDependencies": {
"@lavamoat/allow-scripts": "^3.0.0",
Expand Down
9 changes: 5 additions & 4 deletions packages/snap/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "snap",
"version": "1.0.1",
"description": "MetaMask Snap allowing users to interact with Antelope networks",
"name": "@greymass/eos-wallet",
"version": "1.1.0",
"description": "Use MetaMask with the EOS Network",
"repository": {
"type": "git",
"url": "https://github.com/@greymass/antelope-snap.git"
Expand All @@ -10,7 +10,8 @@
"main": "./dist/bundle.js",
"files": [
"dist/",
"snap.manifest.json"
"snap.manifest.json",
"src/assets/eos-logo.svg"
],
"scripts": {
"allow-scripts": "yarn workspace root allow-scripts",
Expand Down
23 changes: 23 additions & 0 deletions packages/snap/snap.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,29 @@ const config: SnapConfig = {
crypto: true,
buffer: true,
},
customizeWebpackConfig: (config) => {
return {
...config,
module: {
...config.module,
rules: [
...(config.module?.rules || []),
{
test: /\.svg$/,
use: [
{
loader: 'url-loader',
options: {
limit: 10000,
name: 'images/[hash]-[name].[ext]',
},
},
],
},
],
},
};
},
};

export default config;
10 changes: 5 additions & 5 deletions packages/snap/snap.manifest.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"version": "1.0.1",
"description": "Use MetaMask with the BLOCKCHAIN Network",
"proposedName": "BLOCKCHAIN Wallet",
"version": "1.1.0",
"description": "Use MetaMask with the EOS Network",
"proposedName": "EOS Wallet",
"repository": {
"type": "git",
"url": "https://github.com/@greymass/antelope-snap.git"
},
"source": {
"shasum": "qbEi3wUvdBWmFB6QXs3uzvEI6TDJGXCVgfMRiDo3cFs=",
"shasum": "05RXQ66dkZzU6uIeHBWC8PwII1X8voKdZuCDXfrrCew=",
"location": {
"npm": {
"filePath": "dist/bundle.js",
"iconPath": "src/assets/eos-logo.svg",
"packageName": "snap",
"packageName": "@greymass/eos-wallet",
"registry": "https://registry.npmjs.org/"
}
}
Expand Down
33 changes: 22 additions & 11 deletions packages/snap/src/assets/eos-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/snap/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import type {
} from './types';

const SNAP_NAME = 'EOS Wallet';
const HELP_URL = 'https://unicove.com/eos/metamask';
const HELP_URL = 'https://unicove.com/eos/signup/wallets/extensions/metamask';

/**
* Handle the installation of the snap.
Expand Down

0 comments on commit 37e4cb7

Please sign in to comment.