Skip to content

Commit

Permalink
Move asset list to home tab on small screens
Browse files Browse the repository at this point in the history
Two tabs have been created on the home screen: 'Assets' and 'History'.
This tabbed view is shown only on small screens (e.g. in the popup).
The fullscreen view is unchanged.

The toggle-able left sidebar no longer exists, so some 'sidebar-left'
specific code and styles have been removed. The button in the menu bar
has been removed as well.

The 'History' title of the transaction history is now redundant when
where are no pending transactions, so it as been conditionally hidden.

A passthrough for `data-testid` has been added to the Tab component for
convenience in e2e tests.
  • Loading branch information
Gudahtt committed Mar 31, 2020
1 parent cb7f81b commit cb61392
Show file tree
Hide file tree
Showing 54 changed files with 93 additions and 314 deletions.
3 changes: 0 additions & 3 deletions app/_locales/am/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -657,9 +657,6 @@
"memo": {
"message": "አጭር ማስታወሻ"
},
"menu": {
"message": "ምናሌ"
},
"message": {
"message": "መልዕክት"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/ar/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -653,9 +653,6 @@
"memo": {
"message": "مذكرة"
},
"menu": {
"message": "القائمة"
},
"message": {
"message": "رسالة"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/bg/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -656,9 +656,6 @@
"memo": {
"message": "бележка"
},
"menu": {
"message": "Меню"
},
"message": {
"message": "Съобщение"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/bn/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -660,9 +660,6 @@
"memo": {
"message": "মেমো"
},
"menu": {
"message": "মেনু"
},
"message": {
"message": "বার্তা"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/ca/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -644,9 +644,6 @@
"memo": {
"message": "notes"
},
"menu": {
"message": "Menú"
},
"message": {
"message": "Missatge"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/de/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -636,9 +636,6 @@
"memo": {
"message": " Memo"
},
"menu": {
"message": "Menü"
},
"message": {
"message": "Nachricht"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/el/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -657,9 +657,6 @@
"memo": {
"message": "σημείωμα"
},
"menu": {
"message": "Μενού"
},
"message": {
"message": "Μήνυμα"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -837,9 +837,6 @@
"memo": {
"message": "memo"
},
"menu": {
"message": "Menu"
},
"message": {
"message": "Message"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/es/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -536,9 +536,6 @@
"mainnet": {
"message": "Red principal de Ethereum (Main Net)"
},
"menu": {
"message": "Menú"
},
"message": {
"message": "Mensaje"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/es_419/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -645,9 +645,6 @@
"memorizePhrase": {
"message": "Memoriza esta frase."
},
"menu": {
"message": "Menú"
},
"message": {
"message": "Mensaje"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/et/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -650,9 +650,6 @@
"memo": {
"message": "teatis"
},
"menu": {
"message": "Menüü"
},
"message": {
"message": "Sõnum"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/fa/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -660,9 +660,6 @@
"memo": {
"message": "یادداشت"
},
"menu": {
"message": "مینو"
},
"message": {
"message": "پیام"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/fi/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -657,9 +657,6 @@
"memo": {
"message": "muistio"
},
"menu": {
"message": "Valikko"
},
"message": {
"message": "Viesti"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/he/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -657,9 +657,6 @@
"memo": {
"message": "תזכיר"
},
"menu": {
"message": "תפריט"
},
"message": {
"message": "הודעה"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/hi/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -657,9 +657,6 @@
"memo": {
"message": "ज्ञापन"
},
"menu": {
"message": "मेनू"
},
"message": {
"message": "संदेश"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/hr/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -653,9 +653,6 @@
"memo": {
"message": "podsjetnik"
},
"menu": {
"message": "Izbornik"
},
"message": {
"message": "Poruka"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/ht/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -389,9 +389,6 @@
"mainnet": {
"message": "Prensipal Ethereum Rezo a"
},
"menu": {
"message": "Opsyon"
},
"message": {
"message": "Mesaje"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/hu/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -653,9 +653,6 @@
"memo": {
"message": "emlékeztető"
},
"menu": {
"message": "Menü"
},
"message": {
"message": "Üzenet"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/it/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -822,9 +822,6 @@
"memo": {
"message": "promemoria"
},
"menu": {
"message": "Menu"
},
"message": {
"message": "Messaggio"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/ja/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,6 @@
"mainnet": {
"message": "Ethereumメインネットワーク"
},
"menu": {
"message": "メニュー"
},
"message": {
"message": "メッセージ"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/kn/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -660,9 +660,6 @@
"memo": {
"message": "ಮೆಮೊ"
},
"menu": {
"message": "ಮೆನು"
},
"message": {
"message": "ಸಂದೇಶ"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/ko/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -654,9 +654,6 @@
"memo": {
"message": "메모"
},
"menu": {
"message": "메뉴"
},
"message": {
"message": "메시지"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/lt/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -660,9 +660,6 @@
"memo": {
"message": "pastaba"
},
"menu": {
"message": "Meniu"
},
"message": {
"message": "Pranešimas"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/lv/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -656,9 +656,6 @@
"memo": {
"message": "atgādinājums"
},
"menu": {
"message": "Izvēlne"
},
"message": {
"message": "Ziņojums"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/no/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -650,9 +650,6 @@
"memo": {
"message": "beskjed"
},
"menu": {
"message": "Meny "
},
"message": {
"message": "Melding "
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/ro/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -647,9 +647,6 @@
"memo": {
"message": "notă"
},
"menu": {
"message": "Meniu"
},
"message": {
"message": "Mesaj"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/ru/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -890,9 +890,6 @@
"memo": {
"message": "Мнемотик"
},
"menu": {
"message": "Меню"
},
"metamaskVersion": {
"message": "Версия MetaMask"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/sl/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -645,9 +645,6 @@
"memo": {
"message": "okrožnica"
},
"menu": {
"message": "Meni"
},
"message": {
"message": "Sporočilo"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/sr/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -651,9 +651,6 @@
"memorizePhrase": {
"message": "Zapamtite ovaj izraz."
},
"menu": {
"message": "Meni"
},
"message": {
"message": "Poruka"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/sv/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -644,9 +644,6 @@
"memorizePhrase": {
"message": "Memorera denna fras."
},
"menu": {
"message": "Meny"
},
"message": {
"message": "Meddelande"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/sw/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -638,9 +638,6 @@
"memorizePhrase": {
"message": "Kariri kirai hiki"
},
"menu": {
"message": "Menyu"
},
"message": {
"message": "Ujumbe"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/uk/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -660,9 +660,6 @@
"memo": {
"message": "нотатка"
},
"menu": {
"message": "Меню"
},
"message": {
"message": "Повідомлення"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/zh_CN/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -648,9 +648,6 @@
"memo": {
"message": "备忘录"
},
"menu": {
"message": "菜单"
},
"message": {
"message": "消息"
},
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/zh_TW/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -654,9 +654,6 @@
"memo": {
"message": "備註"
},
"menu": {
"message": "選單"
},
"message": {
"message": "訊息"
},
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/metamask-responsive-ui.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,10 @@ describe('MetaMask', function () {

it('confirms the transaction', async function () {
await driver.clickElement(By.xpath(`//button[contains(text(), 'Confirm')]`))
await driver.delay(largeDelayMs)
})

it('finds the transaction in the transactions list', async function () {
await driver.clickElement(By.css('[data-testid="home__history-tab"]'))
await driver.wait(async () => {
const confirmedTxes = await driver.findElements(By.css('.transaction-list__completed-transactions .transaction-list-item'))
return confirmedTxes.length === 1
Expand Down
Loading

0 comments on commit cb61392

Please sign in to comment.