diff --git a/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png b/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png index 0eaeb2525..cefd7a622 100644 Binary files a/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png and b/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png index 7b380b43b..68d4d99f8 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/my-strategy.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/my-strategy.png index bb9cd0386..fb0369353 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/my-strategy.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/my-strategy.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/deposit/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/deposit/form.png index f229c8faf..38f6db987 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/deposit/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/deposit/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/duplicate/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/duplicate/form.png index 4d6f20338..73ef399f5 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/duplicate/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/duplicate/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/editPrices/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/editPrices/form.png index e9c3cb7a1..f5040ff8a 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/editPrices/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/editPrices/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png index 25c45b8bb..f3fce6522 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/withdraw/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/withdraw/form.png index 508d185ba..0c6660add 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/withdraw/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/withdraw/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png index 2572f723b..ef3889ecd 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/deposit/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/deposit/form.png index 1cf777df4..7b1b5bedc 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/deposit/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/deposit/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png index 2645d395d..a129df26d 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/editPrices/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/editPrices/form.png index aa4dd3354..894b74f11 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/editPrices/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/editPrices/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/undercut/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/undercut/form.png index 7c796d4ca..6ff88816c 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/undercut/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/undercut/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/withdraw/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/withdraw/form.png index 4aa662381..014afd62a 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/withdraw/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/withdraw/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/form.png index c9fe275d6..0702db115 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/my-strategy.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/my-strategy.png index a7b4ad23f..ddf112e88 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/my-strategy.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/my-strategy.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/deposit/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/deposit/form.png index a5f96d019..f6a560ae1 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/deposit/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/deposit/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/duplicate/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/duplicate/form.png index ed9933274..31992a4a5 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/duplicate/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/duplicate/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/editPrices/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/editPrices/form.png index 933f13661..4f5c55015 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/editPrices/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/editPrices/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/undercut/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/undercut/form.png index 212dea739..4005819af 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/undercut/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/undercut/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/withdraw/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/withdraw/form.png index 080c34dd6..28fa0e511 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/withdraw/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/withdraw/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/form.png index 48100226f..6d90a2b02 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/my-strategy.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/my-strategy.png index a87756969..37de325fe 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/my-strategy.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/my-strategy.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/deposit/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/deposit/form.png index 5da7afc71..d77c1c04e 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_range/deposit/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_range/deposit/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/duplicate/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/duplicate/form.png index 9e6e8d4f3..e901f62cf 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_range/duplicate/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_range/duplicate/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/editPrices/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/editPrices/form.png index f0088395e..c2030284a 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_range/editPrices/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_range/editPrices/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/undercut/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/undercut/form.png index 23effba8e..75466edf1 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_range/undercut/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_range/undercut/form.png differ diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/withdraw/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/withdraw/form.png index c24a012fd..3affbd69c 100644 Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_range/withdraw/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_range/withdraw/form.png differ diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/create/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/create/form.png index a4a35dbce..93c5cd809 100644 Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/create/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/create/form.png differ diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/deposit/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/deposit/form.png index 5cdc3b903..bdc8042a4 100644 Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/deposit/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/deposit/form.png differ diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/duplicate/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/duplicate/form.png index 5fa400998..d5d938e3b 100644 Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/duplicate/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/duplicate/form.png differ diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/editPrices/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/editPrices/form.png index 13790ec84..2b155bf52 100644 Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/editPrices/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/editPrices/form.png differ diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/undercut/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/undercut/form.png index e30606814..8876c609a 100644 Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/undercut/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/undercut/form.png differ diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png index 938a8a7d1..8bee65966 100644 Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/form.png index f296b7713..c4a4a6ae5 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png index a0d95331d..77fb064f1 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/duplicate/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/duplicate/form.png index 28ce2ee05..5c9cb1575 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/duplicate/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/duplicate/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/editPrices/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/editPrices/form.png index a5eaf8c0a..f9ffb8ad6 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/editPrices/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/editPrices/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/renew/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/renew/form.png index 5a66e9a03..e03049550 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/renew/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/renew/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/undercut/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/undercut/form.png index 354e53626..216038aed 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/undercut/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/undercut/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/withdraw/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/withdraw/form.png index 2a4f482c0..e554576e9 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/withdraw/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/withdraw/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/form.png index 619b10a2d..1c43b5afe 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/my-strategy.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/my-strategy.png index a5d8076c7..4a92bf57d 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/my-strategy.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/my-strategy.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png index d0347d5ac..a339aa19d 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/duplicate/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/duplicate/form.png index 1da17fffb..687a3aa99 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/duplicate/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/duplicate/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/editPrices/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/editPrices/form.png index b89ab5921..9725ade9c 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/editPrices/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/editPrices/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png index aafaa4bd0..3c9d1f24b 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/undercut/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/undercut/form.png index fbfdabe77..4ac73ac2f 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/undercut/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/undercut/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/withdraw/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/withdraw/form.png index 50d353e64..8d114a671 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/withdraw/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/withdraw/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png index 739918cb3..7aae96439 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png index 20079df2c..5af71d953 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/duplicate/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/duplicate/form.png index fc8559894..a8e0dc4db 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/duplicate/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/duplicate/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/editPrices/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/editPrices/form.png index d45e0d4f6..661773c4d 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/editPrices/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/editPrices/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/renew/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/renew/form.png index a45e77c43..ab6b5157e 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/renew/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/renew/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/undercut/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/undercut/form.png index ff2ea9915..e97b4dff0 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/undercut/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/undercut/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/withdraw/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/withdraw/form.png index d9384dc08..37889e18d 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/withdraw/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/withdraw/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png index e7c1e19a7..06584d1af 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/create/my-strategy.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/create/my-strategy.png index c18380b23..943aabd6b 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/create/my-strategy.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/create/my-strategy.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png index 42db9b80f..8d55e2c61 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png index 4562e7af8..ae01ffaab 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/editPrices/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/editPrices/form.png index 64571da5d..8e4ebab32 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/editPrices/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/editPrices/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/renew/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/renew/form.png index 680720424..2c55418d6 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/renew/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/renew/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/undercut/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/undercut/form.png index 0608e15f8..69c20f43c 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/undercut/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/undercut/form.png differ diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/withdraw/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/withdraw/form.png index 8aaccd84f..04b7407d5 100644 Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/withdraw/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/withdraw/form.png differ diff --git a/src/components/activity/ActivityCountDown.tsx b/src/components/activity/ActivityCountDown.tsx index 426fc6ab1..d34cc8eb1 100644 --- a/src/components/activity/ActivityCountDown.tsx +++ b/src/components/activity/ActivityCountDown.tsx @@ -107,8 +107,8 @@ export const ActivityCountDown: FC = ({ time }) => { return ( = (props) => { const { filters = [] } = props; return (
-
-

Activity

+
+

Activity

= (props) => { onFocus={(e) => e.target.select()} onBlur={handleBlur} className={cn( - 'text-18 font-weight-500 grow text-ellipsis bg-transparent focus:outline-none', + 'text-16 font-weight-500 grow text-ellipsis bg-transparent focus:outline-none', disabled && 'cursor-not-allowed text-white/40', isError && 'text-error' )} diff --git a/src/components/common/tabs/TabsMenu.tsx b/src/components/common/tabs/TabsMenu.tsx index 2ba565fe3..fab93b17e 100644 --- a/src/components/common/tabs/TabsMenu.tsx +++ b/src/components/common/tabs/TabsMenu.tsx @@ -1,11 +1,13 @@ import { FC, ReactNode } from 'react'; +import { cn } from 'utils/helpers'; type TabsMenuProps = { + className?: string; children: ReactNode; }; -export const TabsMenu: FC = ({ children }) => { +export const TabsMenu: FC = ({ children, className }) => { return ( -
{children}
+
{children}
); }; diff --git a/src/components/simulator/input/BuySellBlockNew/index.tsx b/src/components/simulator/input/BuySellBlockNew/index.tsx index 76dd2c975..be7a888e0 100644 --- a/src/components/simulator/input/BuySellBlockNew/index.tsx +++ b/src/components/simulator/input/BuySellBlockNew/index.tsx @@ -12,6 +12,8 @@ import { StrategyInputDispatch, StrategyInputOrder, } from 'hooks/useStrategyInput'; +import style from 'components/strategies/common/order.module.css'; +import { cn } from 'utils/helpers'; type Props = { base: Token; @@ -25,6 +27,7 @@ type Props = { isOrdersOverlap: boolean; isOrdersReversed: boolean; warningMsg?: string; + className?: string; }; export const BuySellBlock: FC = ({ @@ -39,6 +42,7 @@ export const BuySellBlock: FC = ({ isOrdersOverlap, isOrdersReversed, warningMsg, + className, }) => { const titleId = useId(); @@ -92,15 +96,12 @@ export const BuySellBlock: FC = ({ return (
-

+

{buy ? 'Buy Low' : 'Sell High'} diff --git a/src/components/simulator/input/SimInputRecurring.tsx b/src/components/simulator/input/SimInputRecurring.tsx index 17607a450..e4d3efe11 100644 --- a/src/components/simulator/input/SimInputRecurring.tsx +++ b/src/components/simulator/input/SimInputRecurring.tsx @@ -70,6 +70,7 @@ export const SimInputRecurring = ({ strategyType="recurring" isBudgetOptional={+state.buy.budget === 0 && +state.sell.budget > 0} warningMsg={warningMsg.buy} + className="rounded-ee rounded-es" /> ); diff --git a/src/components/simulator/input/SimInputStrategyType.tsx b/src/components/simulator/input/SimInputStrategyType.tsx index 37dae65f2..200969ff7 100644 --- a/src/components/simulator/input/SimInputStrategyType.tsx +++ b/src/components/simulator/input/SimInputStrategyType.tsx @@ -35,10 +35,7 @@ export const SimInputStrategyType = () => { ]; return ( -
+

Trading Strategy

diff --git a/src/components/simulator/input/SimInputTokenSelection.tsx b/src/components/simulator/input/SimInputTokenSelection.tsx index 84c5088fb..c3cdfcddd 100644 --- a/src/components/simulator/input/SimInputTokenSelection.tsx +++ b/src/components/simulator/input/SimInputTokenSelection.tsx @@ -6,7 +6,6 @@ import { ReactComponent as IconArrow } from 'assets/icons/arrowDown.svg'; import { useModal } from 'hooks/useModal'; import { Warning } from 'components/common/WarningMessageWithIcon'; import { cn } from 'utils/helpers'; -import { Tooltip } from 'components/common/tooltip/Tooltip'; interface Props { baseToken?: string; @@ -26,27 +25,7 @@ export const SimInputTokenSelection: FC = ({ const quote = getTokenById(quoteToken); return ( -
-
-

Token Pair

- - Selecting the tokens you would like to create a simulation for. -
- Buy or Sell token (also called Base token) is the - token you would like to buy or sell in the strategy. -
- With token (also called Quote token) is the token - you would denominate the rates in. -

- } - /> -
+
= (props) => { return ( <> -
+

Set Price Range  @@ -335,7 +335,7 @@ export const CreateOverlappingStrategy: FC = (props) => { setRangeError={setRangeError} />

-
+

Set Fee Tier

= (props) => { setSpread={setSpreadValue} />
-
-
-

Budget

+
+
+
+

Budget

+

+ Please select a token to proceed. +

+
-

- Please select a token to proceed. -

= (props) => { />
{anchor && ( -
+

@@ -397,7 +399,7 @@ export const CreateOverlappingStrategy: FC = (props) => { {anchor && (

diff --git a/src/components/strategies/common/InputBudget.tsx b/src/components/strategies/common/InputBudget.tsx index da9d34425..a553aef63 100644 --- a/src/components/strategies/common/InputBudget.tsx +++ b/src/components/strategies/common/InputBudget.tsx @@ -136,7 +136,7 @@ export const InputBudget: FC = (props) => { size={1} placeholder={placeholder} className={` - text-18 font-weight-500 grow text-ellipsis bg-transparent focus:outline-none + text-16 font-weight-500 grow text-ellipsis bg-transparent focus:outline-none ${error ? 'text-error' : ''} ${disabled ? 'text-white/40' : ''} ${disabled ? 'cursor-not-allowed' : ''} diff --git a/src/components/strategies/common/InputLimit.tsx b/src/components/strategies/common/InputLimit.tsx index 93be8bfc0..863abd79c 100644 --- a/src/components/strategies/common/InputLimit.tsx +++ b/src/components/strategies/common/InputLimit.tsx @@ -115,7 +115,7 @@ export const InputLimit: FC = (props) => { aria-label="Enter Price" placeholder="Enter Price" className={cn( - 'text-18 font-weight-500 w-0 flex-1 text-ellipsis bg-transparent text-start focus:outline-none', + 'text-16 font-weight-500 w-0 flex-1 text-ellipsis bg-transparent text-start focus:outline-none', displayError && 'text-error' )} data-testid="input-price" diff --git a/src/components/strategies/common/InputRange.tsx b/src/components/strategies/common/InputRange.tsx index 330d79990..103d5bc9a 100644 --- a/src/components/strategies/common/InputRange.tsx +++ b/src/components/strategies/common/InputRange.tsx @@ -176,7 +176,7 @@ export const InputRange: FC = ({ value={localMin} placeholder="Enter Price" className={cn( - 'text-18 font-weight-500 mb-5 w-full text-ellipsis bg-transparent focus:outline-none', + 'text-16 font-weight-500 mb-5 w-full text-ellipsis bg-transparent focus:outline-none', hasMinError && 'text-error' )} onChange={(e) => onMinChange(e.target.value)} diff --git a/src/components/strategies/common/TokenSelection.tsx b/src/components/strategies/common/TokenSelection.tsx index 02a9b0e6b..f264ab422 100644 --- a/src/components/strategies/common/TokenSelection.tsx +++ b/src/components/strategies/common/TokenSelection.tsx @@ -8,28 +8,8 @@ import { useModal } from 'hooks/useModal'; import { ModalTokenListData } from 'libs/modals/modals/ModalTokenList'; import { useTradeCtx } from 'components/trade/TradeContext'; import { ReactComponent as WarningIcon } from 'assets/icons/warning.svg'; -import { Tooltip } from 'components/common/tooltip/Tooltip'; import { SuspiciousToken } from 'components/common/DisplayPair'; -export const TokenSelectionTooltip = () => { - return ( - - Selecting the tokens you would like to create a strategy for. -
- Buy or Sell token (also called Base token) is the token - you would like to buy or sell in the strategy. -
- With token (also called Quote token) is the token you - would denominate the rates in. -

- } - /> - ); -}; - export const TokenSelection = () => { const { base, quote } = useTradeCtx(); const navigate = useNavigate({ from: '/trade' }); @@ -93,11 +73,7 @@ export const TokenSelection = () => { }; return ( -
-
-

Token Pair

- -
+
= ({ aria-label="Enter Price" placeholder="Enter Price" className={cn( - 'text-18 font-weight-500 flex-1 text-ellipsis bg-transparent text-start focus:outline-none', + 'text-16 font-weight-500 flex-1 text-ellipsis bg-transparent text-start focus:outline-none', error && 'text-error' )} data-testid="input-price" diff --git a/src/components/strategies/create/BuySellBlock/InputRange.tsx b/src/components/strategies/create/BuySellBlock/InputRange.tsx index 736e0b419..b7b079a28 100644 --- a/src/components/strategies/create/BuySellBlock/InputRange.tsx +++ b/src/components/strategies/create/BuySellBlock/InputRange.tsx @@ -177,7 +177,7 @@ export const InputRange: FC = ({ value={max} placeholder="Enter Price" className={cn( - 'text-18 font-weight-500 mb-5 w-full text-ellipsis bg-transparent focus:outline-none', + 'text-16 font-weight-500 mb-5 w-full text-ellipsis bg-transparent focus:outline-none', error && 'text-error' )} onChange={handleChangeMax} diff --git a/src/components/strategies/create/CreateForm.tsx b/src/components/strategies/create/CreateForm.tsx index 3e1822a1b..2ec8b7157 100644 --- a/src/components/strategies/create/CreateForm.tsx +++ b/src/components/strategies/create/CreateForm.tsx @@ -101,71 +101,73 @@ export const CreateForm: FC = (props) => { return (
- {children} - +
{children}
+
+ - {user && ( - <> - {config.ui.showCart && ( + {user && ( + <> + {config.ui.showCart && ( + + )} - )} + + )} + {!user && ( - - )} - {!user && ( - - )} + )} +
); }; diff --git a/src/components/strategies/create/CreateOrder.tsx b/src/components/strategies/create/CreateOrder.tsx index 95ab07b9a..7e7424e65 100644 --- a/src/components/strategies/create/CreateOrder.tsx +++ b/src/components/strategies/create/CreateOrder.tsx @@ -14,6 +14,7 @@ import { cn } from 'utils/helpers'; import { LogoImager } from 'components/common/imager/Imager'; import { getDefaultOrder } from './utils'; import { useMarketPrice } from 'hooks/useMarketPrice'; +import style from 'components/strategies/common/order.module.css'; interface Props { base: Token; @@ -101,91 +102,93 @@ export const CreateOrder: FC = ({ }; const headerProps = { titleId, order, base, buy, setSettings }; - const border = buy - ? 'border-buy/50 focus-within:border-buy' - : 'border-sell/50 focus-within:border-sell'; + return (
{settings} - -

- - {buy ? 'Buy Low' : 'Sell High'} - - - {base.symbol} -

-
-
- - {inputTitle} - - {order.settings === 'range' ? ( - - ) : ( - - )} -
-
- - - 2 - - - - Set {buy ? 'Buy' : 'Sell'} Budget  - - - {optionalBudget && ( - Optional +
+ +

+ + {buy ? 'Buy Low' : 'Sell High'} + + + {base.symbol} +

+
+
+ + {inputTitle} + + {order.settings === 'range' ? ( + + ) : ( + )} - - +
+ + + 2 + + + + Set {buy ? 'Buy' : 'Sell'} Budget  + + + {optionalBudget && ( + + Optional + + )} + + +
+ -
- +
); }; diff --git a/src/components/strategies/create/CreateOverlappingBudget.tsx b/src/components/strategies/create/CreateOverlappingBudget.tsx index 5e662cd17..cde7aec78 100644 --- a/src/components/strategies/create/CreateOverlappingBudget.tsx +++ b/src/components/strategies/create/CreateOverlappingBudget.tsx @@ -70,7 +70,7 @@ export const CreateOverlappingBudget: FC = (props) => { return ( -
+
= (props) => {

diff --git a/src/components/strategies/create/CreateOverlappingPrice.tsx b/src/components/strategies/create/CreateOverlappingPrice.tsx index f5cef41c0..19c43b78c 100644 --- a/src/components/strategies/create/CreateOverlappingPrice.tsx +++ b/src/components/strategies/create/CreateOverlappingPrice.tsx @@ -86,10 +86,7 @@ export const CreateOverlappingPrice: FC = (props) => { return ( -
+

Set Price Range  @@ -116,7 +113,7 @@ export const CreateOverlappingPrice: FC = (props) => { required />

-
+

Set Fee Tier

= (props) => { setSpread={setSpread} />
-
+

Budget diff --git a/src/components/strategies/edit/EditBudgetFields.tsx b/src/components/strategies/edit/EditBudgetFields.tsx index 01111f503..c3e4afd28 100644 --- a/src/components/strategies/edit/EditBudgetFields.tsx +++ b/src/components/strategies/edit/EditBudgetFields.tsx @@ -12,6 +12,8 @@ import { InputBudget } from '../common/InputBudget'; import { Order, useGetTokenBalance } from 'libs/queries'; import { SafeDecimal } from 'libs/safedecimal'; import { isZero } from '../common/utils'; +import { cn } from 'utils/helpers'; +import style from 'components/strategies/common/order.module.css'; interface Props { budget: string; @@ -66,12 +68,9 @@ export const EditStrategyBudgetField: FC = ({ return (

diff --git a/src/components/strategies/edit/EditOverlappingBudget.tsx b/src/components/strategies/edit/EditOverlappingBudget.tsx index cf51361a6..9360821a1 100644 --- a/src/components/strategies/edit/EditOverlappingBudget.tsx +++ b/src/components/strategies/edit/EditOverlappingBudget.tsx @@ -169,7 +169,7 @@ export const EditOverlappingBudget: FC = (props) => { return ( {hasNoBudget(strategy) && ( -
+

Market Price

{tokenAmount(marketPrice, quote)} @@ -187,17 +187,19 @@ export const EditOverlappingBudget: FC = (props) => { />
)} -
+
-

Budget

+
+

Budget

+

+ Please select a token to proceed. +

+
-

- Please select a token to proceed. -

= (props) => { />
{anchor && editType && ( -
+
= (props) => { {anchor && (

diff --git a/src/components/strategies/edit/EditOverlappingPrice.tsx b/src/components/strategies/edit/EditOverlappingPrice.tsx index 701ce711a..53cc62130 100644 --- a/src/components/strategies/edit/EditOverlappingPrice.tsx +++ b/src/components/strategies/edit/EditOverlappingPrice.tsx @@ -205,7 +205,7 @@ export const EditOverlappingPrice: FC = (props) => { {displayPrice && ( <> -
+

Edit Price Range  @@ -232,7 +232,7 @@ export const EditOverlappingPrice: FC = (props) => { required />

-
+

Edit Fee Tier

= (props) => { )} {!displayPrice && ( -
+
= (props) => { />
)} -
+

Budget

= (props) => { />
{anchor && ( -
+
= (props) => { {anchor && (

diff --git a/src/components/strategies/edit/EditPriceFields.tsx b/src/components/strategies/edit/EditPriceFields.tsx index a6b200849..38b19ba01 100644 --- a/src/components/strategies/edit/EditPriceFields.tsx +++ b/src/components/strategies/edit/EditPriceFields.tsx @@ -15,6 +15,8 @@ import { OverlappingAction } from '../overlapping/OverlappingAction'; import { EditBudgetDistribution } from './EditStrategyAllocatedBudget'; import { isZero } from '../common/utils'; import { SafeDecimal } from 'libs/safedecimal'; +import style from 'components/strategies/common/order.module.css'; +import { cn } from 'utils/helpers'; interface Props { order: EditOrderBlock; @@ -108,92 +110,93 @@ export const EditStrategyPriceField: FC = ({ return (
{settings} - -

- - {buy ? 'Buy Low' : 'Sell High'} - - - {base.symbol} -

-
-
- - {inputTitle} - - {order.settings === 'range' ? ( - - ) : ( - - )} -
- - {showDistribution() && ( -
- +

+ + {buy ? 'Buy Low' : 'Sell High'} + + + {base.symbol} +

+ +
+ + {inputTitle} + + {order.settings === 'range' ? ( + -
- )} -
- - + ) : ( + + )} + + + {showDistribution() && ( +
+ +
+ )} +
+ + +

); }; diff --git a/src/components/strategies/edit/EditPriceNav.tsx b/src/components/strategies/edit/EditPriceNav.tsx index a11b26b9e..4086280a9 100644 --- a/src/components/strategies/edit/EditPriceNav.tsx +++ b/src/components/strategies/edit/EditPriceNav.tsx @@ -42,8 +42,8 @@ export const EditPriceNav = ({ editType }: { editType: EditTypes }) => { if (editType !== 'editPrices' && editType !== 'renew') return; return ( -
-

+
+

Trading Strategy