Merge branch 'develop' into feature/ddw-452-show-ada-amounts-in-other…

…-currencies

CHANGELOG.md

@@ -8,8 +8,15 @@ Changelog
 - Improve Mnemonic Phrase Input UX [PR 2280](https://github.com/input-output-hk/daedalus/pull/2280)
 - Added wallet public key viewing feature ([PR 2271](https://github.com/input-output-hk/daedalus/pull/2271))
 
+### Fixes
+
+- Fixed Ledger TXs to Byron addresses ([PR 2299](https://github.com/input-output-hk/daedalus/pull/2299))
+
 ### Chores
 
+- Improved "Settings" screen scrolling actions ([PR 2302](https://github.com/input-output-hk/daedalus/pull/2302))
+- Improved scrollable dialogs ([PR 2285](https://github.com/input-output-hk/daedalus/pull/2285))
+- Disabled and hid copy and paste context menu items on some scenarios ([PR 2300](https://github.com/input-output-hk/daedalus/pull/2300))
 - Applied validation to spending password to be not longer than 255 characters ([PR 2287](https://github.com/input-output-hk/daedalus/pull/2287))
 - Update `axios` package ([PR 2291](https://github.com/input-output-hk/daedalus/pull/2291))
 

source/common/types/hardware-wallets.types.js

@@ -109,9 +109,9 @@ export type StakingBlockchainPointer = {|
 
 export type LedgerSignTransactionInputsType = Array<LedgerSignTransactionInputType>;
 
-export type LedgerSignTransactionOutputsType = Array<
-  LedgerOutputTypeAddress | LedgerOutputTypeChange
->;
+export type LedgerSignTransactionOutputsType =
+  | []
+  | Array<LedgerOutputTypeAddress | LedgerOutputTypeChange>;
 
 export type TrezorSignTransactionInputType = {
   path: string,

source/main/windows/main.js

@@ -84,10 +84,22 @@ export const createMainWindow = (locale: string) => {
   window.setTitle(getWindowTitle(locale));
 
   window.webContents.on('context-menu', (e, props) => {
-    const contextMenuOptions = [
-      { label: 'Copy', accelerator: 'CmdOrCtrl+C', role: 'copy' },
-      { label: 'Paste', accelerator: 'CmdOrCtrl+V', role: 'paste' },
-    ];
+    const { canCopy, canPaste } = props.editFlags;
+    const contextMenuOptions = [];
+    if (canCopy && props.selectionText) {
+      contextMenuOptions.push({
+        label: 'Copy',
+        accelerator: 'CmdOrCtrl+C',
+        role: 'copy',
+      });
+    }
+    if (canPaste) {
+      contextMenuOptions.push({
+        label: 'Paste',
+        accelerator: 'CmdOrCtrl+V',
+        role: 'paste',
+      });
+    }
 
     if (isDev || isTest) {
       const { x, y } = props;
@@ -99,7 +111,9 @@ export const createMainWindow = (locale: string) => {
       });
     }
 
-    Menu.buildFromTemplate(contextMenuOptions).popup(window);
+    if (contextMenuOptions.length) {
+      Menu.buildFromTemplate(contextMenuOptions).popup(window);
+    }
   });
 
   window.webContents.on('did-frame-finish-load', () => {

source/renderer/app/api/addresses/requests/inspectAddress.js

@@ -1,11 +1,12 @@
 // @flow
 import { request } from '../../utils/request';
 import type { RequestConfig } from '../../common/types';
+import type { InspectAddressResponse } from '../types';
 
 export const inspectAddress = (
   config: RequestConfig,
   { addressId }: any // @TODO
-): Promise<any> =>
+): Promise<InspectAddressResponse> =>
   request(
     {
       method: 'GET',

source/renderer/app/api/addresses/types.js

@@ -1,6 +1,10 @@
 // @flow
 export type AddressState = 'used' | 'unused';
 
+export type AddressStyle = 'Byron' | 'Shelley' | 'Icarus';
+
+export type StakeReference = 'none' | 'by value' | 'by pointer';
+
 export type GetAddressesRequestQueryParams = {
   state: AddressState,
 };
@@ -19,6 +23,22 @@ export type GetAddressesRequest = {
   isHardwareWallet?: boolean,
 };
 
+export type InspectAddressResponse = {
+  address_style: AddressStyle,
+  stake_reference: StakeReference,
+  network_tag?: number,
+  spending_key_hash?: string,
+  stake_key_hash?: string,
+  script_hash?: string,
+  pointer?: {
+    slot_num: number,
+    transaction_index: number,
+    output_index: number,
+  },
+  address_root?: string,
+  derivation_path?: string,
+};
+
 // Byron related types
 
 export type CreateByronWalletAddressRequest = {

source/renderer/app/api/api.js

@@ -113,6 +113,7 @@ import type {
   Address,
   GetAddressesRequest,
   CreateByronWalletAddressRequest,
+  InspectAddressResponse,
 } from './addresses/types';
 
 // Common Types
@@ -1004,9 +1005,9 @@ export default class AdaApi {
     }
   };
 
-  inspectAddress = async (
-    request: any // @TODO
-  ): Promise<any> => {
+  inspectAddress = async (request: {
+    addressId: string,
+  }): Promise<InspectAddressResponse> => {
     logger.debug('AdaApi::inspectAddress called', {
       parameters: filterLogData(request),
     });

source/renderer/app/components/layout/SidebarLayout.scss

@@ -33,10 +33,6 @@
   overflow-x: hidden;
   overflow-y: overlay;
   position: relative;
-  &::-webkit-scrollbar-button {
-    display: block;
-    height: 7px;
-  }
 }
 
 .content {

source/renderer/app/components/layout/VerticalFlexContainer.scss

@@ -4,9 +4,4 @@
   height: 100%;
   overflow-y: overlay;
   position: relative;
-
-  &::-webkit-scrollbar-button {
-    display: block;
-    height: 7px;
-  }
 }

source/renderer/app/components/news/NewsFeed.scss

@@ -111,6 +111,10 @@
       }
     }
 
+    *::-webkit-scrollbar-button {
+      display: none;
+    }
+
     *::-webkit-scrollbar-track {
       margin-bottom: 11px;
       margin-top: 25px;
@@ -122,6 +126,7 @@
           --theme-splash-network-scrollbar-thumb-background
         );
         min-height: 150px;
+
         &:hover {
           background-color: var(
             --theme-splash-network-scrollbar-thumb-background-hover

source/renderer/app/components/profile/terms-of-use/TermsOfUseForm.scss

@@ -6,10 +6,6 @@
   overflow-x: hidden;
   overflow-y: overlay;
   padding: 20px;
-  &::-webkit-scrollbar-button {
-    display: block;
-    height: 7px;
-  }
 }
 
 .centeredBox {

source/renderer/app/components/settings/SettingsLayout.js

@@ -7,10 +7,29 @@ import styles from './SettingsLayout.scss';
 type Props = {
   children: Node,
   menu: Node,
+  activePage: string,
 };
 
 @observer
 export default class SettingsLayout extends Component<Props> {
+  scrollableDomElement: ?HTMLElement = null;
+
+  componentDidMount() {
+    this.scrollableDomElement = document.querySelector(
+      '.SettingsLayout_settingsPaneWrapper'
+    );
+  }
+
+  componentDidUpdate(prevProps: Props) {
+    const didActivePageChange = this.props.activePage !== prevProps.activePage;
+    if (
+      this.scrollableDomElement instanceof HTMLElement &&
+      didActivePageChange
+    ) {
+      this.scrollableDomElement.scrollTop = 0;
+    }
+  }
+
   render() {
     const { menu, children } = this.props;
     return (

source/renderer/app/components/settings/SettingsLayout.scss

@@ -12,10 +12,6 @@
   overflow-x: hidden;
   overflow-y: overlay;
   padding: 20px 20px 20px 0;
-  &::-webkit-scrollbar-button {
-    display: block;
-    height: 7px;
-  }
 }
 
 .settingsPane {

source/renderer/app/components/staking/delegation-setup-wizard/DelegationStepsChooseStakePoolDialog.js

@@ -326,7 +326,7 @@ export default class DelegationStepsChooseStakePoolDialog extends Component<
         backButton={<DialogBackButton onBack={onBack} />}
       >
         <BackToTopButton
-          scrollableElementClassName="Dialog_content"
+          scrollableElementClassName="Dialog_contentWrapper"
           buttonTopPosition={100}
           scrollTopToActivate={100}
         />

source/renderer/app/components/staking/delegation-setup-wizard/DelegationStepsChooseStakePoolDialog.scss

@@ -10,14 +10,6 @@
     .Dialog_subtitle {
       color: var(--theme-delegation-steps-choose-wallet-steps-indicator-color);
     }
-
-    .Dialog_content {
-      padding: 0 25px 4px 4px;
-    }
-
-    .Dialog_actions button {
-      margin-top: 10px !important;
-    }
   }
 
   .stakePoolsListWrapper {
@@ -26,7 +18,6 @@
 
   .content {
     color: var(--theme-delegation-steps-choose-stake-pool-title-color);
-    margin-bottom: 20px;
 
     .description {
       font-family: var(--font-medium);

source/renderer/app/components/staking/delegation-setup-wizard/DelegationStepsIntroDialog.scss

@@ -2,8 +2,14 @@
 @import '../../../themes/mixins/link';
 
 .delegationStepsIntroDialogWrapper {
+  :global {
+    .Dialog_title {
+      margin-bottom: 20px;
+    }
+  }
   .content {
     color: var(--theme-delegation-steps-intro-content-text-color);
+    margin-top: 0;
 
     .link {
       font-size: 16px;

source/renderer/app/components/staking/rewards/StakingRewardsForIncentivizedTestnet.scss

@@ -78,7 +78,7 @@
     font-family: var(--font-regular);
     font-size: 14px;
     line-height: 1.43;
-    padding: 10px 20px;
+    padding: 10px 20px 0;
 
     p {
       margin-bottom: 3px;

source/renderer/app/components/status/DaedalusDiagnostics.scss

@@ -57,6 +57,11 @@
 
 .table {
   width: calc(50% - 15px);
+
+  &:nth-child(2) {
+    margin-bottom: 30px;
+  }
+
   @media (max-width: 1000px) {
     width: 100%;
 
@@ -65,12 +70,6 @@
     }
   }
 
-  @media (max-height: 800px) {
-    &:nth-child(2) {
-      margin-bottom: 70px;
-    }
-  }
-
   .layoutRow {
     display: flex;
     justify-content: space-between;

source/renderer/app/components/wallet/receive/VirtualAddressesList.scss

@@ -3,6 +3,10 @@
   width: 100%;
   width: -webkit-calc(100% + 20px);
 
+  *::-webkit-scrollbar-button {
+    display: none;
+  }
+
   :global(.ReactVirtualized__Grid__innerScrollContainer) {
     overflow: visible !important;
   }
@@ -12,6 +16,7 @@
   overflow-x: hidden !important;
   padding-right: 2px;
   will-change: none !important;
+
   &:focus {
     outline: 0;
   }

source/renderer/app/components/wallet/receive/WalletReceiveRandom.scss

@@ -7,10 +7,7 @@
   overflow-x: hidden;
   overflow-y: overlay;
   padding: 20px;
-  &::-webkit-scrollbar-button {
-    display: block;
-    height: 7px;
-  }
+
   @media (max-width: 1000px) {
     min-height: 600px;
   }

source/renderer/app/components/wallet/receive/WalletReceiveSequential.scss

@@ -9,10 +9,7 @@
   overflow-x: hidden;
   overflow-y: overlay;
   padding: 20px;
-  &::-webkit-scrollbar-button {
-    display: block;
-    height: 7px;
-  }
+
   @media (max-width: 1000px) {
     min-height: 600px;
   }

source/renderer/app/components/wallet/settings/ChangeSpendingPasswordDialog.scss

@@ -4,14 +4,6 @@
 .dialog {
   font-family: var(--font-light);
 
-  :global .Dialog_title {
-    margin-bottom: 0;
-  }
-
-  :global .Dialog_content {
-    padding-top: 25px;
-  }
-
   .spendingPasswordFields {
     transition: all 400ms ease;
 
@@ -30,13 +22,14 @@
 
     .spendingPasswordField {
       display: flex;
+      position: relative;
 
       > span {
         height: 12px;
         left: 145px;
         outline: none;
         position: absolute;
-        top: 54px;
+        top: 4px;
         width: 12px;
       }
 

source/renderer/app/components/wallet/transactions/WalletTransactionsList.scss

@@ -67,5 +67,5 @@
 
 .showMoreTransactionsButton {
   display: block !important;
-  margin: 30px auto;
+  margin: 30px auto 20px;
 }