Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix circleci apk #2240

Merged
merged 4 commits into from Feb 12, 2021
Merged

Fix circleci apk #2240

merged 4 commits into from Feb 12, 2021

Conversation

estebanmino
Copy link
Contributor

Description

Write a short description of the changes included in this pull request.

Checklist

  • There is a related GitHub issue
  • Tests are included if applicable
  • Any added code is fully documented

Issue

Resolves #???

@estebanmino estebanmino requested a review from a team as a code owner February 12, 2021 14:29
@@ -196,12 +197,14 @@ workflows:
only:
- master
- develop
- fix-circleci-apk
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was this just for testing? are we planning on removing this before merge?

This reverts commit 60df2aa.
@estebanmino estebanmino merged commit 1c38ef9 into develop Feb 12, 2021
@estebanmino estebanmino deleted the fix-circleci-apk branch February 12, 2021 15:09
estebanmino added a commit that referenced this pull request Feb 16, 2021
* Remove best deals badge from WYRE transfers. (#2228)

Co-authored-by: Shivam Chaturvedi <corsairshivam@gmail.com>

* Handle `balanceError` case (#2148)

* Handle `balanceError` case

* Adjust error case

* Update handling balanceError

* Remove etherscan link

* Add metamask-controllers from disk

* Add translation strings

* Remove etherscanUrl

* Revert "Add metamask-controllers from disk"

This reverts commit 75ac0c68b99e5bf2ff190c20cccad4df74a8806f.

* Only use this style for error case

* contract metadata images bump (#2233)

* contractmetadata

* snaps

* remotesvg

* Feature/warn when replacing (#2176)

* mock login changes

* mock warning modal

* mock delete modal

* mock delete warning and submitDelete

* Add isTextDelete

* Add autoFocus

* clean up

* "delete"

* undo design changes

* Add en translations

* Update unit tests

* fix

* Make this async await and catch and log failure

* Remove 12-word

* Adjust lineHeight

* fix typo

* Add logic to show delete notification

* Hide back button

* Disable hardware back button press

* Add notification

* Add closeButtonDisabled functionality

* Update styles

* Hide back button better on Congratulations screen

* Update translation

* Add breakpoint for small devices

* add missing "a"

* fix warning modal

* Clean up BaseNotification component

* Remove added styles

* Remove eslint-disable-next-line

* Use InteractionManager

* Remove empty onHide

* update empty callback

* Cleanup

* Add flexDirection: 'row'

* Move styles to WarningExistingUserModal

* Dismiss keyboard

* Add strings to locales

* Simplify

* Add loading screen for delete

* Actually delete wallet

* Fix modal tap area

Co-authored-by: ricky <ricky@macbook.lan>

* v1.0.11 (#2238)

* version

* bump

* Update CHANGELOG.md

* update

* Update CHANGELOG

* Remove disclosure PR

* Fix circleci apk (#2240)

* resouceclass

* revert

* Revert "revert"

This reverts commit 60df2aa.

* changelog

* gaba

* swaps-tx

* MM_FOX_CODE

* swaptxs

* works

* fix

* TransactionController from controllers (#2243)

* TransactionController from controllers

* query

* changelog

* tests

* 577

* 577

* details

* transactionType

* token

* byaction

* allworking

* ceanup

* locales

* utils

* check

* edgecase

* test

* tests

* approvals

* filter

* more

Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Co-authored-by: Shivam Chaturvedi <corsairshivam@gmail.com>
Co-authored-by: ricky <ricky.miller@gmail.com>
Co-authored-by: ricky <ricky@macbook.lan>
rickycodes added a commit that referenced this pull request Feb 25, 2021
* develop: (48 commits)
  Fix input state (#2265)
  bump android versionCode (#2260)
  bugfix/use bignumber for transfer deeplinks (#2257)
  Fix account list scroll (#2256)
  TransactionController from controllers (#2243)
  Fix circleci apk (#2240)
  v1.0.11 (#2238)
  Feature/warn when replacing (#2176)
  contract metadata images bump (#2233)
  Handle `balanceError` case (#2148)
  Remove best deals badge from WYRE transfers. (#2228)
  @metamask/controllers@6.0.1 (#2217)
  Fix cloudflare redirects (#2180)
  Merge pull request from GHSA-wmvx-96jh-gcr4
  Update @metamask/contract-metadata (#2203)
  React Native update to 0.63 (#2078)
  Create dependabot.yml (#2204)
  Fix "Text strings must be rendered within a <Text> component" (#2193)
  Use navigate instead of push (#2191)
  Add fiat on ramp modal close button extra hit area (#2174)
  ...
rickycodes pushed a commit that referenced this pull request Jan 31, 2022
* resouceclass

* revert

* Revert "revert"

This reverts commit 60df2aa.

* changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants