fix: requested changes

matter-labs · Jun 27, 2023 · d19bc85 · d19bc85
1 parent 34c4891
commit d19bc85
Show file tree

Hide file tree

Showing 17 changed files with 61 additions and 37 deletions.
diff --git a/components/common/InfoContent.vue b/components/common/InfoContent.vue
@@ -1,8 +1,8 @@
 <template>
-  <div class="w-full rounded-xl bg-white p-3 dark:bg-neutral-900">
-    <div class="flex justify-between">
-      <div class="text-sm text-gray-secondary dark:text-neutral-400">{{ label }}</div>
-      <button v-if="content" class="text-sm font-medium text-primary-400 dark:text-primary-500" @click="copy">
+  <div class="info-content">
+    <div class="info-content-inner">
+      <div class="info-content-label">{{ label }}</div>
+      <button v-if="content" class="info-content-copy-button" @click="copy">
         <template v-if="!copied">
           <DocumentDuplicateIcon class="relative -top-px inline-block h-4 w-4" aria-hidden="true" />
           Copy
@@ -37,4 +37,28 @@ const content = computed(() => props.copyContent || "");
 const { copy, copied } = useCopy(content);
 </script>
 
-<style lang="scss"></style>
+<style lang="scss" scoped>
+.lite.dark {
+  .info-content {
+    .info-content-inner {
+      .info-content-copy-button {
+        @apply text-primary-300;
+      }
+    }
+  }
+}
+.info-content {
+  @apply w-full rounded-xl bg-white p-3 dark:bg-neutral-900;
+
+  .info-content-inner {
+    @apply flex justify-between;
+
+    .info-content-label {
+      @apply text-sm text-gray-secondary dark:text-neutral-400;
+    }
+    .info-content-copy-button {
+      @apply text-sm font-medium text-primary-400 dark:text-primary-500;
+    }
+  }
+}
+</style>
diff --git a/components/header/Header.vue b/components/header/Header.vue
@@ -167,7 +167,7 @@ const networkNav: Navigation[] = reactive([
   .panel-container-desktop {
     @apply relative z-20 mx-auto flex h-full items-center justify-between px-5;
     @media screen and (min-width: 720px) {
-      @apply px-6;
+      @apply grid grid-cols-[216px_1fr_216px] px-6;
     }
     @media screen and (min-width: 1024px) {
       @apply px-9;
@@ -177,13 +177,13 @@ const networkNav: Navigation[] = reactive([
       @apply font-semibold;
     }
     .navigation-container {
-      @apply hidden h-full lg:flex;
+      @apply hidden h-full justify-self-center lg:flex;
       .popover-group {
         @apply flex;
       }
     }
     .right-side-menu {
-      @apply mr-5 hidden lg:block;
+      @apply hidden lg:block;
     }
     .popover-button {
       @apply z-10 -mr-4 p-4 focus:outline-none focus-visible:outline-none lg:hidden;

diff --git a/components/loaders/Connecting.vue b/components/loaders/Connecting.vue
@@ -38,7 +38,7 @@ const title = computed(() => {
   if (walletName.value) {
     return `Logging in with ${walletName.value}`;
   }
-  return "Logging in...";
+  return "Loading...";
 });
 </script>
 

diff --git a/components/sidebar/Sidebar.vue b/components/sidebar/Sidebar.vue
@@ -6,12 +6,12 @@
       <SidebarAccountButton />
       <div class="navbar-links-container">
         <NuxtLink :to="{ name: 'index' }" class="navbar-link">
-          <HomeIcon class="navbar-link-icon" aria-hidden="true" />
-          <span class="navbar-link-label">Home</span>
+          <WalletIcon class="navbar-link-icon" aria-hidden="true" />
+          <span class="navbar-link-label">Assets</span>
         </NuxtLink>
         <NuxtLink :to="{ name: 'payments' }" class="navbar-link">
           <ArrowsRightLeftIcon class="navbar-link-icon" aria-hidden="true" />
-          <span class="navbar-link-label">Payments</span>
+          <span class="navbar-link-label">Transactions</span>
         </NuxtLink>
         <NuxtLink :to="{ name: 'contacts' }" class="navbar-link">
           <UserGroupIcon class="navbar-link-icon" aria-hidden="true" />
@@ -41,7 +41,7 @@
 <script lang="ts" setup>
 import { ref } from "vue";
 
-import { ArrowsRightLeftIcon, ChevronDownIcon, HomeIcon, UserGroupIcon } from "@heroicons/vue/24/outline";
+import { ArrowsRightLeftIcon, ChevronDownIcon, UserGroupIcon, WalletIcon } from "@heroicons/vue/24/outline";
 import { storeToRefs } from "pinia";
 
 import { useNetworkStore } from "@/store/network";

diff --git a/components/transaction/zksync/era/EraTransferSuccessfulModal.vue b/components/transaction/zksync/era/EraTransferSuccessfulModal.vue
@@ -47,7 +47,7 @@
           Make another transaction
         </CommonButtonTopLink>
         <CommonButton as="RouterLink" :to="{ name: 'index' }" class="mx-auto" variant="primary-solid">
-          Go to Home page
+          Go to Assets page
         </CommonButton>
       </TransactionConfirmModalFooter>
     </div>

diff --git a/components/transaction/zksync/era/EraWithdrawalSuccessfulModal.vue b/components/transaction/zksync/era/EraWithdrawalSuccessfulModal.vue
@@ -27,7 +27,7 @@
           Make another transaction
         </CommonButtonTopLink>
         <CommonButton as="RouterLink" :to="{ name: 'index' }" class="mx-auto" variant="primary-solid">
-          Go to Home page
+          Go to Assets page
         </CommonButton>
       </TransactionConfirmModalFooter>
     </div>

diff --git a/components/transaction/zksync/era/deposit/ConfirmTransactionModal.vue b/components/transaction/zksync/era/deposit/ConfirmTransactionModal.vue
@@ -112,7 +112,7 @@
 
       <TransactionConfirmModalFooter>
         <CommonButton as="RouterLink" :to="{ name: 'index' }" class="mx-auto mt-4" variant="primary-solid">
-          Go to Home page
+          Go to Assets page
         </CommonButton>
       </TransactionConfirmModalFooter>
     </div>

diff --git a/components/transaction/zksync/lite/TransactionSuccessfulModal.vue b/components/transaction/zksync/lite/TransactionSuccessfulModal.vue
@@ -25,7 +25,7 @@
           Make another transaction
         </CommonButtonTopLink>
         <CommonButton as="RouterLink" :to="{ name: 'index' }" class="mx-auto" variant="primary-solid">
-          Go to Home page
+          Go to Assets page
         </CommonButton>
       </TransactionConfirmModalFooter>
     </div>

diff --git a/components/transaction/zksync/lite/TransferSuccessfulModal.vue b/components/transaction/zksync/lite/TransferSuccessfulModal.vue
@@ -57,7 +57,7 @@
           Make another transaction
         </CommonButtonTopLink>
         <CommonButton as="RouterLink" :to="{ name: 'index' }" class="mx-auto" variant="primary-solid">
-          Go to Home page
+          Go to Assets page
         </CommonButton>
       </TransactionConfirmModalFooter>
     </div>

diff --git a/components/transaction/zksync/lite/WithdrawSuccessfulModal.vue b/components/transaction/zksync/lite/WithdrawSuccessfulModal.vue
@@ -36,7 +36,7 @@
           Make another transaction
         </CommonButtonTopLink>
         <CommonButton as="RouterLink" :to="{ name: 'index' }" class="mx-auto" variant="primary-solid">
-          Go to Home page
+          Go to Assets page
         </CommonButton>
       </TransactionConfirmModalFooter>
     </div>

diff --git a/components/transaction/zksync/lite/deposit/ConfirmTransactionModal.vue b/components/transaction/zksync/lite/deposit/ConfirmTransactionModal.vue
@@ -112,7 +112,7 @@
 
       <TransactionConfirmModalFooter>
         <CommonButton as="RouterLink" :to="{ name: 'index' }" class="mx-auto mt-4" variant="primary-solid">
-          Go to Home page
+          Go to Assets page
         </CommonButton>
       </TransactionConfirmModalFooter>
     </div>

diff --git a/pages/index.vue b/pages/index.vue
@@ -1,17 +1,17 @@
 <template>
-  <CommonPage title="Home">
+  <CommonPage title="Assets">
     <template #era>
-      <HomeEra />
+      <AssetsEra />
     </template>
     <template #lite>
-      <HomeLite />
+      <AssetsLite />
     </template>
   </CommonPage>
 </template>
 
 <script lang="ts" setup>
-import HomeEra from "@/views/zksync/era/Home.vue";
-import HomeLite from "@/views/zksync/lite/Home.vue";
+import AssetsEra from "@/views/zksync/era/Assets.vue";
+import AssetsLite from "@/views/zksync/lite/Assets.vue";
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/pages/payments/all.vue b/pages/payments/all.vue
@@ -1,18 +1,18 @@
 <template>
-  <BackButton :fallback="{ name: 'payments' }" />
-  <CommonPage title="All payments">
+  <BackButton :fallback="{ name: 'transactions' }" />
+  <CommonPage title="All transactions">
     <template #era>
-      <AllPaymentsEra />
+      <AllTransactionsEra />
     </template>
     <template #lite>
-      <AllPaymentsLite />
+      <AllTransactionsLite />
     </template>
   </CommonPage>
 </template>
 
 <script lang="ts" setup>
-import AllPaymentsEra from "@/views/zksync/era/payments/All.vue";
-import AllPaymentsLite from "@/views/zksync/lite/payments/All.vue";
+import AllTransactionsEra from "@/views/zksync/era/transactions/All.vue";
+import AllTransactionsLite from "@/views/zksync/lite/transactions/All.vue";
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/pages/payments/index.vue b/pages/payments/index.vue
@@ -1,17 +1,17 @@
 <template>
-  <CommonPage title="Payments">
+  <CommonPage title="Transactions">
     <template #era>
-      <PaymentsEra />
+      <TransactionsEra />
     </template>
     <template #lite>
-      <PaymentsLite />
+      <TransactionsLite />
     </template>
   </CommonPage>
 </template>
 
 <script lang="ts" setup>
-import PaymentsEra from "@/views/zksync/era/payments/Index.vue";
-import PaymentsLite from "@/views/zksync/lite/payments/Index.vue";
+import TransactionsEra from "@/views/zksync/era/payments/Index.vue";
+import TransactionsLite from "@/views/zksync/lite/payments/Index.vue";
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/tests/e2e/features/withdraw.feature b/tests/e2e/features/withdraw.feature
@@ -16,7 +16,7 @@ Feature: Withdraw
     #second part - id1434
 #    Then Element with "xpath" "//*[@class='modal-card']//a[@href='/']" should be "clickable"
 #    When I click by "xpath" with "//*[@class='modal-card']//a[@href='/']" value
-#    Then Element with "xpath" "//h1[text()='Home']" should be "visible"
+#    Then Element with "xpath" "//h1[text()='Assets']" should be "visible"
 
   @id1274
   Scenario: Withdraw - Send - [Transaction] 0 funds

diff --git a/views/zksync/era/Home.vue → views/zksync/era/Assets.vue b/views/zksync/era/Home.vue → views/zksync/era/Assets.vue
diff --git a/views/zksync/lite/Home.vue → views/zksync/lite/Assets.vue b/views/zksync/lite/Home.vue → views/zksync/lite/Assets.vue