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

Handle successful local Crypto Payment #1976

Merged
merged 23 commits into from
Mar 3, 2022

Conversation

FSM1
Copy link
Contributor

@FSM1 FSM1 commented Feb 24, 2022

closes #1974


Submission checklist:

Layout

  • Change looks good in the desktop web ui
  • Change looks good in the mobile web ui

Theme

  • Components / elements inspected in light mode
  • Components / elements inspected in dark mode

@render
Copy link

render bot commented Feb 24, 2022

@render
Copy link

render bot commented Feb 24, 2022

@render
Copy link

render bot commented Feb 24, 2022

@github-actions github-actions bot added the Type: Feature Added to PRs to identify that the change is a new feature. label Feb 24, 2022
@FSM1 FSM1 marked this pull request as draft February 24, 2022 16:26
@asnaith
Copy link
Member

asnaith commented Feb 25, 2022

We are going to need some more funds when this is ready for testing

@asnaith asnaith closed this Feb 25, 2022
@asnaith
Copy link
Member

asnaith commented Feb 25, 2022

Sorry, clicked the wrong button and closed this by mistake...re-opening!

@asnaith asnaith reopened this Feb 25, 2022
@render
Copy link

render bot commented Feb 25, 2022

@render
Copy link

render bot commented Feb 25, 2022

@render
Copy link

render bot commented Feb 25, 2022

@FSM1 FSM1 requested review from Tbaut and tanmoyAtb and removed request for Tbaut February 28, 2022 17:37
@FSM1 FSM1 self-assigned this Feb 28, 2022
@FSM1 FSM1 requested a review from Tbaut February 28, 2022 17:37
@FSM1 FSM1 marked this pull request as ready for review February 28, 2022 18:08
Copy link
Collaborator

@Tbaut Tbaut left a comment

Choose a reason for hiding this comment

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

Left some nits, I can't test this properly for crypto, I'll let Andrew do this.

@FSM1 FSM1 requested review from tanmoyAtb and Tbaut March 3, 2022 13:42
Copy link
Collaborator

@Tbaut Tbaut left a comment

Choose a reason for hiding this comment

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

👍 Test passing locally as well for the subscription :)

@FSM1 FSM1 enabled auto-merge (squash) March 3, 2022 15:45
@FSM1 FSM1 merged commit b6cd6ba into dev Mar 3, 2022
@FSM1 FSM1 deleted the feat/crypto-payment-after-transaction-is-confirmed-1974 branch March 3, 2022 15:46
FSM1 added a commit that referenced this pull request Mar 9, 2022
* span and svg fix (#1980)

* Link to form instead of Discord (#1977)

* Release to PROD - 1.1.1 (#1594)

* [Files] - Show current bucket decryption key (#1534)

* show current bucket decryption key

* lingui extract

Co-authored-by: GitHub Actions <actions@github.com>

* [Files] - Get admin public key from the api (#1485)

* bump

* use api client

* merge dev

* lingui extract

* support several keys

* wih scroll because pub/decryption key are long

Co-authored-by: GitHub Actions <actions@github.com>

* Add lint rules for test debug commands (#1535)

* prevent double opening (#1538)

* Add test coverage for storage summary adjustments (#1536)

* Translated using Weblate (French) (#1540)

Currently translated at 100.0% (278 of 278 strings)

Translation: ChainSafe Files/Chainsafe Files user interface
Translate-URL: https://hosted.weblate.org/projects/chainsafe-files/chainsafe-files-user-interface/fr/

Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>

* Better colors for dark mode select and tagsinput components (#1550)

* better colors for dark mode

* lingui extract

* fix typo

Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>
Co-authored-by: GitHub Actions <actions@github.com>

* Filter out current bucket (#1548)

* filter out current bucket

* Update packages/files-ui/src/Components/Modules/FileBrowsers/ShareModal.tsx

* fix color (#1555)

* Fix user lookup spamming the api, and throwing (#1553)

* oh yeaah

* lingui extract

* lingui extract

* Apply suggestions from code review

* lingui extract

Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: Tanmoy Basak Anjan <tanmoy3399@gmail.com>

* Upgrade Torus dependencies (#1549)

* [wip] update dependencies

* Revert "[wip] update dependencies"

This reverts commit 04b593b.

* update torus dependencies

* fix storage test

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* reset fields for shared folders (#1577)

* reset forms and fix a couple error types (#1578)

* Translations update from Weblate (#1557)

* Translated using Weblate (French)

Currently translated at 100.0% (281 of 281 strings)

Translation: ChainSafe Files/Chainsafe Files user interface
Translate-URL: https://hosted.weblate.org/projects/chainsafe-files/chainsafe-files-user-interface/fr/

* Translated using Weblate (German)

Currently translated at 69.7% (196 of 281 strings)

Translation: ChainSafe Files/Chainsafe Files user interface
Translate-URL: https://hosted.weblate.org/projects/chainsafe-files/chainsafe-files-user-interface/de/

Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>

* hide when ther's no menu item (#1576)

* Add "maintenance" label to weblate PRs automatically (#1581)

* Upgrade api client and fix issue with shared folder renaming (#1582)

* upgrade api client and fix issue

* Update packages/files-ui/src/Contexts/FilesContext.tsx

* lingui extract

Co-authored-by: GitHub Actions <actions@github.com>

* run lint --fix (#1585)

* Gaming dashboard - API keys as cards  (#1575)

* Dashboard cards done

* lingui extract

* extra padding

* Apply suggestions from code review

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* lingui extract

* Feedback

* Removed link

* Apply suggestions from code review

* Made warning bigger

* lingui extract

Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>
Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>

* New navigations buttons (#1574)

* wip

* lingui extract

* center and add posthog

* Update .eslintrc.json

* Add team feature fake door (#1587)

* wip

* modal and tracking

* use data-posthog instead

Co-authored-by: GitHub Actions <actions@github.com>

* fix tertiary buttons (#1592)

* Posthog identify user on login (#1590)

* identify user on login

* fix effect deps

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>
Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: Andrew Snaith <asnaith@users.noreply.github.com>
Co-authored-by: Weblate (bot) <hosted@weblate.org>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Tanmoy Basak Anjan <tanmoy3399@gmail.com>
Co-authored-by: Ryan Noble <ryanjnoble@gmail.com>

* link to form

Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>
Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: Andrew Snaith <asnaith@users.noreply.github.com>
Co-authored-by: Weblate (bot) <hosted@weblate.org>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Tanmoy Basak Anjan <tanmoy3399@gmail.com>
Co-authored-by: Ryan Noble <ryanjnoble@gmail.com>
Co-authored-by: Michael Yankelev <myankelev@gmail.com>

* Make Storage tests pass (#1965)

* make tests pass

* mute logs

* cid pass with a hack

* skip the unpinning

* Focus colors on buttons (#1978)

* removed conditional buttons

* removed conditional buttons

* added text focus colors

* sorted out buttons

* preview buttons

* lingui extract

* colors fixed

* button colors update

* theme preview colors

Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* Fix sorting for shared folders (#1990)

* fix sort

* fix lgtm

* Translations update from Hosted Weblate (#1989)

* Translated using Weblate (French)

Currently translated at 100.0% (399 of 399 strings)

Translation: ChainSafe Files/Chainsafe Files user interface
Translate-URL: https://hosted.weblate.org/projects/chainsafe-files/chainsafe-files-user-interface/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (399 of 399 strings)

Translation: ChainSafe Files/Chainsafe Files user interface
Translate-URL: https://hosted.weblate.org/projects/chainsafe-files/chainsafe-files-user-interface/fr/

Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Thibaut <weblate@thib.top>

* Billing storage (#1983)

* without notif for now

* with storage plans

* fix routing

* lingui extract

* proper blue

* update card modal full width

* bring back restriction

Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>

* [Files] Set icon color in mobile sorting menu (#1993)

* set icon color

* lingui extract

Co-authored-by: GitHub Actions <actions@github.com>

* Pdf viewer fixes (#1995)

* pdf viewer responsive

* lingui extract

Co-authored-by: GitHub Actions <actions@github.com>

* Refactor shared folder cretation and edition (#1996)

* fell down the rapid hole

* lingui extract

Co-authored-by: GitHub Actions <actions@github.com>

* one liner (#2000)

* Handle successful local Crypto Payment (#1976)

* close dialog once payment tx has been mined

* remove console logs

* add success screen

* add success modal

* lingui extract

* Apply suggestions from code review

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* lingui extract

* missing brace

* whitespace

* make ConfirmPlan methods nullable

* update success text for crypto

* lingui extract

* disable payment confirmation if no card is available

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>
Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: Tanmoy Basak Anjan <tanmoy3399@gmail.com>

* Handle overflow on grid names (#2003)

* ellipsis on grid nnames

* widths ready

* z index changed (#2002)

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* Use toggle for account visibility (#2001)

* toggle

* spacing

* lingui extract

Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>

* Update product names (#1991)

* update product translations

* add in production Ids

* lingui extract

* update tests

* fix typo

* more test updates

* more test updates

* fix more tests

* remove description from lookup

* lingui extract

* remove description from map

* remove description from downgrade details

Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* fix dialog closing instead of going to success (#2007)

* Resolve yarn.lock issue in gh actions test jobs (#2008)

* update tkey (#2009)

* update tkey and wire up - wip

* fix some of the glitches

Co-authored-by: Tanmoy Basak Anjan <tanmoy3399@gmail.com>
Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>
Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: Andrew Snaith <asnaith@users.noreply.github.com>
Co-authored-by: Weblate (bot) <hosted@weblate.org>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Ryan Noble <ryanjnoble@gmail.com>
Co-authored-by: Weblate (bot) <noreply@weblate.org>
Co-authored-by: Thibaut <weblate@thib.top>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Feature Added to PRs to identify that the change is a new feature.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Crypto payment UI does not refresh after transaction is confirmed
5 participants