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

Whats new popup #10583

Merged
merged 48 commits into from
Apr 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
aea1763
Add 'What's New' notification popup
danjm Mar 3, 2021
b1f1fb7
Move selectors from shared/notifications into ui/ directory
danjm Mar 5, 2021
6b3cb87
Use keys for localized message in whats new notifications objects, to…
danjm Mar 8, 2021
df3cadf
Remove unused swaps intro popup locale messages
danjm Mar 8, 2021
67127ba
Fix keys of whats new notification locales
danjm Mar 17, 2021
89173e3
Remove notifications messages and descriptions from comment in shared…
danjm Mar 17, 2021
a7b435e
Move notifcationActionFunctions to shared/notifications and make it s…
danjm Mar 17, 2021
fadcc70
Get notification data from constants instead of state in whats-new-popup
danjm Mar 17, 2021
7611756
Code cleanup
danjm Mar 17, 2021
45779ee
Fix build quote reference to swapsEthToken, broken during rebase
danjm Mar 19, 2021
c83cd71
Rename notificationFilters to notificationToExclude to clarify its pu…
danjm Mar 19, 2021
c317bc8
Documentation for getSortedNotificationsToShow
danjm Mar 19, 2021
42a12c6
Move notification action functions from shared/ to whats-new-popup.js
danjm Mar 23, 2021
e051769
Stop setting swapsWelcomeMessageHasBeenShown to state in app-state co…
danjm Mar 23, 2021
71cb104
Update e2e tests for whats new popup changes
danjm Mar 23, 2021
a5a7bcf
Updating migration files
ryanml Apr 13, 2021
4f3621e
Addressing feedback part 1
ryanml Apr 13, 2021
9bc6bf5
Addressing feedback part 2
ryanml Apr 21, 2021
1bc843d
Remove unnecessary div in whats-new-popup
danjm Apr 23, 2021
b6f68d0
Change getNotificationsToExclude to getNotificationsToInclude for use…
danjm Apr 23, 2021
f8d333d
Delete intro-popup directory and test files
danjm Apr 23, 2021
e611545
Lint fix
danjm Apr 23, 2021
cbcd785
Add notifiction state to address-entry fixture
danjm Apr 23, 2021
1fdee5e
Use two separate functions for rendering first and subsequent notific…
danjm Apr 23, 2021
782d9c9
Ensure that string literals are passed to t for whats new popup text
danjm Apr 23, 2021
e74929e
Update import-ui fixtures to include notificaiton controller state
danjm Apr 23, 2021
1ecbe20
Remove unnecessary, accidental change confirm-approve
danjm Apr 26, 2021
f2e52bf
Remove swaps notification in favour of mobile swaps as first notifcat…
danjm Apr 26, 2021
1d51a8f
Update whats-new-popup to use intersection observer api to detect if …
danjm Apr 26, 2021
d3602fd
Add notifications to send-edit and threebox e2e test fixtures
danjm Apr 26, 2021
70a07ca
Update ui/app/selectors/selectors.js
danjm Apr 27, 2021
85fe17a
Update ui/app/selectors/selectors.js
danjm Apr 27, 2021
a67a807
Clean up locale code for whats-new-popup notifications
danjm Apr 27, 2021
af2e0c6
Disconnect observers in whats-new-popup when their callback is first …
danjm Apr 27, 2021
997588a
Add test case for migration 58 for when the AppStateController does n…
danjm Apr 27, 2021
49c9647
Rename popover components containerRef to popoverWrapRef
danjm Apr 27, 2021
cac9c3e
Fix messages.json
danjm Apr 27, 2021
63128a1
Update notification messages and images
danjm Apr 27, 2021
1cb1827
Rename popoverWrapRef -> popoverRef in whats-new-popup and popover.co…
danjm Apr 27, 2021
233b70e
Only create one observer, and only after images have loaded, in whats…
danjm Apr 28, 2021
e805cf2
Set width and height on whats-new-popup image, instead of setting sta…
danjm Apr 28, 2021
4fbab19
Update ui/app/components/app/whats-new-popup/whats-new-popup.js
danjm Apr 28, 2021
b4849b5
Code clean up in whats new popup re: notification rendering and actio…
danjm Apr 28, 2021
e51ea34
Code cleanup in render notification functions of whats-new-popup
danjm Apr 28, 2021
9ceff95
Update ui/app/components/app/whats-new-popup/whats-new-popup.js
danjm Apr 28, 2021
190fbcb
lint fix
danjm Apr 28, 2021
7b120a4
Update and localize notification dates
danjm Apr 28, 2021
507263b
Clean up date code in shred/notifications/index.js
danjm Apr 28, 2021
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
57 changes: 36 additions & 21 deletions app/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1235,6 +1235,38 @@
"notEnoughGas": {
"message": "Not Enough Gas"
},
"notifications1Description": {
"message": "MetaMask Mobile users can now swap tokens inside their mobile wallet. Scan the QR code to get the mobile app and start swapping.",
"description": "Description of a notification in the 'See What's New' popup. Describes the swapping on mobile feature."
},
"notifications1Title": {
"message": "Swapping on mobile is here!",
"description": "Title for a notification in the 'See What's New' popup. Tells users that they can now use MetaMask Swaps on Mobile."
},
"notifications2ActionText": {
"message": "Start survey",
"description": "The 'call to action' label on the button, or link, of the 'Help improve MetaMask' 'See What's New' notification. Upon clicking, users will be taken to an external page where they can complete a survey."
},
"notifications2Description": {
"message": "Please share your experience in this 5 minute survey.",
"description": "Description of a notification in the 'See What's New' popup. Further clarifies how the users can help: by completing a 5 minute survey about MetaMask."
},
"notifications2Title": {
"message": "Help improve MetaMask",
"description": "Title for a notification in the 'See What's New' popup. Asks users to take action to make MetaMask better."
},
"notifications3ActionText": {
"message": "Read more",
"description": "The 'call to action' on the button, or link, of the 'Stay secure' notification. Upon clicking, users will be taken to a page about security on the metamask support website."
},
"notifications3Description": {
"message": "Stay up to date on MetaMask security best practices and get the latest security tips from official MetaMask support.",
"description": "Description of a notification in the 'See What's New' popup. Describes the information they can get on security from the linked support page."
},
"notifications3Title": {
"message": "Stay secure",
"description": "Title for a notification in the 'See What's New' popup. Encourages users to consider security."
},
"ofTextNofM": {
"message": "of"
},
Expand Down Expand Up @@ -1814,24 +1846,6 @@
"swapHighSlippageWarning": {
"message": "Slippage amount is very high. Make sure you know what you are doing!"
},
"swapIntroLearnMoreHeader": {
"message": "Want to learn more?"
},
"swapIntroLearnMoreLink": {
"message": "Learn more about MetaMask Swaps"
},
"swapIntroLiquiditySourcesLabel": {
"message": "Liquidity sources include:"
},
"swapIntroPopupSubTitle": {
"message": "You can now swap tokens directly in your MetaMask wallet. MetaMask Swaps combines multiple decentralized exchange aggregators, professional market makers, and individual DEXs to ensure MetaMask users always get the best price with the lowest network fees."
},
"swapIntroPopupTitle": {
"message": "Token swapping is here!"
},
"swapLearnMoreContractsAuditReview": {
"message": "Review our official contracts audit"
},
"swapLowSlippageError": {
"message": "Transaction may fail, max slippage too low."
},
Expand Down Expand Up @@ -1958,9 +1972,6 @@
"swapSourceInfo": {
"message": "We search multiple liquidity sources (exchanges, aggregators and professional market makers) to find the best rates and lowest network fees."
},
"swapStartSwapping": {
"message": "Start swapping"
},
"swapSwapFrom": {
"message": "Swap from"
},
Expand Down Expand Up @@ -2310,6 +2321,10 @@
"welcomeBack": {
"message": "Welcome Back!"
},
"whatsNew": {
"message": "What's new",
"description": "This is the title of a popup that gives users notifications about new features and updates to MetaMask."
},
"whatsThis": {
"message": "What's this?"
},
Expand Down
21 changes: 0 additions & 21 deletions app/_locales/es/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1579,24 +1579,6 @@
"swapHighSlippageWarning": {
"message": "La cantidad de deslizamiento es muy alta. ¡Asegúrate de saber lo que estás haciendo!"
},
"swapIntroLearnMoreHeader": {
"message": "¿Quiere aprender más?"
},
"swapIntroLearnMoreLink": {
"message": "Más información sobre los Intercambios MetaMask"
},
"swapIntroLiquiditySourcesLabel": {
"message": "Las fuentes de liquidez incluyen:"
},
"swapIntroPopupSubTitle": {
"message": "Ahora puede intercambiar tokens directamente en su monedero MetaMask. Intercambios MetaMask combina múltiples agregadores de intercambio descentralizados, creadores de mercado profesionales y DEX individuales para garantizar que los usuarios de MetaMask siempre obtengan el mejor precio con las tarifas de red más bajas."
},
"swapIntroPopupTitle": {
"message": "¡El intercambio de tokens está aquí!"
},
"swapLearnMoreContractsAuditReview": {
"message": "Revise nuestra auditoría de contratos oficiales"
},
"swapLowSlippageError": {
"message": "La transacción puede fallar, el deslizamiento máximo es demasiado bajo."
},
Expand Down Expand Up @@ -1717,9 +1699,6 @@
"swapSourceInfo": {
"message": "Buscamos múltiples fuentes de liquidez (exchanges, agregadores y creadores de mercado profesionales) para encontrar las mejores tarifas y las tarifas de red más bajas."
},
"swapStartSwapping": {
"message": "Comenzar intercambio"
},
"swapSwapFrom": {
"message": "Intercambiar desde"
},
Expand Down
21 changes: 0 additions & 21 deletions app/_locales/es_419/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1579,24 +1579,6 @@
"swapHighSlippageWarning": {
"message": "La cantidad de deslizamiento es muy alta. ¡Asegúrate de saber lo que estás haciendo!"
},
"swapIntroLearnMoreHeader": {
"message": "¿Quiere aprender más?"
},
"swapIntroLearnMoreLink": {
"message": "Más información sobre los Intercambios MetaMask"
},
"swapIntroLiquiditySourcesLabel": {
"message": "Las fuentes de liquidez incluyen:"
},
"swapIntroPopupSubTitle": {
"message": "Ahora puede intercambiar tokens directamente en su billetera MetaMask. Intercambios MetaMask combina múltiples agregadores de intercambio descentralizados, creadores de mercado profesionales y DEX individuales para garantizar que los usuarios de MetaMask siempre obtengan el mejor precio con las tarifas de red más bajas."
},
"swapIntroPopupTitle": {
"message": "¡El intercambio de tokens está aquí!"
},
"swapLearnMoreContractsAuditReview": {
"message": "Revise nuestra auditoría de contratos oficiales"
},
"swapLowSlippageError": {
"message": "La transacción puede fallar, el deslizamiento máximo es demasiado bajo."
},
Expand Down Expand Up @@ -1717,9 +1699,6 @@
"swapSourceInfo": {
"message": "Buscamos múltiples fuentes de liquidez (exchanges, agregadores y creadores de mercado profesionales) para encontrar las mejores tarifas y las tarifas de red más bajas."
},
"swapStartSwapping": {
"message": "Comenzar intercambio"
},
"swapSwapFrom": {
"message": "Intercambiar desde"
},
Expand Down
21 changes: 0 additions & 21 deletions app/_locales/hi/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1567,24 +1567,6 @@
"swapHighSlippageWarning": {
"message": "स्लिपेज राशि बहुत अधिक है। सुनिश्चित करें कि आप जानते हैं कि आप क्या कर रहे हैं!"
},
"swapIntroLearnMoreHeader": {
"message": "अधिक सीखना चाहते हैं?"
},
"swapIntroLearnMoreLink": {
"message": "MetaMask स्वैप के बारे में अधिक जानें"
},
"swapIntroLiquiditySourcesLabel": {
"message": "चलनिधि स्रोतों में निम्न शामिल हैं:"
},
"swapIntroPopupSubTitle": {
"message": "अब आप अपने MetaMask वॉलेट में सीधे टोकन स्वैप कर सकते हैं। MetaMask स्वैप कई विकेंद्रीकृत विनिमय एग्रीगेटर, पेशेवर बाजार निर्माताओं और व्यक्तिगत DEX को जोड़ता है, ताकि MetaMask उपयोगकर्ताओं को हमेशा सबसे कम नेटवर्क शुल्क के साथ सबसे अच्छा मूल्य मिल सके।"
},
"swapIntroPopupTitle": {
"message": "टोकन स्वैपिंग यहाँ उपलब्ध है!"
},
"swapLearnMoreContractsAuditReview": {
"message": "हमारे आधिकारिक अनुबंधों के ऑडिट की समीक्षा करें"
},
"swapLowSlippageError": {
"message": "लेनदेन विफल हो सकता है, अधिकतम स्लिपेज बहुत कम हो सकता है।"
},
Expand Down Expand Up @@ -1687,9 +1669,6 @@
"swapSourceInfo": {
"message": "हम सर्वोत्तम दरों और न्यूनतम नेटवर्क शुल्क का पता लगाने के लिए कई चलनिधि स्रोतों (एक्सचेंज, एग्रीगेटर और पेशेवर बाजार निर्माताओं) की खोज करते हैं।"
},
"swapStartSwapping": {
"message": "स्वैप करना शुरू करें"
},
"swapSwapFrom": {
"message": "इससे स्वैप करें"
},
Expand Down
21 changes: 0 additions & 21 deletions app/_locales/id/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1567,24 +1567,6 @@
"swapHighSlippageWarning": {
"message": "Jumlah slippage sangat tinggi. Pastikan Anda mengetahui yang Anda kerjakan!"
},
"swapIntroLearnMoreHeader": {
"message": "Ingin mempelajari selengkapnya?"
},
"swapIntroLearnMoreLink": {
"message": "Pelajari selengkapnya tentang Penukaran MetaMask"
},
"swapIntroLiquiditySourcesLabel": {
"message": "Sumber likuiditas mencakup:"
},
"swapIntroPopupSubTitle": {
"message": "Sekarang, Anda bisa menukar token secara langsung di dompet MetaMask Anda. Penukaran MetaMask menggabungkan beberapa agregator penukaran terdesentralisasi, pembuat pasar profesional, dan DEX individu untuk memastikan pengguna MetaMask selalu mendapatkan harga terbaik dengan biaya jaringan terendah."
},
"swapIntroPopupTitle": {
"message": "Penukaran token ada di sini!"
},
"swapLearnMoreContractsAuditReview": {
"message": "Tinjau audit kontrak resmi kami"
},
"swapLowSlippageError": {
"message": "Transaksi bisa gagal, slippage maks. terlalu rendah."
},
Expand Down Expand Up @@ -1687,9 +1669,6 @@
"swapSourceInfo": {
"message": "Kami mencari beberapa sumber likuiditas (penukaran, agregator, dan pembuat pasar profesional) untuk menemukan tarif terbaik dan biaya jaringan terendah."
},
"swapStartSwapping": {
"message": "Mulai menukar"
},
"swapSwapFrom": {
"message": "Tukar dari"
},
Expand Down
21 changes: 0 additions & 21 deletions app/_locales/it/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1585,24 +1585,6 @@
"swapHighSlippageWarning": {
"message": "L'importo di slippage è molto alto. Assicurati di sapere cosa stai facendo!"
},
"swapIntroLearnMoreHeader": {
"message": "Vuoi sapere di più?"
},
"swapIntroLearnMoreLink": {
"message": "Scopri di più su MetaMask Swaps"
},
"swapIntroLiquiditySourcesLabel": {
"message": "Sorgenti di liquidità incluse:"
},
"swapIntroPopupSubTitle": {
"message": "Adesso puoi scambiare token direttamente dal tuo portafgolio MetaMask. MetaMask Swaps combina vari siti di scambio decentralizzati, aggregatori e market maker professionisti per assicurare che gli utenti di MetaMask ottengano sempre il miglior prezzo con le tasse di rete minori."
},
"swapIntroPopupTitle": {
"message": "Lo scambio di token è qui!"
},
"swapLearnMoreContractsAuditReview": {
"message": "Esamina l'audit ufficiale dei nostri smart contracts"
},
"swapLowSlippageError": {
"message": "La transazione può fallire, il massimo slippage è troppo basso."
},
Expand Down Expand Up @@ -1729,9 +1711,6 @@
"swapSourceInfo": {
"message": "Cerchiamo sorgenti di liquidità multiple (siti di scambio, aggregatori, market maker professionisti) per trovare le tariffe migliori e le tasse di rete minori."
},
"swapStartSwapping": {
"message": "Inizia a scambiare"
},
"swapSwapFrom": {
"message": "Scambia da"
},
Expand Down
21 changes: 0 additions & 21 deletions app/_locales/ja/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1579,24 +1579,6 @@
"swapHighSlippageWarning": {
"message": "非常に大きいスリッページ額です。本当に実行するか確認してください。"
},
"swapIntroLearnMoreHeader": {
"message": "詳細を表示しますか?"
},
"swapIntroLearnMoreLink": {
"message": "MetaMask Swapsの詳細"
},
"swapIntroLiquiditySourcesLabel": {
"message": "流動性ソースには以下が含まれます。"
},
"swapIntroPopupSubTitle": {
"message": "トークンをMetaMaskで直接スワップできるようになりました。MetaMask Swapsは、多数の分散型取引所アグリゲーター、専門のマーケットメーカー、DEX取引所を統合し、ユーザーは常に最低のネットワーク手数料、最適な価格で取引できます。"
},
"swapIntroPopupTitle": {
"message": "トークンのスワップはこちら!"
},
"swapLearnMoreContractsAuditReview": {
"message": "MetaSwapのコントラクト監査のレビュー"
},
"swapLowSlippageError": {
"message": "トランザクションが失敗する可能性があります。最大スリッページが少なすぎます。"
},
Expand Down Expand Up @@ -1717,9 +1699,6 @@
"swapSourceInfo": {
"message": "最良のレートと最小のネットワーク手数料を探すため、複数の流動性ソース(取引所、アグリゲーター、専門のマーケットメーカー)を検索します。"
},
"swapStartSwapping": {
"message": "スワップの開始"
},
"swapSwapFrom": {
"message": "スワップ元"
},
Expand Down
21 changes: 0 additions & 21 deletions app/_locales/ko/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1567,24 +1567,6 @@
"swapHighSlippageWarning": {
"message": "슬리패지 금액이 아주 큽니다. 현재 어떤 작업을 하고 있는지 확인하세요!"
},
"swapIntroLearnMoreHeader": {
"message": "자세한 정보를 확인하고 싶으신가요?"
},
"swapIntroLearnMoreLink": {
"message": "MetaMask Swaps에 대해 자세히 알아보기"
},
"swapIntroLiquiditySourcesLabel": {
"message": "다음을 포함한 유동성 소스:"
},
"swapIntroPopupSubTitle": {
"message": "이제 MetaMask 지갑에서 토큰을 바로 스왑할 수 있습니다. MetaMask Swaps는 다양한 분산형 교환 애그리게이터, 투자전문기관, 개별 DEX를 결합하여 MetaMask 사용자가 언제든 최저 네트워크 요금으로 최상의 가격을 얻을 수 있게 합니다."
},
"swapIntroPopupTitle": {
"message": "토큰 스왑은 여기서 진행됩니다!"
},
"swapLearnMoreContractsAuditReview": {
"message": "당사의 공식 계약 감사 검토"
},
"swapLowSlippageError": {
"message": "거래가 실패할 수도 있습니다. 최대 슬리패지가 너무 낮습니다."
},
Expand Down Expand Up @@ -1687,9 +1669,6 @@
"swapSourceInfo": {
"message": "당사에서는 여러 유동성 소스(교환, 애그리게이터, 투자전문기관)를 검색하여 최상의 요율과 최저 네트워크 요금을 찾습니다."
},
"swapStartSwapping": {
"message": "스왑 시작"
},
"swapSwapFrom": {
"message": "다음에서 스왑"
},
Expand Down
21 changes: 0 additions & 21 deletions app/_locales/ru/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1567,24 +1567,6 @@
"swapHighSlippageWarning": {
"message": "Величина проскальзывания очень велика. Убедитесь, что вы знаете, что делаете!"
},
"swapIntroLearnMoreHeader": {
"message": "Хотите узнать больше?"
},
"swapIntroLearnMoreLink": {
"message": "Подробнее о свопах MetaMask"
},
"swapIntroLiquiditySourcesLabel": {
"message": "Источники ликвидности включают:"
},
"swapIntroPopupSubTitle": {
"message": "Теперь вы можете обменивать токены прямо в кошельке MetaMask. MetaMask Swaps объединяет несколько децентрализованных агрегаторов обменов, профессиональных торговцев и отдельные DEX, чтобы пользователи MetaMask всегда получали лучшую цену с минимальными комиссиями сети."
},
"swapIntroPopupTitle": {
"message": "Обмен токенов здесь!"
},
"swapLearnMoreContractsAuditReview": {
"message": "Ознакомьтесь с нашим официальным аудитом контрактов"
},
"swapLowSlippageError": {
"message": "Транзакции могут завершиться неудачей, максимальное проскальзывание слишком мало."
},
Expand Down Expand Up @@ -1687,9 +1669,6 @@
"swapSourceInfo": {
"message": "Мы ищем несколько источников ликвидности (биржи, агрегаторы и профессиональные продавцы), чтобы найти лучшие цены и самые низкие сетевые комиссии."
},
"swapStartSwapping": {
"message": "Начать обмен"
},
"swapSwapFrom": {
"message": "Своп с"
},
Expand Down
21 changes: 0 additions & 21 deletions app/_locales/tl/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1564,24 +1564,6 @@
"swapHighSlippageWarning": {
"message": "Sobrang laki ng halaga ng slippage. Tiyaking alam mo ang ginagawa mo!"
},
"swapIntroLearnMoreHeader": {
"message": "Gusto mo bang matuto pa?"
},
"swapIntroLearnMoreLink": {
"message": "Matuto pa tungkol sa MetaMask Swaps"
},
"swapIntroLiquiditySourcesLabel": {
"message": "Kasama sa mga pinagkunan ng liquidity ang:"
},
"swapIntroPopupSubTitle": {
"message": "Puwede mo nang direktang i-swap ang mga token sa iyong MetaMask wallet. Pinagsasama-sama ng MetaMask Swaps ang maraming decentralized exchange aggregator, propesyonal na market maker, at indibidwal na DEX para matiyak na makukuha palagi ng mga user ng MetaMask ang pinakasulit na presyo nang may pinakamababang bayarin sa network."
},
"swapIntroPopupTitle": {
"message": "Ito na ang pag-swap ng token!"
},
"swapLearnMoreContractsAuditReview": {
"message": "Suriin ang aming audit ng mga opisyal na kontrata"
},
"swapLowSlippageError": {
"message": "Maaaring hindi magtagumpay ang transaksyon, masyadong mababa ang max na slippage."
},
Expand Down Expand Up @@ -1684,9 +1666,6 @@
"swapSourceInfo": {
"message": "Naghahanap kami ng maraming pinagkukunan ng liquidity (mga exchange, aggregator at propesyonal na market maker) para mahanap ang mga pinakasulit na rate at pinakamababang bayarin sa network."
},
"swapStartSwapping": {
"message": "Simulang mag-swap"
},
"swapSwapFrom": {
"message": "Ipalit mula sa"
},
Expand Down
Loading