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.

Sign up for GitHub

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: missing deadline in swaps stx status screen #25779

Merged
merged 11 commits into from
Aug 20, 2024
Merged

fix: missing deadline in swaps stx status screen #25779

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c4a4cf0
fix: missing deadline in swaps stx status screen
infiniteflower Jul 11, 2024
a7a38a2
Merge branch 'develop' into fix/swaps-stx-timer
infiniteflower Jul 12, 2024
924a839
fix: broken tests
infiniteflower Jul 12, 2024
0f2764f
Merge branch 'develop' into fix/swaps-stx-timer
infiniteflower Jul 15, 2024
e267f6d
chore: update snapshots for tests
infiniteflower Jul 15, 2024
fb970d5
chore: attempt at fixing tests
infiniteflower Jul 15, 2024
691de5b
Merge branch 'develop' into fix/swaps-stx-timer-rebased
martahj Aug 16, 2024
190ac46
fix: updates snapshot value for swaps stx tx deadline
martahj Aug 16, 2024
596e722
fix: include swaps stx status deadline from api
martahj Aug 19, 2024
af3c138
fix: update tests to use number instead of type for swapsStxStatusDea…
martahj Aug 19, 2024
84ac8b4
Merge branch 'develop' into fix/swaps-stx-timer
martahj Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/scripts/controllers/swaps/swaps.constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {
FALLBACK_SMART_TRANSACTIONS_DEADLINE,
FALLBACK_SMART_TRANSACTIONS_MAX_FEE_MULTIPLIER,
FALLBACK_SMART_TRANSACTIONS_REFRESH_TIME,
} from '../../../../shared/constants/smartTransactions';
Expand Down Expand Up @@ -44,6 +45,7 @@ export function getDefaultSwapsControllerState(): SwapsControllerState {
swapsQuoteRefreshTime: FALLBACK_QUOTE_REFRESH_TIME,
swapsQuotePrefetchingRefreshTime: FALLBACK_QUOTE_REFRESH_TIME,
swapsStxBatchStatusRefreshTime: FALLBACK_SMART_TRANSACTIONS_REFRESH_TIME,
swapsStxStatusDeadline: FALLBACK_SMART_TRANSACTIONS_DEADLINE,
swapsStxGetTransactionsRefreshTime:
FALLBACK_SMART_TRANSACTIONS_REFRESH_TIME,
swapsStxMaxFeeMultiplier: FALLBACK_SMART_TRANSACTIONS_MAX_FEE_MULTIPLIER,
Expand Down
1 change: 1 addition & 0 deletions test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@
"swapsQuoteRefreshTime": 60000,
"swapsQuotePrefetchingRefreshTime": 60000,
"swapsStxBatchStatusRefreshTime": 10000,
"swapsStxStatusDeadline": "number",
"swapsStxGetTransactionsRefreshTime": 10000,
"swapsStxMaxFeeMultiplier": 2,
"swapsFeatureFlags": {}
Expand Down
1 change: 1 addition & 0 deletions test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@
"swapsQuoteRefreshTime": 60000,
"swapsQuotePrefetchingRefreshTime": 60000,
"swapsStxBatchStatusRefreshTime": 10000,
"swapsStxStatusDeadline": "number",
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this a "number" string and not some exact number like other fallback values?

Copy link
Contributor

Choose a reason for hiding this comment

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

The value wasn't being set up correctly in the test, but it is now 👍

"swapsStxGetTransactionsRefreshTime": 10000,
"swapsStxMaxFeeMultiplier": 2,
"swapsFeatureFlags": {}
Expand Down
Loading