Merge branch 'develop' into fix/ddw-615-fix-automated-tests-setup

input-output-hk · Jun 12, 2021 · 0784d5b · 0784d5b
2 parents 4db007f + 72e087b
commit 0784d5b
Show file tree

Hide file tree

Showing 35 changed files with 1,468 additions and 1,316 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ Changelog
 
 ### Fixes
 
+- Fixed incorrect global instances in scss files ([PR 2593](https://github.com/input-output-hk/daedalus/pull/2593))
 - Fixed "shelley-qa" network issue on "Delegation" wizard ([PR 2595](https://github.com/input-output-hk/daedalus/pull/2595))
 - Fixed Trezor transaction native tokens grouping issue ([PR 2594](https://github.com/input-output-hk/daedalus/pull/2594))
 - Fixed notes field visibility for software wallets on Share Wallet Address dialog ([PR 2582](https://github.com/input-output-hk/daedalus/pull/2582))

diff --git a/source/renderer/app/components/appUpdate/AppUpdateOverlay.scss b/source/renderer/app/components/appUpdate/AppUpdateOverlay.scss
@@ -27,6 +27,7 @@
     padding: 12px 20px;
     width: 608px;
     word-break: break-word;
+
     &::-webkit-scrollbar-thumb {
       background-color: var(
         --theme-news-overlay-update-content-scroll-background-color
@@ -106,6 +107,7 @@
     line-height: 1.38;
     margin-bottom: 16px;
     text-align: center;
+
     b {
       color: var(--theme-app-update-overlay-text-color);
     }
@@ -118,30 +120,37 @@
   .actions {
     text-align: center;
     width: 540px;
+
     .checkbox {
       margin-bottom: 30px;
+
       &.disabled {
         opacity: 0.4;
       }
+
       :global {
         .SimpleCheckbox_check {
           border: 2px solid var(--theme-news-overlay-update-button-text-color);
         }
+
         .SimpleCheckbox_checked {
           background: var(--theme-news-overlay-update-button-text-color);
           border: none;
+
           &:after {
             border-color: var(--theme-news-overlay-update-background-color);
             margin: -3px 0 0;
           }
         }
+
         .SimpleCheckbox_label {
           color: var(--theme-app-update-overlay-text-color);
           font-family: var(--font-regular);
           text-align: left;
         }
       }
     }
+
     .button {
       background-color: var(
         --theme-news-overlay-update-button-background-color
@@ -151,49 +160,59 @@
       cursor: pointer;
       display: block;
       margin: 0 auto 20px;
+
       &:not(.disabled):hover {
         background-color: var(--theme-news-overlay-update-button-text-color);
         color: var(--theme-news-overlay-update-button-hover-text-color);
+
         .externalLinkIcon {
           svg path {
             stroke: var(--theme-news-overlay-update-button-hover-text-color);
           }
         }
       }
+
       &.disabled {
         cursor: default;
         opacity: 0.4;
         text-decoration: none;
       }
+
       .externalLinkIcon {
         @include link(--theme-news-overlay-update-button-text-color);
         border-bottom: none;
         margin-right: 10px;
         vertical-align: baseline;
         width: 15px;
+
         svg {
           margin-left: 0;
           vertical-align: sub;
           width: 15px;
+
           g {
             stroke-width: 2px;
           }
         }
       }
     }
+
     .postponeLink {
       border-bottom-color: var(--theme-app-update-overlay-text-color);
       color: var(--theme-app-update-overlay-text-color);
+
       &.disabled {
         border-bottom-color: transparent;
         cursor: default;
         opacity: 0.4;
       }
+
       &.noLink {
         border-bottom-color: transparent;
         cursor: default;
       }
     }
+
     :global {
       .SimpleLoadingSpinner_root {
         border-color: var(--theme-news-overlay-update-button-text-color)
@@ -220,6 +239,7 @@
     top: 10px;
     width: 44px;
     z-index: 999;
+
     &:hover {
       background-color: var(
         --theme-news-overlay-update-content-background-color

diff --git a/source/renderer/app/components/assets/Asset.js b/source/renderer/app/components/assets/Asset.js
@@ -404,9 +404,9 @@ export default class Asset extends Component<Props, State> {
       : this.renderPillPopOverContainer();
     const settingsContent = this.renderSettingsContent();
 
-    const componenClassnames = classnames([styles.component, className]);
+    const componentClassnames = classnames([styles.component, className]);
     return (
-      <div className={componenClassnames}>
+      <div className={componentClassnames}>
         {content}
         {settingsContent}
       </div>

diff --git a/source/renderer/app/components/assets/Asset.scss b/source/renderer/app/components/assets/Asset.scss
@@ -1,20 +1,20 @@
 .component {
   display: inline-flex;
   width: 100%;
-}
 
-.popOverContainer {
-  display: inline-flex;
-  min-width: 0;
-  text-transform: initial;
-
-  > span {
+  .popOverContainer {
+    display: inline-flex;
     min-width: 0;
-  }
+    text-transform: initial;
 
-  :global {
-    [data-tippy-root] {
-      pointer-events: all !important;
+    > span {
+      min-width: 0;
+    }
+
+    :global {
+      [data-tippy-root] {
+        pointer-events: all !important;
+      }
     }
   }
 }

diff --git a/source/renderer/app/components/loading/syncing-connecting/SyncingConnecting.scss b/source/renderer/app/components/loading/syncing-connecting/SyncingConnecting.scss
@@ -12,6 +12,20 @@
     width: 100%;
     z-index: 2000;
   }
+
+  :global {
+    .connectingScreen {
+      span svg path {
+        stroke: var(--theme-news-feed-icon-color-connecting-screen);
+      }
+    }
+
+    .syncingScreen {
+      span svg path {
+        stroke: var(--theme-news-feed-icon-color-syncing-screen);
+      }
+    }
+  }
 }
 
 .component,

diff --git a/source/renderer/app/components/navigation/NavDropdown.scss b/source/renderer/app/components/navigation/NavDropdown.scss
@@ -41,6 +41,7 @@
     .NavButton_component {
       cursor: default;
     }
+
     .SimpleBubble_root:not(.SimpleBubble_transparent) {
       .SimpleBubble_bubble {
         border: none;
@@ -79,10 +80,12 @@
         }
       }
     }
+
     .OptionsOverrides_options {
       margin-top: 0;
     }
   }
+
   &:hover {
     :global {
       .NavButton_normal .NavButton_container {

diff --git a/source/renderer/app/components/notifications/Notification.scss b/source/renderer/app/components/notifications/Notification.scss
@@ -30,80 +30,87 @@
       color: var(--rp-tooltip-text-color);
     }
   }
-}
 
-.clickToClose {
-  cursor: pointer;
-  &:hover {
-    .closeButton {
-      opacity: 0.8;
+  &.clickToClose {
+    cursor: pointer;
+
+    &:hover {
+      .closeButton {
+        opacity: 0.8;
+      }
     }
   }
-}
 
-.icon {
-  display: inline-block;
-  margin-right: 10px;
-  vertical-align: top;
-  & > svg {
-    height: 44px;
-    width: 44px;
-    g {
-      path:nth-child(2) {
-        fill: var(--theme-notification-message-checkmark-icon-color);
+  .icon {
+    display: inline-block;
+    margin-right: 10px;
+    vertical-align: top;
+
+    & > svg {
+      height: 44px;
+      width: 44px;
+
+      g {
+        path:nth-child(2) {
+          fill: var(--theme-notification-message-checkmark-icon-color);
+        }
       }
     }
-  }
-}
 
-.message {
-  color: var(--theme-notification-message-text-color);
-  display: inline-block;
-  font-family: var(--font-regular);
-  font-size: 16px;
-  font-weight: 500;
-  letter-spacing: normal;
-  line-height: 45px;
-}
+    .spinnerIcon {
+      flex-shrink: 0;
+      height: 22px;
+      margin-top: 10px;
+      width: 22px;
 
-.closeButton {
-  cursor: pointer;
-  opacity: 0.5;
-  position: absolute;
-  right: 20px;
-  top: 25.5px;
-  &:hover {
-    opacity: 0.8;
-  }
+      & > svg {
+        height: inherit;
+        width: inherit;
+
+        path {
+          fill: var(--theme-notification-message-text-color);
+        }
+      }
+    }
 
-  svg {
-    height: 11px;
-    width: 11px;
-    polygon {
-      fill: var(--theme-notification-message-close-icon-color);
+    .spinnerIcon :global {
+      animation: loading-spin 1.5s linear;
+      animation-iteration-count: infinite;
     }
   }
-}
 
-.spinnerIcon {
-  flex-shrink: 0;
-  height: 22px;
-  margin-top: 10px;
-  width: 22px;
-  & > svg {
-    height: inherit;
-    width: inherit;
-    path {
-      fill: var(--theme-notification-message-text-color);
+  .message {
+    color: var(--theme-notification-message-text-color);
+    display: inline-block;
+    font-family: var(--font-regular);
+    font-size: 16px;
+    font-weight: 500;
+    letter-spacing: normal;
+    line-height: 45px;
+
+    &.hasEllipsis {
+      @include animated-ellipsis($width: 16px);
     }
   }
-}
 
-.spinnerIcon :global {
-  animation: loading-spin 1.5s linear;
-  animation-iteration-count: infinite;
-}
+  .closeButton {
+    cursor: pointer;
+    opacity: 0.5;
+    position: absolute;
+    right: 20px;
+    top: 25.5px;
 
-.hasEllipsis {
-  @include animated-ellipsis($width: 16px);
+    &:hover {
+      opacity: 0.8;
+    }
+
+    svg {
+      height: 11px;
+      width: 11px;
+
+      polygon {
+        fill: var(--theme-notification-message-close-icon-color);
+      }
+    }
+  }
 }