Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
Brave + BitGo rebase notes

Original PR brave/ethereum-remote-client#136

Relevant diff for comparing original bitgo-integration with master before it was rebased https://github.com/brave/ethereum-remote-client/compare/master-08-23-2020...bitgo-integration#diff-7ae45ad102eab3b6d7e7896acd08c427a9b25b346470d7bc6507b6481575d519

Path specific notes when looking at original diff (🟨):

🟨 brave/ui/app/store/actions.js

hand merged into ui/app/store/actions.js createNewVault and createNewVaultAndRestore logic was merged constants moved to ui/app/store/actionConstants.js

🟨 brave/ui/app/helpers/constants/routes.js

hand merged in changes to brave/ui/app/helpers/constants/routes.js, bootstrapped routes into ui/app/helpers/constants/routes.js

🟨 brave/ui/app/components/app/provider-page-container/index.scss

hand merged into ui/app/components/app/custom.scss

🟨 brave/ui/app/pages/first-time-flow/welcome-modal/index.scss

hand picked .__bitgo and .__button-create into new file brave/ui/app/pages/connect-accounts/index.scss

🟨 brave/ui/app/ducks/metamask/metamask.js

hand-edited into brave/ui/app/ducks/brave/brave.js, also added braveReducer to combineReducers in ui/app/ducks/index.js

🟨 brave/ui/app/components/app/connect-wallet/connect-wallet.component.js

changes hand merged into ui/app/components/app/connect-wallet/connect-wallet.component.js

🟨 brave/ui/app/components/app/connect-wallet/index.scss

hand merged into ui/app/components/app/connect-wallet/index.scss

🟨 ui/app/pages/routes/index.js

hand merged into ui/app/pages/routes/routes.component.js

🟨 package.json, yarn.lock

squashed dependency and pinning into 1 commit

Copied over in final state from the tip of bitgo-integration branch:

  • brave/ui/app/pages/provider-wallet/provider-wallet.component.js
  • brave/ui/app/pages/provider-wallet/index.js
  • brave/ui/app/components/app/dropdowns/components/brave-wallet-dropdown/assets/plus.js
  • brave/ui/app/components/app/dropdowns/assets/styles.js
  • brave/ui/app/components/app/dropdowns/components/brave-wallet-dropdown/styles.js
  • brave/ui/app/components/app/app-header/app-header.container.js
  • brave/ui/app/components/app/dropdowns/assets/import-icon.js
  • brave/ui/app/components/app/app-header/app-header.component.js
  • brave/ui/app/components/app/dropdowns/brave-dropdown-items.component.js
  • brave/ui/app/components/app/dropdowns/assets/plus-icon.js
  • brave/ui/app/pages/provider-wallet/index.scss
  • brave/ui/app/components/app/dropdowns/components/account-items.component.js
  • brave/ui/app/components/app/dropdowns/brave-dropdown-header.component.js
  • brave/ui/app/components/app/dropdowns/assets/carat-down.js
  • brave/ui/app/components/app/app-header/index.js
  • brave/ui/app/pages/connect-accounts/connect-accounts.container.js
  • brave/ui/app/components/app/dropdowns/components/brave-wallet-dropdown/assets/carat-down.js
  • brave/ui/app/pages/connect-accounts/connect-accounts.component.js
  • brave/ui/app/pages/provider-wallet/provider-wallet.container.js
  • brave/ui/app/components/app/dropdowns/assets/bitgo-logo.js
  • brave/ui/app/pages/connect-accounts/index.js
  • brave/app/scripts/metamask-controller.js
  • brave/app/scripts/controllers/bitgo.js
  • brave/app/images/*.png
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment