Skip to content

Commit

Permalink
Merge remote-tracking branch 'main/aptos' into aptos
Browse files Browse the repository at this point in the history
  • Loading branch information
Igor Demko committed May 24, 2022
2 parents 4adba56 + 55a40cd commit e0e60f1
Show file tree
Hide file tree
Showing 171 changed files with 2,960 additions and 2,357 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ jobs:
- run:
name: storybook:deploy
command: |
git remote add storybook [email protected]:MetaMask/metamask-storybook.git
git remote add storybook [email protected]:AptosMask/metamask-storybook.git
yarn storybook:deploy
test-unit:
Expand Down
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Welcome to MetaMask!
# Welcome to AptosMask!

If you're submitting code to MetaMask, there are some simple things we'd appreciate you doing to help us stay organized!
If you're submitting code to AptosMask, there are some simple things we'd appreciate you doing to help us stay organized!

### Finding the right project

Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Bug Report
description: Using MetaMask, but it's not working as you expect?
description: Using AptosMask, but it's not working as you expect?
title: "[Bug]: "
labels: ["bug"]
body:
Expand All @@ -11,7 +11,7 @@ body:
## **Before Submitting:**
* Please search to make sure this issue has not been opened already.
* If this is a question about how to integrate MetaMask with your project, please ask in our [Community forum](https://community.metamask.io/c/developer-questions/) instead. This will get your question answered more quickly and make it easier for other devs to find the answer in the future.
* If this is a question about how to integrate AptosMask with your project, please ask in our [Community forum](https://community.metamask.io/c/developer-questions/) instead. This will get your question answered more quickly and make it easier for other devs to find the answer in the future.
- type: textarea
id: what-happened
attributes:
Expand Down Expand Up @@ -39,14 +39,14 @@ body:
id: version
attributes:
label: Version
description: What version of MetaMask are you running? You can find the version in "Settings" > "About"
description: What version of AptosMask are you running? You can find the version in "Settings" > "About"
validations:
required: true
- type: dropdown
id: build
attributes:
label: Build type
description: Are you using a testing or development build of MetaMask? If so, please select the type of build you are using.
description: Are you using a testing or development build of AptosMask? If so, please select the type of build you are using.
options:
- Beta
- Flask
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ contact_links:
about: Request new features and vote on the ones that are important to you
- name: Get support or ask a question
url: https://metamask.zendesk.com/hc/en-us/requests/new
about: Use the MetaMask support system to get help and ask questions
about: Use the AptosMask support system to get help and ask questions
2 changes: 1 addition & 1 deletion .storybook/1.INTRODUCTION.stories.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Meta } from '@storybook/addon-docs';

# Introduction

Welcome to the MetaMask Browser Extension Storybook.
Welcome to the AptosMask Browser Extension Storybook.

## Building locally and Contributing

Expand Down
2 changes: 1 addition & 1 deletion .storybook/metamask-storybook-theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import logo from '../app/images/logo/metamask-logo-horizontal.svg';

export default create({
base: 'light',
brandTitle: 'MetaMask Storybook',
brandTitle: 'AptosMask Storybook',
brandImage: logo,

// Typography
Expand Down
6 changes: 3 additions & 3 deletions .storybook/test-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@ const state = {
"snap_confirm": {}
},
"manifest": {
"description": "An example MetaMask Snap.",
"description": "An example AptosMask Snap.",
"initialPermissions": {
"snap_confirm": {}
},
"manifestVersion": "0.1",
"proposedName": "MetaMask Example Snap",
"proposedName": "AptosMask Example Snap",
"repository": {
"type": "git",
"url": "https://github.com/MetaMask/snaps-skunkworks.git"
Expand Down Expand Up @@ -1306,7 +1306,7 @@ const state = {
"local:http://localhost:8080/": {
extensionId: null,
iconUrl: null,
name: "MetaMask Example Snap",
name: "AptosMask Example Snap",
origin: "local:http://localhost:8080/",
subjectType: "snap",
svgIcon: "<svg>...</svg>",
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# MetaMask Browser Extension
# AptosMask Browser Extension

You can find the latest version of MetaMask on [our official website](https://metamask.io/). For help using MetaMask, visit our [User Support Site](https://metamask.zendesk.com/hc/en-us).
You can find the latest version of AptosMask on [our official website](https://metamask.io/). For help using AptosMask, visit our [User Support Site](https://metamask.zendesk.com/hc/en-us).

For [general questions](https://community.metamask.io/c/learn/26), [feature requests](https://community.metamask.io/c/feature-requests-ideas/13), or [developer questions](https://community.metamask.io/c/developer-questions/11), visit our [Community Forum](https://community.metamask.io/).

MetaMask supports Firefox, Google Chrome, and Chromium-based browsers. We recommend using the latest available browser version.
AptosMask supports Firefox, Google Chrome, and Chromium-based browsers. We recommend using the latest available browser version.

For up to the minute news, follow our [Twitter](https://twitter.com/metamask) or [Medium](https://medium.com/metamask) pages.

To learn how to develop MetaMask-compatible applications, visit our [Developer Docs](https://metamask.github.io/metamask-docs/).
To learn how to develop AptosMask-compatible applications, visit our [Developer Docs](https://metamask.github.io/metamask-docs/).

To learn how to contribute to the MetaMask project itself, visit our [Internal Docs](https://github.com/MetaMask/metamask-extension/tree/develop/docs).
To learn how to contribute to the AptosMask project itself, visit our [Internal Docs](https://github.com/AptosMask/metamask-extension/tree/develop/docs).

## Building locally

Expand Down Expand Up @@ -42,7 +42,7 @@ To start the [Redux DevTools Extension](https://github.com/reduxjs/redux-devtool
- Install the Redux Devtools extension.
- Open the Redux DevTools extension and check the "Use custom (local) server" checkbox in the Remote DevTools Settings, using the default server configuration (host `localhost`, port `8000`, secure connection checkbox unchecked).

Then run the command `yarn devtools:redux` with a development build installed in a browser. This will enable you to use the Redux DevTools extension to inspect MetaMask.
Then run the command `yarn devtools:redux` with a development build installed in a browser. This will enable you to use the Redux DevTools extension to inspect AptosMask.

To create a development build and run both of these tools simultaneously, run `yarn start:dev`.

Expand Down Expand Up @@ -94,7 +94,7 @@ Whenever you change dependencies (adding, removing, or updating, either in `pack

- [How to add custom build to Chrome](./docs/add-to-chrome.md)
- [How to add custom build to Firefox](./docs/add-to-firefox.md)
- [How to add a new translation to MetaMask](./docs/translating-guide.md)
- [How to add a new translation to AptosMask](./docs/translating-guide.md)
- [Publishing Guide](./docs/publishing.md)
- [How to use the TREZOR emulator](./docs/trezor-emulator.md)
- [How to generate a visualization of this repository's development](./development/gource-viz.sh)
Expand Down
50 changes: 25 additions & 25 deletions app/_locales/am/messages.json

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

Loading

0 comments on commit e0e60f1

Please sign in to comment.