Skip to content

Commit

Permalink
chore: Adjust trailing whitespace (MetaMask#15636)
Browse files Browse the repository at this point in the history
Co-authored-by: ryanml <[email protected]>
  • Loading branch information
legobeat and ryanml authored Aug 24, 2022
1 parent 82ce1b0 commit ef9d5d1
Show file tree
Hide file tree
Showing 23 changed files with 40 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .circleci/scripts/create-lavamoat-viz.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ mkdir -p "${BUILD_DEST}"
yarn lavamoat:debug:build

# generate viz
npx lavamoat-viz --dest "${BUILD_DEST}"
npx lavamoat-viz --dest "${BUILD_DEST}"
2 changes: 1 addition & 1 deletion .circleci/scripts/deps-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ har_files=(./*.har)
if [[ -f "${har_files[0]}" ]]
then
mv ./*.har build-artifacts/yarn-install-har/
fi
fi
2 changes: 1 addition & 1 deletion .iyarc
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
GHSA-93q8-gq69-wqmw
GHSA-257v-vj4p-3w2h
GHSA-wm7h-9275-46v2
GHSA-pfrx-2q88-qq97
GHSA-pfrx-2q88-qq97
2 changes: 1 addition & 1 deletion .yarnrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ignore-scripts true
ignore-scripts true
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [10.18.0]
### Added
- Add setApprovalForAll confirmation view so granted permissions are displayed in a digested manner, instead of a simple contract interaction([#15010](https://github.com/MetaMask/metamask-extension/pull/15010))
- Add setApprovalForAll confirmation view so granted permissions are displayed in a digested manner, instead of a simple contract interaction([#15010](https://github.com/MetaMask/metamask-extension/pull/15010))
- Add warning when performing a Send directly to a token contract([#13588](https://github.com/MetaMask/metamask-extension/pull/13588))

### Changed
Expand Down Expand Up @@ -116,7 +116,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fix switching between ETH and USD in the amount field on the send screen ([#13827](https://github.com/MetaMask/metamask-extension/pull/13827))
- Fix addition of 'add recipient' events to the send flow change logs so that 'contact' and 'recent' recipient are correctly distinguished ([#14771](https://github.com/MetaMask/metamask-extension/pull/14771))
- Fix lock button sizing for text exceeding button boundaries ([#14335](https://github.com/MetaMask/metamask-extension/pull/14335))
- Fix all "MetaMask" instances wrongly written as "Metamask"
- Fix all "MetaMask" instances wrongly written as "Metamask"
- ([#14851](https://github.com/MetaMask/metamask-extension/pull/14851))
- ([#14848](https://github.com/MetaMask/metamask-extension/pull/14848))
- Fix design break on the Settings navbar for certain locales ([#14012](https://github.com/MetaMask/metamask-extension/pull/14012))
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ Our e2e test suite can be run on either Firefox or Chrome. In either case, start
```console
--browser Set the browser used; either 'chrome' or 'firefox'.

--leave-running Leaves the browser running after a test fails, along with anything else
--leave-running Leaves the browser running after a test fails, along with anything else
that the test used (ganache, the test dapp, etc.).

--retries Set how many times the test should be retried upon failure. Default is 0.
```

Expand Down Expand Up @@ -119,7 +119,7 @@ Whenever you change dependencies (adding, removing, or updating, either in `pack
- [How to add a new translation to MetaMask](./docs/translating-guide.md)
- [Publishing Guide](./docs/publishing.md)
- [How to use the TREZOR emulator](./docs/trezor-emulator.md)
- [Developing on MetaMask](./development/README.md)
- [Developing on MetaMask](./development/README.md)
- [How to generate a visualization of this repository's development](./development/gource-viz.sh)

## Dapp Developer Resources
Expand All @@ -128,4 +128,3 @@ Whenever you change dependencies (adding, removing, or updating, either in `pack
- [Change the logo that appears when your dapp connects to MetaMask.](https://docs.metamask.io/guide/defining-your-icon.html)

[1]: http://www.nomnoml.com/#view/%5B%3Cactor%3Euser%5D%0A%0A%5Bmetamask-ui%7C%0A%20%20%20%5Btools%7C%0A%20%20%20%20%20react%0A%20%20%20%20%20redux%0A%20%20%20%20%20thunk%0A%20%20%20%20%20ethUtils%0A%20%20%20%20%20jazzicon%0A%20%20%20%5D%0A%20%20%20%5Bcomponents%7C%0A%20%20%20%20%20app%0A%20%20%20%20%20account-detail%0A%20%20%20%20%20accounts%0A%20%20%20%20%20locked-screen%0A%20%20%20%20%20restore-vault%0A%20%20%20%20%20identicon%0A%20%20%20%20%20config%0A%20%20%20%20%20info%0A%20%20%20%5D%0A%20%20%20%5Breducers%7C%0A%20%20%20%20%20app%0A%20%20%20%20%20metamask%0A%20%20%20%20%20identities%0A%20%20%20%5D%0A%20%20%20%5Bactions%7C%0A%20%20%20%20%20%5BbackgroundConnection%5D%0A%20%20%20%5D%0A%20%20%20%5Bcomponents%5D%3A-%3E%5Bactions%5D%0A%20%20%20%5Bactions%5D%3A-%3E%5Breducers%5D%0A%20%20%20%5Breducers%5D%3A-%3E%5Bcomponents%5D%0A%5D%0A%0A%5Bweb%20dapp%7C%0A%20%20%5Bui%20code%5D%0A%20%20%5Bweb3%5D%0A%20%20%5Bmetamask-inpage%5D%0A%20%20%0A%20%20%5B%3Cactor%3Eui%20developer%5D%0A%20%20%5Bui%20developer%5D-%3E%5Bui%20code%5D%0A%20%20%5Bui%20code%5D%3C-%3E%5Bweb3%5D%0A%20%20%5Bweb3%5D%3C-%3E%5Bmetamask-inpage%5D%0A%5D%0A%0A%5Bmetamask-background%7C%0A%20%20%5Bprovider-engine%5D%0A%20%20%5Bhooked%20wallet%20subprovider%5D%0A%20%20%5Bid%20store%5D%0A%20%20%0A%20%20%5Bprovider-engine%5D%3C-%3E%5Bhooked%20wallet%20subprovider%5D%0A%20%20%5Bhooked%20wallet%20subprovider%5D%3C-%3E%5Bid%20store%5D%0A%20%20%5Bconfig%20manager%7C%0A%20%20%20%20%5Brpc%20configuration%5D%0A%20%20%20%20%5Bencrypted%20keys%5D%0A%20%20%20%20%5Bwallet%20nicknames%5D%0A%20%20%5D%0A%20%20%0A%20%20%5Bprovider-engine%5D%3C-%5Bconfig%20manager%5D%0A%20%20%5Bid%20store%5D%3C-%3E%5Bconfig%20manager%5D%0A%5D%0A%0A%5Buser%5D%3C-%3E%5Bmetamask-ui%5D%0A%0A%5Buser%5D%3C%3A--%3A%3E%5Bweb%20dapp%5D%0A%0A%5Bmetamask-contentscript%7C%0A%20%20%5Bplugin%20restart%20detector%5D%0A%20%20%5Brpc%20passthrough%5D%0A%5D%0A%0A%5Brpc%20%7C%0A%20%20%5Bethereum%20blockchain%20%7C%0A%20%20%20%20%5Bcontracts%5D%0A%20%20%20%20%5Baccounts%5D%0A%20%20%5D%0A%5D%0A%0A%5Bweb%20dapp%5D%3C%3A--%3A%3E%5Bmetamask-contentscript%5D%0A%5Bmetamask-contentscript%5D%3C-%3E%5Bmetamask-background%5D%0A%5Bmetamask-background%5D%3C-%3E%5Bmetamask-ui%5D%0A%5Bmetamask-background%5D%3C-%3E%5Brpc%5D%0A

2 changes: 1 addition & 1 deletion app/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<body>
<div id="app-content">
<img class="loading-logo" src="./images/logo/metamask-fox.svg" alt="" />
<img class="loading-spinner" src="./images/spinner.gif" alt="" />
<img class="loading-spinner" src="./images/spinner.gif" alt="" />
</div>
<div id="popover-content"></div>
<script src="./globalthis.js" type="text/javascript" charset="utf-8"></script>
Expand Down
2 changes: 1 addition & 1 deletion app/trezor-usb-permissions.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@
<body>
<iframe id="trezor-usb-permissions" src="https://connect.trezor.io/5/extension-permissions.html" allow="usb" frameborder="0" width="100%" height="100%"></iframe>
<script type="text/javascript" src="./vendor/trezor/usb-permissions.js"></script>
</body>
</body>
2 changes: 1 addition & 1 deletion development/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Events triggered whilst using the extension will be displayed in Segment's Debug
To opt in to MetaMetrics;
- Unlock the extension
- Open the Account menu
- Open the Account menu
- Click the `Settings` menu item
- Click the `Security & Privacy` menu item
- Toggle the `Participate in MetaMetrics` menu option to the `ON` position
Expand Down
2 changes: 1 addition & 1 deletion development/gource-viz.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ gource \
--title "MetaMask Development History" \
--output-ppm-stream - \
--output-framerate 30 \
| ffmpeg -y -r 30 -f image2pipe -vcodec ppm -i - -b 65536K metamask-dev-history.mp4
| ffmpeg -y -r 30 -f image2pipe -vcodec ppm -i - -b 65536K metamask-dev-history.mp4
2 changes: 1 addition & 1 deletion development/highlights/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
### highlights

the purpose of this directory is to house utilities for generating "highlight" messages for the metamaskbot comment based on changes included in the PR
the purpose of this directory is to house utilities for generating "highlight" messages for the metamaskbot comment based on changes included in the PR
2 changes: 1 addition & 1 deletion docs/QA_Guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Steps to mark a full pass of QA complete.
* OS: Ubuntu, Mac OSX, Windows
* Load older version of MetaMask and attempt to simulate updating the extension.
* Open Developer Console in background and popup, inspect errors.
* Watch the state logs
* Watch the state logs
* Transactions (unapproved txs -> rejected/submitted -> confirmed)
* Nonces/LocalNonces
* Vault integrity
Expand Down
14 changes: 7 additions & 7 deletions docs/QA_MIGRATIONS_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ Migrations are needed to change top-level state data, this can be found in the b

Steps
1. Create a new MetaMask directory\* folder locally with the source files before the migration, and load it as an unpacked extension in Chrome\*. If the migration is in a pull request, then build the `develop` branch to load. If the migration is already in `develop`, get a commit before the migration was added to build.

![Load unpacked extension to chrome](./assets/load-build-chrome.gif)

##### \* For migrations targeting specific features behind a feature flag add them appropriately to the `.metamaskrc` file before building.
![Load unpacked extension to chrome](./assets/load-build-chrome.gif)

##### \* For migrations targeting specific features behind a feature flag add them appropriately to the `.metamaskrc` file before building.
##### \* In order for the "Load unpacked" button to be shown developer mode needs to be enabled.

2. Once the build has been loaded and state data has been initialized, ensure that the data in question that the migration targets is present in the local storage data.

![Chrome storage state](./assets/chrome-storage-local.png)

3. To trigger the migration a build with the migration will need to replace the files in the directory where the extension is loaded from, and refresh the extension.

![gif of replacing files and reloading the extension](./assets/folder-file-replacement-build.gif)
4. Ensure that the data has been changed/deleted/etc.

4. Ensure that the data has been changed/deleted/etc.
10 changes: 3 additions & 7 deletions docs/components/account-menu.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,9 @@ The account menu is the popup menu which contains options such as:
- Connecting a HW wallet
- Looking up info & help
- Adjusting settings

It can be seen below where it has been outlined with a red box

![Screenshot of account menu](https://i.imgur.com/xpkfIuR.png)

Above screenshot showing the menu bar in MetaMask 6.7.1



![Screenshot of account menu](https://i.imgur.com/xpkfIuR.png)

Above screenshot showing the menu bar in MetaMask 6.7.1
2 changes: 1 addition & 1 deletion docs/extension_description/en.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ The extension injects the Ethereum web3 API into every website's javascript cont
MetaMask also lets the user create and manage their own identities, so when a Dapp wants to perform a transaction and write to the blockchain, the user gets a secure interface to review the transaction, before approving or rejecting it.

Because it adds functionality to the normal browser context, MetaMask requires the permission to read and write to any webpage. You can always "view the source" of MetaMask the way you do any extension, or view the source code on Github:
https://github.com/MetaMask/metamask-extension
https://github.com/MetaMask/metamask-extension
1 change: 0 additions & 1 deletion docs/publishing.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,3 @@ For this reason, when an urgent change is needed in production, its pull request
- Should be proposed against the `master` branch.

The version and changelog bump should then be made off the `master` branch, and then merged to `develop` to bring the two branches back into sync. Further time can be saved by incorporating the version/changelog bump into the PR against `master`, since we rely on @MetaMaskBot to run tests before merging.

1 change: 0 additions & 1 deletion docs/secret-preferences.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ One example is our "sync with mobile" feature, which didn't make sense to roll o
To enable features like this, first open the background console, and then you can use the global method `global.setPreference(key, value)`.

For example, if the feature flag was a boolean was called `useNativeCurrencyAsPrimaryCurrency`, you might type `setPreference('useNativeCurrencyAsPrimaryCurrency', true)`.

1 change: 0 additions & 1 deletion docs/sensitive-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@ If a problem is detected, publish the roll-back release to 100% of users, identi
## Summary

This protocol is a worst-case scenario, just a way to be incredibly careful about our most sensitive possible changes.

5 changes: 2 additions & 3 deletions docs/translating-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ The MetaMask browser extension supports new translations added in the form of ne
## Adding a new Language

- Each supported language is represented by a folder in `app/_locales` whose name is that language's subtag (example: `app/_locales/es/`). (look up a language subtag using the [r12a "Find" tool](https://r12a.github.io/app-subtags/) or this [wikipedia list](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)).
- Inside that folder there should be a `messages.json`.
- Inside that folder there should be a `messages.json`.
- An easy way to start your translation is to first **make a copy** of `app/_locales/en/messages.json` (the English translation), and then **translate the `message` key** for each in-app message.
- **The `description` key** is just to add context for what the translation is about, it **does not need to be translated**.
- Add the language to the [locales index](https://github.com/MetaMask/metamask-extension/blob/master/app/_locales/index.json) `app/_locales/index.json`
- Add the language to the [locales index](https://github.com/MetaMask/metamask-extension/blob/master/app/_locales/index.json) `app/_locales/index.json`


That's it! When MetaMask is loaded on a computer with that language set as the system language, they will see your translation instead of the default one.
Expand All @@ -26,4 +26,3 @@ node development/verify-locale-strings.js $YOUR_LOCALE
Where `$YOUR_LOCALE` is your locale string (example: `es`), i.e. the name of your language folder.

To verify that your translation works in the app, you will need to [build a local copy](https://github.com/MetaMask/metamask-extension#building-locally) of MetaMask. You will need to change your browser language, your operating system language, and restart your browser (sorry it's so much work!).

2 changes: 1 addition & 1 deletion test/e2e/send-eth-with-private-key-test/ethereumjs-tx.js

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

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const sendButton = document.getElementById('send')
sendButton.addEventListener('click', function () {
var rawTx = {
nonce: '0x00',
gasPrice: '0x09184e72a000',
gasPrice: '0x09184e72a000',
gasLimit: '0x22710',
value: '0xde0b6b3a7640000',
to: document.getElementById('address').value,
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/send-eth-with-private-key-test/web3js.js

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions ui/helpers/utils/error-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,21 @@ export async function getErrorHtml(supportLink, metamaskState) {
<div class="critical-error">
<div class="critical-error__alert">
<p class="critical-error__alert__message">
${t('troubleStarting')}
</p>
${t('troubleStarting')}
</p>
<button id='critical-error-button' class="critical-error__alert__button">
${t('restartMetamask')}
</button>
</div>
<p class="critical-error__paragraph">
</div>
<p class="critical-error__paragraph">
${t('stillGettingMessage')}
<a
href=${supportLink}
class="critical-error__paragraph__link"
target="_blank"
<a
href=${supportLink}
class="critical-error__paragraph__link"
target="_blank"
rel="noopener noreferrer">
${t('sendBugReport')}
</a>
</a>
</p>
</div>
`;
Expand Down

0 comments on commit ef9d5d1

Please sign in to comment.