[DDW-500] Fix defects

input-output-hk · Feb 24, 2021 · fa5569a · fa5569a
1 parent 081fb10
commit fa5569a
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 27 deletions.
diff --git a/source/renderer/app/components/wallet/WalletAssetsSendForm.scss b/source/renderer/app/components/wallet/WalletAssetsSendForm.scss
@@ -152,6 +152,7 @@
     line-height: 1.36;
     position: absolute;
     right: 18px;
+    top: 2px;
   }
 
   input {
@@ -347,6 +348,7 @@
   left: 95px;
   letter-spacing: 0.5px;
   line-height: 1.2;
+  position: absolute;
   text-transform: uppercase;
   top: 2px;
   width: 61.5px;
@@ -368,7 +370,12 @@
   justify-content: center;
 
   button {
-    margin: 0 10px;
+    margin: 0;
+    width: 280px;
+
+    & + button {
+      margin-left: 20px;
+    }
   }
 }
 

diff --git a/source/renderer/app/components/wallet/summary/WalletSummary.js b/source/renderer/app/components/wallet/summary/WalletSummary.js
@@ -52,6 +52,8 @@ export default class WalletSummary extends Component<Props> {
       onExternalLinkClick,
     } = this.props;
 
+    const { isRestoring } = wallet;
+
     const hasCurrency =
       currencyIsActive &&
       currencyIsAvailable &&
@@ -83,20 +85,24 @@ export default class WalletSummary extends Component<Props> {
             )
           }
         />
-        {hasAssets ? (
-          <WalletSummaryAssets
-            wallet={wallet}
-            assets={assets}
-            onOpenAssetSend={onOpenAssetSend}
-            isLoadingAssets={isLoadingAssets}
-            onCopyAssetItem={onCopyAssetItem}
-          />
-        ) : (
-          <WalletSummaryNoTokens
-            numberOfAssets={assets.length}
-            isLoadingAssets={isLoadingAssets}
-            onExternalLinkClick={onExternalLinkClick}
-          />
+        {!isRestoring && (
+          <>
+            {hasAssets ? (
+              <WalletSummaryAssets
+                wallet={wallet}
+                assets={assets}
+                onOpenAssetSend={onOpenAssetSend}
+                isLoadingAssets={isLoadingAssets}
+                onCopyAssetItem={onCopyAssetItem}
+              />
+            ) : (
+              <WalletSummaryNoTokens
+                numberOfAssets={assets.length}
+                isLoadingAssets={isLoadingAssets}
+                onExternalLinkClick={onExternalLinkClick}
+              />
+            )}
+          </>
         )}
       </>
     );

diff --git a/source/renderer/app/components/wallet/summary/WalletSummaryAssets.scss b/source/renderer/app/components/wallet/summary/WalletSummaryAssets.scss
@@ -32,7 +32,7 @@
     display: flex;
     justify-content: space-between;
     margin: 10px;
-    padding: 14px 30px 14px 20px;
+    padding: 14px 20px 14px;
     width: calc(50% - 20px);
 
     .assetsLeftContainer {

diff --git a/source/renderer/app/components/wallet/summary/WalletSummaryCurrency.scss b/source/renderer/app/components/wallet/summary/WalletSummaryCurrency.scss
@@ -22,17 +22,17 @@
   font-style: normal;
   letter-spacing: normal;
   line-height: 1.67;
-  margin: 3px 0 9px;
+  margin: 8px 0 6px;
   opacity: 0.7;
   text-align: right;
 }
 
 .currencyWalletAmount {
   color: var(--theme-bordered-box-text-color);
   font-family: var(--font-bold);
-  font-size: 22px;
+  font-size: 16px;
   line-height: 1;
-  margin: 0 0 11px;
+  margin: 0 0 6px;
   user-select: text;
   word-break: break-all;
 

diff --git a/source/renderer/app/components/wallet/summary/WalletSummaryNoTokens.scss b/source/renderer/app/components/wallet/summary/WalletSummaryNoTokens.scss
@@ -10,7 +10,7 @@
 }
 
 .component {
-  padding: 20px;
+  padding: 20px 20px;
 
   .noTokensContainer {
     align-items: center;

diff --git a/source/renderer/app/components/wallet/transactions/Transaction.scss b/source/renderer/app/components/wallet/transactions/Transaction.scss
@@ -133,8 +133,8 @@
 
 .content {
   border-bottom: 1px solid var(--theme-dialog-border-color);
-  margin-left: 74px;
-  margin-right: 10px;
+  margin-left: 84px;
+  margin-right: 20px;
 }
 
 .contentExpanded {
@@ -250,7 +250,7 @@
 
 .detailsExpanded {
   max-height: 100%;
-  padding: 10px 10px 0;
+  padding: 10px 0 0;
 
   > div {
     width: 100%;

diff --git a/source/renderer/app/components/wallet/transactions/WalletNoTransactions.scss b/source/renderer/app/components/wallet/transactions/WalletNoTransactions.scss
@@ -3,6 +3,7 @@
   display: flex;
   height: 100%;
   justify-content: center;
+  margin-top: -20px;
 }
 
 .label {

diff --git a/source/renderer/app/components/widgets/AssetToken.scss b/source/renderer/app/components/widgets/AssetToken.scss
@@ -46,11 +46,10 @@
   align-items: center;
   display: flex;
   flex-direction: column;
-  padding: 7px 0;
+  padding: 9px 3px;
   user-select: text;
   .fingerprint {
     cursor: pointer;
-    margin-bottom: 10px;
     position: relative;
     .copyIcon {
       position: absolute;
@@ -73,7 +72,6 @@
     font-size: 12px;
     font-weight: 500;
     line-height: 1.33;
-    margin-bottom: 10px;
     text-align: right;
     white-space: nowrap;
     width: 67px;
@@ -84,7 +82,7 @@
     font-family: var(--font-light);
     font-size: 12px;
     line-height: 1.33;
-    margin: 0 0 10px 10px;
+    margin: 10px 0 0 10px;
     width: calc(100% - 87px);
     em {
       &:not(.singleline) {