From d421e593a25315f34d197526f206d4558fbad714 Mon Sep 17 00:00:00 2001 From: ryanml Date: Wed, 5 May 2021 15:46:16 -0700 Subject: [PATCH] Allowing for scroll overflow when swaps content is too tall (#10988) Fixes MetaMask/metamask-extension#10957 --- app/_locales/en/messages.json | 2 +- app/_locales/es/messages.json | 3 --- app/_locales/es_419/messages.json | 3 --- app/_locales/hi/messages.json | 3 --- app/_locales/id/messages.json | 3 --- app/_locales/it/messages.json | 3 --- app/_locales/ja/messages.json | 3 --- app/_locales/ko/messages.json | 3 --- app/_locales/ru/messages.json | 3 --- app/_locales/tl/messages.json | 3 --- app/_locales/vi/messages.json | 3 --- app/_locales/zh_CN/messages.json | 3 --- ui/pages/swaps/index.scss | 4 ++-- 13 files changed, 3 insertions(+), 36 deletions(-) diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index d0bb48c06..2f4469d7f 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -1875,7 +1875,7 @@ "message": "Finalizing..." }, "swapHighSlippageWarning": { - "message": "Slippage amount is very high. Make sure you know what you are doing!" + "message": "Slippage amount is very high." }, "swapLowSlippageError": { "message": "Transaction may fail, max slippage too low." diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 8c4dc1d7f..5f3f401e2 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -1576,9 +1576,6 @@ "swapFinalizing": { "message": "Finalizando..." }, - "swapHighSlippageWarning": { - "message": "La cantidad de deslizamiento es muy alta. ¡Asegúrate de saber lo que estás haciendo!" - }, "swapLowSlippageError": { "message": "La transacción puede fallar, el deslizamiento máximo es demasiado bajo." }, diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json index 293f5ad08..706afa7be 100644 --- a/app/_locales/es_419/messages.json +++ b/app/_locales/es_419/messages.json @@ -1576,9 +1576,6 @@ "swapFinalizing": { "message": "Finalizando..." }, - "swapHighSlippageWarning": { - "message": "La cantidad de deslizamiento es muy alta. ¡Asegúrate de saber lo que estás haciendo!" - }, "swapLowSlippageError": { "message": "La transacción puede fallar, el deslizamiento máximo es demasiado bajo." }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index 0dca37b75..262ef82d0 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -1564,9 +1564,6 @@ "swapFinalizing": { "message": "अंतिम रूप दिया जा रहा है..." }, - "swapHighSlippageWarning": { - "message": "स्लिपेज राशि बहुत अधिक है। सुनिश्चित करें कि आप जानते हैं कि आप क्या कर रहे हैं!" - }, "swapLowSlippageError": { "message": "लेनदेन विफल हो सकता है, अधिकतम स्लिपेज बहुत कम हो सकता है।" }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index e7c1fd9c3..69e3de46a 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -1564,9 +1564,6 @@ "swapFinalizing": { "message": "Menyelesaikan..." }, - "swapHighSlippageWarning": { - "message": "Jumlah slippage sangat tinggi. Pastikan Anda mengetahui yang Anda kerjakan!" - }, "swapLowSlippageError": { "message": "Transaksi bisa gagal, slippage maks. terlalu rendah." }, diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json index bb3c59c2e..36212c4f6 100644 --- a/app/_locales/it/messages.json +++ b/app/_locales/it/messages.json @@ -1582,9 +1582,6 @@ "swapFinalizing": { "message": "Finalizzando..." }, - "swapHighSlippageWarning": { - "message": "L'importo di slippage è molto alto. Assicurati di sapere cosa stai facendo!" - }, "swapLowSlippageError": { "message": "La transazione può fallire, il massimo slippage è troppo basso." }, diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index ca3dfab66..3c878c477 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -1576,9 +1576,6 @@ "swapFinalizing": { "message": "終了中..." }, - "swapHighSlippageWarning": { - "message": "非常に大きいスリッページ額です。本当に実行するか確認してください。" - }, "swapLowSlippageError": { "message": "トランザクションが失敗する可能性があります。最大スリッページが少なすぎます。" }, diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index cee0020f3..3aed947d8 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -1564,9 +1564,6 @@ "swapFinalizing": { "message": "마무리 중..." }, - "swapHighSlippageWarning": { - "message": "슬리패지 금액이 아주 큽니다. 현재 어떤 작업을 하고 있는지 확인하세요!" - }, "swapLowSlippageError": { "message": "거래가 실패할 수도 있습니다. 최대 슬리패지가 너무 낮습니다." }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 41d25a030..829cd5750 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -1564,9 +1564,6 @@ "swapFinalizing": { "message": "Завершение..." }, - "swapHighSlippageWarning": { - "message": "Величина проскальзывания очень велика. Убедитесь, что вы знаете, что делаете!" - }, "swapLowSlippageError": { "message": "Транзакции могут завершиться неудачей, максимальное проскальзывание слишком мало." }, diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json index fbde2f6b3..fff59abd5 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -1561,9 +1561,6 @@ "swapFinalizing": { "message": "Isinasapinal..." }, - "swapHighSlippageWarning": { - "message": "Sobrang laki ng halaga ng slippage. Tiyaking alam mo ang ginagawa mo!" - }, "swapLowSlippageError": { "message": "Maaaring hindi magtagumpay ang transaksyon, masyadong mababa ang max na slippage." }, diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index e55933c10..128d82374 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -1564,9 +1564,6 @@ "swapFinalizing": { "message": "Đang hoàn tất..." }, - "swapHighSlippageWarning": { - "message": "Số tiền trượt giá rất cao. Hãy chắc chắn rằng bạn hiểu những gì mình đang làm!" - }, "swapLowSlippageError": { "message": "Giao dịch có thể không thành công, mức trượt giá tối đa quá thấp." }, diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 782ff4f29..d8a102716 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -1576,9 +1576,6 @@ "swapFinalizing": { "message": "确定中……" }, - "swapHighSlippageWarning": { - "message": "滑点数量非常大。确保您知道您的操作！" - }, "swapLowSlippageError": { "message": "交易可能失败，最大滑点过低。" }, diff --git a/ui/pages/swaps/index.scss b/ui/pages/swaps/index.scss index 7f1fe894a..1a8f27427 100644 --- a/ui/pages/swaps/index.scss +++ b/ui/pages/swaps/index.scss @@ -29,7 +29,8 @@ align-items: center; height: 100%; width: 100%; - overflow: hidden; + overflow-x: hidden; + overflow-y: scroll; &--scrollable { overflow: auto; @@ -42,7 +43,6 @@ box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08); border-radius: 8px; height: 620px; - overflow: hidden; } }