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

Lm pool view fixes #748

Merged
merged 58 commits into from
Feb 27, 2023
Merged

Lm pool view fixes #748

merged 58 commits into from
Feb 27, 2023

Conversation

Ridel1e
Copy link
Collaborator

@Ridel1e Ridel1e commented Feb 27, 2023

No description provided.

deadit and others added 30 commits December 30, 2022 13:43
…ee-in-spf

# Conflicts:
#	package.json
#	yarn.lock
* add amplitude and firstlaunch / session start events

* update analytics

* add events

* update event

* update analytics

* add redeem close confirm / swap close confirm

* fix after review

* update ci

* update request modal

* add spf modal

* add spf modal all states

* add claim spf notification

* update names & add polling & add request

* some fixes

* fix spf modal

* update spf status view

* fix modal styles

* update filter fns

* spf modal fixes

* fix spf links

* remove claim button from mobile devices

* new spf button logic

* some fixes

* add polling to reward

* add polling disabling on last stage

* ClaimSpfButton.tsx

* update paddings

* spf design fixes

* fix spf screens

* fix notification z-index

* fix build analytics methods

* update urls and comment amplitude analytics

* update version

* remove ido notification

---------

Co-authored-by: deadit <stdeadit@gmail.com>
* update links

* fix claim spf styles

---------

Co-authored-by: ridel1e <ridellee@gmail.com>
# Conflicts:
#	package.json
#	src/common/services/CurrencyConverter.ts
#	src/components/ConvenientAssetView/ConvenientAssetView.tsx
#	src/network/ergo/operations/swap/createSwapTxData.ts
#	yarn.lock
# Conflicts:
#	package.json
#	src/App.tsx
#	src/common/analytics/Analytics.ts
#	src/common/analytics/index.ts
#	src/common/analytics/utils.ts
@Ridel1e Ridel1e merged commit cbe83e8 into dev Feb 27, 2023
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.

3 participants