resolving conflicts

.gitignore

@@ -129,5 +129,8 @@ yalc.lock
 
 # Typescript
 *.scss.d.ts
-/source/renderer/react-polymorph/**/*.js
-/source/renderer/react-polymorph/**/*.jsx
+/source/**/*.js
+/source/**/*.jsx
+/source/**/*.js.map
+!/source/main/webpack.config.js
+!/source/renderer/webpack.config.js

installers/common/MacInstaller.hs

@@ -216,6 +216,8 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
     externalYarn :: [FilePath]
     externalYarn =
       [ "@babel"
+      , "@emurgo/cardano-serialization-lib-nodejs"
+      , "@fivebinaries/coin-selection"
       , "@noble"
       , "@protobufjs"
       , "@trezor"
@@ -308,6 +310,7 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
       , "tiny-secp256k1"
       , "tslib"
       , "typeforce"
+      , "ua-parser-js"
       , "unicode-properties"
       , "unicode-trie"
       , "usb-detection"

nix/internal/x86_64-linux.nix

@@ -139,7 +139,7 @@ in rec {
       ln -sv $out/share/daedalus/renderer/assets $out/share/fonts/daedalus
 
       mkdir -pv $out/share/daedalus/node_modules
-      cp -r node_modules/{\@babel,\@noble,\@protobufjs,regenerator-runtime,node-fetch,\@trezor,\@fivebinaries\/coin-selection,ua-parser-js,randombytes,safe-buffer,bip66,pushdata-bitcoin,bitcoin-ops,typeforce,varuint-bitcoin,create-hash,blake2b,blakejs,nanoassert,blake2b-wasm,bs58check,bs58,base-x,create-hmac,wif,ms,semver-compare,long,define-properties,object-keys,has,function-bind,es-abstract,has-symbols,json-stable-stringify,cashaddrjs,big-integer,inherits,bchaddrjs,cross-fetch,js-chain-libs-node,bignumber.js,call-bind,get-intrinsic,base64-js,ieee754,util-deprecate,bech32,blake-hash,tiny-secp256k1,bn.js,elliptic,minimalistic-assert,minimalistic-crypto-utils,brorand,hash.js,hmac-drbg,int64-buffer,object.values,protobufjs,usb-detection,babel-runtime,bindings,brotli,clone,deep-equal,dfa,eventemitter2,file-uri-to-path,fontkit,functions-have-names,has-property-descriptors,has-tostringtag,is-arguments,is-date-object,is-regex,linebreak,node-hid,object-is,pdfkit,png-js,regexp.prototype.flags,restructure,tiny-inflate,unicode-properties,unicode-trie,socks,socks-proxy-agent,ip,smart-buffer,ripple-lib,lodash,jsonschema,ripple-address-codec,ripple-keypairs,ripple-lib-transactionparser,ripple-binary-codec,buffer,decimal.js,debug,agent-base,tslib,whatwg-url,tr46,usb,node-gyp-build,\@sinclair,ts-mixer,core-js} $out/share/daedalus/node_modules/
+      cp -r node_modules/{\@babel,\@noble,\@protobufjs,\@emurgo\/cardano-serialization-lib-nodejs,\@fivebinaries\/coin-selection,ua-parser-js,regenerator-runtime,node-fetch,\@trezor,randombytes,safe-buffer,bip66,pushdata-bitcoin,bitcoin-ops,typeforce,varuint-bitcoin,create-hash,blake2b,blakejs,nanoassert,blake2b-wasm,bs58check,bs58,base-x,create-hmac,wif,ms,semver-compare,long,define-properties,object-keys,has,function-bind,es-abstract,has-symbols,json-stable-stringify,cashaddrjs,big-integer,inherits,bchaddrjs,cross-fetch,js-chain-libs-node,bignumber.js,call-bind,get-intrinsic,base64-js,ieee754,util-deprecate,bech32,blake-hash,tiny-secp256k1,bn.js,elliptic,minimalistic-assert,minimalistic-crypto-utils,brorand,hash.js,hmac-drbg,int64-buffer,object.values,protobufjs,usb-detection,babel-runtime,bindings,brotli,clone,deep-equal,dfa,eventemitter2,file-uri-to-path,fontkit,functions-have-names,has-property-descriptors,has-tostringtag,is-arguments,is-date-object,is-regex,linebreak,node-hid,object-is,pdfkit,png-js,regexp.prototype.flags,restructure,tiny-inflate,unicode-properties,unicode-trie,socks,socks-proxy-agent,ip,smart-buffer,ripple-lib,lodash,jsonschema,ripple-address-codec,ripple-keypairs,ripple-lib-transactionparser,ripple-binary-codec,buffer,decimal.js,debug,agent-base,tslib,whatwg-url,tr46,usb,node-gyp-build,\@sinclair,ts-mixer,core-js} $out/share/daedalus/node_modules/
 
       chmod -R +w $out
 

nix/internal/x86_64-windows.nix

@@ -113,7 +113,7 @@ in rec {
       rm -rf $out/resources/app/{installers,launcher-config.yaml,gulpfile.js,home}
 
       mkdir -pv $out/resources/app/node_modules
-      cp -r node_modules/{\@babel,\@noble,\@protobufjs,\@fivebinaries\/coin-selection,regenerator-runtime,node-fetch,\@trezor,randombytes,safe-buffer,bip66,pushdata-bitcoin,bitcoin-ops,typeforce,varuint-bitcoin,create-hash,blake2b,blakejs,nanoassert,blake2b-wasm,bs58check,bs58,base-x,create-hmac,wif,ms,semver-compare,long,define-properties,object-keys,has,function-bind,es-abstract,has-symbols,json-stable-stringify,cashaddrjs,big-integer,inherits,bchaddrjs,cross-fetch,js-chain-libs-node,bignumber.js,call-bind,get-intrinsic,base64-js,ieee754,util-deprecate,bech32,blake-hash,tiny-secp256k1,bn.js,elliptic,minimalistic-assert,minimalistic-crypto-utils,brorand,hash.js,hmac-drbg,int64-buffer,object.values,protobufjs,usb-detection,babel-runtime,bindings,brotli,clone,deep-equal,dfa,eventemitter2,file-uri-to-path,fontkit,functions-have-names,has-property-descriptors,has-tostringtag,is-arguments,is-date-object,is-regex,linebreak,node-hid,object-is,pdfkit,png-js,regexp.prototype.flags,restructure,tiny-inflate,unicode-properties,unicode-trie,socks,socks-proxy-agent,ip,smart-buffer,ripple-lib,lodash,jsonschema,ripple-address-codec,ripple-keypairs,ripple-lib-transactionparser,ripple-binary-codec,buffer,decimal.js,debug,agent-base,tslib,whatwg-url,tr46,usb,node-gyp-build,\@sinclair,ts-mixer,core-js} $out/resources/app/node_modules
+      cp -r node_modules/{\@babel,\@noble,\@protobufjs,\@emurgo\/cardano-serialization-lib-nodejs,\@fivebinaries\/coin-selection,ua-parser-js,regenerator-runtime,node-fetch,\@trezor,randombytes,safe-buffer,bip66,pushdata-bitcoin,bitcoin-ops,typeforce,varuint-bitcoin,create-hash,blake2b,blakejs,nanoassert,blake2b-wasm,bs58check,bs58,base-x,create-hmac,wif,ms,semver-compare,long,define-properties,object-keys,has,function-bind,es-abstract,has-symbols,json-stable-stringify,cashaddrjs,big-integer,inherits,bchaddrjs,cross-fetch,js-chain-libs-node,bignumber.js,call-bind,get-intrinsic,base64-js,ieee754,util-deprecate,bech32,blake-hash,tiny-secp256k1,bn.js,elliptic,minimalistic-assert,minimalistic-crypto-utils,brorand,hash.js,hmac-drbg,int64-buffer,object.values,protobufjs,usb-detection,babel-runtime,bindings,brotli,clone,deep-equal,dfa,eventemitter2,file-uri-to-path,fontkit,functions-have-names,has-property-descriptors,has-tostringtag,is-arguments,is-date-object,is-regex,linebreak,node-hid,object-is,pdfkit,png-js,regexp.prototype.flags,restructure,tiny-inflate,unicode-properties,unicode-trie,socks,socks-proxy-agent,ip,smart-buffer,ripple-lib,lodash,jsonschema,ripple-address-codec,ripple-keypairs,ripple-lib-transactionparser,ripple-binary-codec,buffer,decimal.js,debug,agent-base,tslib,whatwg-url,tr46,usb,node-gyp-build,\@sinclair,ts-mixer,core-js} $out/resources/app/node_modules
 
       chmod -R +w $out
 

source/renderer/react-polymorph/components/NumericInput.tsx

@@ -123,7 +123,7 @@ class NumericInputBase extends Component<NumericInputProps, State> {
     const { decimalSeparator, groupSeparator } = this.getBigNumberFormat();
     const changedCaretPosition = target.selectionStart;
     const valueToProcess = target.value;
-    const fallbackInputValue = this.state.fallbackInputValue;
+    const { fallbackInputValue } = this.state;
     const isBackwardDelete = inputType === 'deleteContentBackward';
     const isForwardDelete = inputType === 'deleteContentForward';
     const isDeletion = isForwardDelete || isBackwardDelete;

source/renderer/react-polymorph/components/Options.tsx

@@ -16,7 +16,7 @@ import { IDENTIFIERS } from '.';
 import type { ThemeContextProp } from './HOC/withTheme';
 
 type Props = {
-  className?: String;
+  className?: string;
   context: ThemeContextProp;
   hasSearch?: boolean;
   hideSearchClearButton?: boolean;

source/renderer/react-polymorph/skins/simple/InfiniteScrollSkin.tsx

@@ -5,7 +5,7 @@ import type { ElementRef, Element } from 'react';
 import classnames from 'classnames';
 
 type Props = {
-  className: String;
+  className: string;
   data: Record<string, any> | Array<{}>;
   error: boolean | string | Element<any>;
   hasMoreData: boolean;

source/renderer/react-polymorph/utils/events.ts

@@ -1,12 +1,7 @@
 // @ts-nocheck
 // @ts-expect-error
-import type {
-  SyntheticMouseEvent,
-  SyntheticTouchEvent,
-  SyntheticEvent,
-  Element,
-  ElementRef,
-} from 'react';
+import type { Element, ElementRef } from 'react';
+
 export const getMousePosition = (event: React.MouseEvent) => ({
   x: event.pageX - (window.scrollX || window.pageXOffset),
   y: event.pageY - (window.scrollY || window.pageYOffset),

source/renderer/react-polymorph/utils/hooks.ts

@@ -1,6 +1,7 @@
 // @ts-nocheck
 import type { ElementRef } from 'react';
 import { useEffect, useState, useCallback } from 'react';
+
 export function useDebouncedValueChangedIndicator(value: any, delay: number) {
   const [isDirty, setIsDirty] = useState(false);
   useEffect(() => {

source/renderer/react-polymorph/utils/themes.ts

@@ -2,8 +2,9 @@
 import { cloneDeep, isEmpty, isEqual } from 'lodash';
 import { hasProperty } from './props';
 import type { ThemeContextProp } from '../components/HOC/withTheme';
+
 export const appendToProperty = (dest: {}, name: string, value: string) => {
-  dest[name] === '' ? (dest[name] = value) : (dest[name] += ' ' + value);
+  dest[name] === '' ? (dest[name] = value) : (dest[name] += ` ${value}`);
 };
 export const composeComponentStyles = (
   componentStyles: {},

source/renderer/react-polymorph/utils/types.ts

@@ -1,5 +1,6 @@
 // @ts-nocheck
 import type { ElementRef } from 'react';
+
 export type ReactElementRef<ElementType = HTMLElement> = {
   current: null | ElementRef<ElementType>;
 };