Merged
Conversation
Contributor
|
I know this I should've raised this earlier, but after looking at the image in the OP, can we drop |
danjm
suggested changes
Mar 18, 2019
Contributor
danjm
left a comment
danjm
left a comment
There was a problem hiding this comment.
QA'd and everything seems good.
Inspected the folder structure via my text editor. Its definitely a big improvement.
One preference I have that differs from what is there:
I like having app.js, root.js, reducers.js and index.js in the same place. These pull together all the high level pieces of the app and are a good starting point to understanding the app as a whole. So I think there are benefits for code readability if they are are all together.
Independent of that concern, I would add that app.js and root.js don't really fit in pages/. That directory makes sense as a "directory of all components that have their own route". Whereas app.js is more of a routing component and root.js is boilerplate react needed for the app to work. Perhaps put these one directory up: app/app.js and app/root.js app.js may need a renaming if this is done.
Other than these relatively minor concerns, I think this is good to merge.
chikeichan
force-pushed
the
folder-restructure
branch
from
5944477 to
566b968
Compare
Contributor
Author
|
@danjm great suggestions - based on them:
I |
danjm
previously approved these changes
Mar 20, 2019
chikeichan
force-pushed
the
folder-restructure
branch
from
d92ea00 to
a59cea7
Compare
danjm
previously approved these changes
Mar 21, 2019
chikeichan
force-pushed
the
folder-restructure
branch
from
a59cea7 to
68e26d1
Compare
danjm
approved these changes
Mar 21, 2019
danfinlay
pushed a commit
that referenced
this pull request
Mar 26, 2019
* Fixes the 'Percentages row tracks and gutters' decpracation warning. (#6244) * Fix missing this reference in addtoken button onclick method (#6245) * Only call onRecipient and onSender methods if defined in sender-to-recipient (#6247) * Prevent advanced gas input arrows from setting value to < 0 (#6248) * Add privacy policy link to modal metrics opt-in (#6250) * Handle undefined gas limits and prices in transaction-breakdown.component (#6246) * Uppercase and context fixes on Spanish translation. * development - enhancement for sourcemap validator tool (#6277) * Nonmultiple notifications for batch txs * No longer check network when validating checksum addresses * Version 6.2.1 (#6251) * Remove line rather than comment out * Fixes the use of the browser back button on the reveal seed screen * GABA: Integrate AddressBookController (#5847) * gaba: integrate AddressBookController * pin gaba version and update lockfile * ci: Use cache version from circle environment var (#6286) * Allow npm to update the package-lock.json file * npm i -D ganache-core@2.5.3 * mascara - remove from project (#6283) * circleci - disable npm dep cache (#6288) * Centre all notification popups * ui - add missing PropTypes (#6287) * Improve Korean translations (#6268) * ci: Use npm ci for fast(er) installs * build - babel - move config to babelrc (#6284) * Patch/bump version (#6294) * Update Node minor version * ci: Skip updating npm@6 as it is default * Allow seed phrases with a trailing newline * Centre the notification in the current window (#6307) * Fixes popups not showing when screen size is odd (#6312) * Fix typos in English messages (#6317) * Add rollback script, move auto-changelog script (#6252) * Bump gaba version to avoid broken eth-contract-metadata * Fixing spelling of Ethereum in MetaMetrics copy (#6329) * Stop reloading dapps on network change allowing dapps to decide if it should refresh or not (#6330) * feat: `inpageProvider.autoRefreshOnNetworkChange` to allow dapps to control if it refreshes or not * feat: check the `autoRefreshOnNetworkChange` before a refresh * fix linting error * fix: use `window.ethereum` now `web3.ethereum` * Enable mobile sync (#6332) * enable mobile sync * remove mobile sync as a preference * Fix typo * Folder restructure (#6304) * Remove ui/app/keychains/ * Remove ui/app/img/ (unused images) * Move conversion-util to helpers/utils/ * Move token-util to helpers/utils/ * Move /helpers/*.js inside /helpers/utils/ * Move util tests inside /helpers/utils/ * Renameand move confirm-transaction/util.js to helpers/utils/ * Move higher-order-components to helpers/higher-order-components/ * Move infura-conversion.json to helpers/constants/ * Move all utility functions to helpers/utils/ * Move pages directory to top-level * Move all constants to helpers/constants/ * Move metametrics inside helpers/ * Move app and root inside pages/ * Move routes inside helpers/ * Re-organize ducks/ * Move reducers to ducks/ * Move selectors inside selectors/ * Move test out of test folder * Move action, reducer, store inside store/ * Move ui components inside ui/ * Move UI components inside ui/ * Move connected components inside components/app/ * Move i18n-helper inside helpers/ * Fix unit tests * Fix unit test * Move pages components * Rename routes component * Move reducers to ducks/index * Fix bad path in unit test * Hide gas price chart and prevent api call when not on ethereum networks. (#6300) Add missing translations in gas customization modal * Fix gas fee in the submitted step of the transaction details activity log. (#6301) * Fix oversized loading overlay on gas customization modal. (#6326) * Replaces the coinbase link in the deposit modal with one for wyre (#6302) * New settings page rebased (#6333) * New setting tab * Add InfoTab * Add Advanced tab * Add Security Tab * Finish mobile view * Make new setting page responsive * Fix linter * Fix y scrolling * Update link in network dropdown * Fix e2e tests * Remove duplicate translation key * Resolve merge conflict * Only change settings header in popup view. * Place mobile-sync button in advanced-tab of settings * Close transaction on close of notification window (#6340) * Cancel error rebased (#6341) * Check balance before showing cancel * Fix linter * Use existing helper methods for calculating increased cancel price * Add tooltip for disabled button * Lint fix for cancelError branch. * Disabling of cancel button should account for value of tx. * E2E - Dont close window notifications (#6349) * Dont close window notifications * Remove commented out lines in beta spec * Don't include tx value in calculation of balance sufficiency for cancel button disabling. (#6346) * enable privacy mode for first time users (#6347) * Version 6.3.0 (#6350)
7 tasks
github-merge-queue bot
pushed a commit
that referenced
this pull request
Mar 5, 2025
#30661) ## **Description** @davidmurdoch requested this feature here: #30440 (review) Also adds to the VSCode GitLens settings. If a Cursor user could help with the Cursor settings, that would be much appreciated. We should discuss: - The inclusion of #17092, as I'm undecided about it - Whether it's appropriate to automatically execute `git config blame.ignoreRevsFile .git-blame-ignore-revs` in `postinstall`. It writes to the local `.git/config` file in your `metamask-extension` folder, so it's only changing that one folder. Command to get commits with over 200 file changes ``` git log --pretty=format:"%H %s" --shortstat | awk '{if ($1 ~ /^[0-9]+$/) {num = $1 + 0; if (num > 200 && current_hash !~ /Revert/) print num " " current_hash} else current_hash = $0}' | sort -nr ``` [](https://codespaces.new/MetaMask/metamask-extension/pull/30661?quickstart=1) ## **Related issues** David Murdoch request: #30440 (review) ## **Ignored PRs** - #6304 - #7730 - #8023 - #8056 - #8595 - #9239 - #9274 - #10358 - #10655 - #10911 - #17092 - #22639 - #22531 - #30440 <!--## **Manual testing steps** ## **Screenshots/Recordings** ## **Pre-merge author checklist** ## **Pre-merge reviewer checklist**--> --------- Co-authored-by: David Murdoch <187813+davidmurdoch@users.noreply.github.com>
](https://codespaces.new/MetaMask/metamask-extension/pull/30661?quickstart=1){kind=link}
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
❤️