diff --git a/.eslintrc b/.eslintrc
index 603b09bc9a..564e160191 100755
--- a/.eslintrc
+++ b/.eslintrc
@@ -58,6 +58,7 @@
     "react/destructuring-assignment": 0,
     "react/display-name": 0,
     "react/jsx-curly-brace-presence": 0,
+    "react/jsx-curly-newline": 0,
     "react/jsx-filename-extension": 0,
     "react/jsx-fragments": 0,
     "react/jsx-no-bind": "warn",
@@ -89,7 +90,6 @@
     "API": true,
     "API_VERSION": true,
     "NETWORK": true,
-    "MOBX_DEV_TOOLS": true,
     "BUILD_NUMBER": true,
     "Process": true // TODO: remove after fix
   },
diff --git a/.prettierignore b/.prettierignore
index 523aeda201..906172dffe 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -5,6 +5,7 @@
 !source/
 !features/
 !storybook/
+!tests/
 
 # Now we ignore all files
 *.*
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d0380703c..8b6ebf9cc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 
 ### Fixes
 
+- Fixed issue with missing character when copying address from PDF ([PR 2925](https://github.com/input-output-hk/daedalus/pull/2925))
 - Fixed stake pool list view overlapping news feed ([PR 2917](https://github.com/input-output-hk/daedalus/pull/2917))
 - Restored opacity for search icon when focused ([PR 2909](https://github.com/input-output-hk/daedalus/pull/2909))
 - Fixed styling of the incentivized testnet rewards wallet dropdown ([PR 2907](https://github.com/input-output-hk/daedalus/pull/2907))
@@ -20,6 +21,8 @@
 
 ### Chores
 
+- Using new faker.js ([PR 2855](https://github.com/input-output-hk/daedalus/pull/2855))
+- Removed `dockutil` due compatibility issues with MacOs Monterey 12.3 ([PR 2929](https://github.com/input-output-hk/daedalus/pull/2929))
 - Fixed spelling issues and typos ([PR 2915](https://github.com/input-output-hk/daedalus/pull/2915))
 - Removed SASS ts-lint ignore comments ([PR 2870](https://github.com/input-output-hk/daedalus/pull/2870))
 - Enabled debugging of the main process ([PR 2893](https://github.com/input-output-hk/daedalus/pull/2893))
diff --git a/declaration.d.ts b/declaration.d.ts
index e598e2a913..13ffd532f7 100644
--- a/declaration.d.ts
+++ b/declaration.d.ts
@@ -34,12 +34,12 @@ export type EnumMap<
 > = O & Record<K, V & $ElementType<O, K>>;
 
 declare global {
+  let daedalus: Daedalus;
   namespace NodeJS {
     interface ProcessEnv {
       WALLET_COUNT: number;
     }
   }
-  var daedalus: Daedalus;
 }
 
 export {};
diff --git a/installers/common/MacInstaller.hs b/installers/common/MacInstaller.hs
index 666907a6d0..e6fb54bcbf 100644
--- a/installers/common/MacInstaller.hs
+++ b/installers/common/MacInstaller.hs
@@ -177,27 +177,6 @@ codeSignEntitlements = [r|<?xml version="1.0" encoding="UTF-8"?>
   </dict>
 </plist>|]
 
-makePostInstall :: Format a (Text -> a)
-makePostInstall = "#!/usr/bin/env bash\n" %
-                  "#\n" %
-                  "# See /var/log/install.log to debug this\n" %
-                  "\n" %
-                  "src_pkg=\"$1\"\ndst_root=\"$2\"\ndst_mount=\"$3\"\nsys_root=\"$4\"\n" %
-                  "./dockutil --add \"${dst_root}/" % s % "\" --allhomes\n"
-
-makeScriptsDir :: Options -> DarwinConfig -> Managed T.Text
-makeScriptsDir Options{oBackend} DarwinConfig{dcAppNameApp} = case oBackend of
-    Cardano     _ -> common
-  where
-    common = do
-      tmp <- fromString <$> (liftIO $ getEnv "TMP")
-      tempdir <- mktempdir tmp "scripts"
-      liftIO $ do
-        cp "data/scripts/dockutil" (tempdir </> "dockutil")
-        writeTextFile (tempdir </> "postinstall") (format makePostInstall dcAppNameApp)
-        chmod executable (tempdir </> "postinstall")
-      pure $ tt tempdir
-
 makeSigningDir :: Managed (T.Text, T.Text)
 makeSigningDir = do
     tmp <- fromString <$> (liftIO $ getEnv "TMP")
@@ -389,27 +368,21 @@ makeComponentRoot Options{oBackend,oCluster} appRoot darwinConfig@DarwinConfig{d
       exit $ ExitFailure 1
 
 makeInstaller :: Options -> DarwinConfig -> FilePath -> FilePath -> IO FilePath
-makeInstaller opts@Options{oOutputDir} darwinConfig@DarwinConfig{dcPkgName} componentRoot pkg = do
+makeInstaller Options{oOutputDir} DarwinConfig{dcPkgName} componentRoot pkg = do
   echo "Making installer ..."
-  let tempPkg1 = format fp (oOutputDir </> pkg)
-      tempPkg2 = oOutputDir </> (dropExtension pkg <.> "unsigned" <.> "pkg")
+  let
+    tempPkg1 = format fp (oOutputDir </> pkg)
+    tempPkg2 = oOutputDir </> (dropExtension pkg <.> "unsigned" <.> "pkg")
+    pkgargs :: [ T.Text ]
+    pkgargs =
+         [ "--identifier", dcPkgName
+         , "--component", tt componentRoot
+         , "--install-location", "/Applications"
+         , tempPkg1
+         ]
 
   mktree oOutputDir
-  with (makeScriptsDir opts darwinConfig) $ \scriptsDir -> do
-    let
-      pkgargs :: [ T.Text ]
-      pkgargs =
-           [ "--identifier"
-           , dcPkgName
-           , "--scripts", scriptsDir
-           , "--component"
-           , tt componentRoot
-           , "--install-location"
-           , "/Applications"
-           , tempPkg1
-           ]
-    run "ls" [ "-ltrh", scriptsDir ]
-    run "pkgbuild" pkgargs
+  run "pkgbuild" pkgargs
 
   run "productbuild" [ "--product", "data/plist"
                      , "--package", tempPkg1
diff --git a/installers/data/scripts/dockutil b/installers/data/scripts/dockutil
deleted file mode 100755
index 1ad861aca8..0000000000
--- a/installers/data/scripts/dockutil
+++ /dev/null
@@ -1,681 +0,0 @@
-#!/usr/bin/python
-
-#   Copyright 2008 Kyle Crawford
-
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
-#   Send bug reports and comments to kcrwfrd at gmail
-
-# Possible future enhancements
-# tie in with application identifier codes for locating apps and replacing them in the dock with newer versions?
-
-import sys, plistlib, subprocess, os, getopt, re, pipes, tempfile, pwd
-import platform
-import time
-
-
-# default verbose printing to off
-verbose = False
-version = '2.0.5'
-
-def usage(e=None):
-    """Displays usage information and error if one occurred"""
-
-    print """usage:     %(progname)s -h
-usage:     %(progname)s --add <path to item> | <url> [--label <label>] [ folder_options ] [ position_options ] [--no-restart] [ plist_location_specification ]
-usage:     %(progname)s --remove <dock item label> | <app bundle id> | all | spacer-tiles [--no-restart] [ plist_location_specification ]
-usage:     %(progname)s --move <dock item label>  position_options [ plist_location_specification ]
-usage:     %(progname)s --find <dock item label> [ plist_location_specification ]
-usage:     %(progname)s --list [ plist_location_specification ]
-usage:     %(progname)s --version
-
-position_options:
-  --replacing <dock item label name>                            replaces the item with the given dock label or adds the item to the end if item to replace is not found
-  --position [ index_number | beginning | end | middle ]        inserts the item at a fixed position: can be an position by index number or keyword
-  --after <dock item label name>                                inserts the item immediately after the given dock label or at the end if the item is not found
-  --before <dock item label name>                               inserts the item immediately before the given dock label or at the end if the item is not found
-  --section [ apps | others ]                                   specifies whether the item should be added to the apps or others section
-
-plist_location_specifications:
-  <path to a specific plist>                                    default is the dock plist for current user
-  <path to a home directory>
-  --allhomes                                                    attempts to locate all home directories and perform the operation on each of them
-  --homeloc                                                     overrides the default /Users location for home directories
-
-folder_options:
-  --view [grid|fan|list|auto]                                   stack view option
-  --display [folder|stack]                                      how to display a folder's icon
-  --sort [name|dateadded|datemodified|datecreated|kind]         sets sorting option for a folder view
-
-global_options:
-  -v                                                            verbose output
-
-Examples:
-  The following adds TextEdit.app to the end of the current user's dock:
-           %(progname)s --add /Applications/TextEdit.app
-
-  The following replaces Time Machine with TextEdit.app in the current user's dock:
-           %(progname)s --add /Applications/TextEdit.app --replacing 'Time Machine'
-
-  The following adds TextEdit.app after the item Time Machine in every user's dock on that machine:
-           %(progname)s --add /Applications/TextEdit.app --after 'Time Machine' --allhomes
-
-  The following adds ~/Downloads as a grid stack displayed as a folder for every user's dock on that machine:
-           %(progname)s --add '~/Downloads' --view grid --display folder --allhomes
-
-  The following adds a url dock item after the Downloads dock item for every user's dock on that machine:
-           %(progname)s --add vnc://miniserver.local --label 'Mini VNC' --after Downloads --allhomes
-
-  The following removes System Preferences from every user's dock on that machine:
-           %(progname)s --remove 'System Preferences' --allhomes
-
-  The following moves System Preferences to the second slot on every user's dock on that machine:
-           %(progname)s --move 'System Preferences' --position 2 --allhomes
-
-  The following finds any instance of iTunes in the specified home directory's dock:
-           %(progname)s --find iTunes /Users/jsmith
-
-  The following lists all dock items for all home directories at homeloc in the form: item<tab>path<tab><section>tab<plist>
-           %(progname)s --list --homeloc /Volumes/RAID/Homes --allhomes
-
-  The following adds Firefox after Safari in the Default User Template without restarting the Dock
-           %(progname)s --add /Applications/Firefox.app --after Safari --no-restart '/System/Library/User Template/English.lproj'
-
-  The following adds a spacer tile in the apps section after Mail
-           %(progname)s --add '' --type spacer --section apps --after Mail
-
-  The following removes all spacer tiles
-           %(progname)s --remove spacer-tiles
-
-Notes:
-  When specifying a relative path like ~/Documents with the --allhomes option, ~/Documents must be quoted like '~/Documents' to get the item relative to each home
-
-
-Contact:
-  Send bug reports and comments to kcrwfrd at gmail.
-""" % dict(progname = os.path.basename(sys.argv[0]))
-    if e:
-        print ""
-        print 'Error processing options:', e
-        sys.exit(1)
-    sys.exit(0)
-
-def verboseOutput(*args):
-    """Used by verbose option (-v) to send more output to stdout"""
-    if verbose:
-        try:
-            print "verbose:", args
-        except:
-            pass
-
-def main():
-    """Parses options and arguments and performs functions"""
-    # setup our getoput opts and args
-    try:
-        (optargs, args) = getopt.getopt(sys.argv[1:], 'hv', ["help", "version",
-            "section=", "list", "find=", "add=", "move=", "replacing=",
-            "remove=", "after=", "before=", "position=", "display=", "view=",
-            "sort=", "label=", "type=", "allhomes", "homeloc=", "no-restart", "hupdock="])
-    except getopt.GetoptError, e:  # if parsing of options fails, display usage and parse error
-        usage(e)
-
-    # setup default values
-    global verbose
-    add_path = None
-    remove_labels = []
-    find_label = None
-    move_label = None
-    after_item = None
-    before_item = None
-    position = None
-    add_path = None
-    plist_path = None
-    list = False
-    all_homes = False
-    replace_label = None
-    section = None
-    displayas = None
-    showas = None
-    arrangement = None
-    tile_type = None
-    label_name = None
-    home_directories_loc = '/Users'
-    restart_dock = True
-
-    for opt, arg in optargs:
-        if opt in ("-h", "--help"):
-            usage()
-        elif opt == "-v":
-            verbose = True
-        elif opt == "--version":
-            print version
-            sys.exit(0)
-        elif opt == "--add":
-            add_path = arg
-        elif opt == "--replacing":
-            replace_label = arg
-        elif opt == "--move":
-            move_label = arg
-        elif opt == "--find":
-            find_label = arg
-        elif opt == "--remove":
-            remove_labels.append(arg)
-        elif opt == "--after":
-            after_item = arg
-        elif opt == "--before":
-            before_item = arg
-        elif opt == "--position":
-            position = arg
-        elif opt == "--label":
-            label_name = arg
-        elif opt == '--sort':
-            if arg == 'name':
-                arrangement = 1
-            elif arg == 'dateadded':
-                arrangement = 2
-            elif arg == 'datemodified':
-                arrangement = 3
-            elif arg == 'datecreated':
-                arrangement = 4
-            elif arg == 'kind':
-                arrangement = 5
-            else:
-                usage('unsupported --sort argument')
-        elif opt == '--view':
-            if arg == 'fan':
-                showas = 1
-            elif arg == 'grid':
-                showas = 2
-            elif arg == 'list':
-                showas = 3
-            elif arg == 'auto':
-                showas = 0
-            else:
-                usage('unsupported --view argument')
-        elif opt == '--display':
-            if arg == 'stack':
-                displayas = 0
-            elif arg == 'folder':
-                displayas = 1
-            else:
-                usage('unsupported --display argument')
-        elif opt == '--type':
-            tile_type = arg+'-tile'
-        elif opt == '--section':
-            section = 'persistent-'+arg
-        elif opt == '--list':
-            list = True
-        elif opt == '--allhomes':
-            all_homes = True
-        elif opt == '--homeloc':
-            home_directories_loc = arg
-        elif opt == '--no-restart':
-            restart_dock = False
-
-        # for legacy compatibility only
-        elif opt == '--hupdock':
-            if arg.lower() in ("false", "no", "off", "0"):
-                restart_dock = False
-
-    # check for an action
-    if add_path == None and not remove_labels and move_label == None and find_label == None and list == False:
-        usage('no action was specified')
-
-
-    # get the list of plists to process
-    # if allhomes option was set, get a list of home directories in the homedirectory location
-    if all_homes:
-        possible_homes = os.listdir(home_directories_loc)
-        plist_paths = [ home_directories_loc+'/'+home+'/Library/Preferences/com.apple.dock.plist' for home in possible_homes if os.path.exists(home_directories_loc+'/'+home+'/Library/Preferences/com.apple.dock.plist') and os.path.exists(home_directories_loc+'/'+home+'/Desktop')]
-    else: # allhomes was not specified
-        # if no plist argument, then use the user's home directory dock plist, otherwise use the arguments provided
-        if args == []:
-            plist_paths = [ os.path.expanduser('~/Library/Preferences/com.apple.dock.plist') ]
-        else:
-            plist_paths = args
-    # exit if we couldn't find any plists to process
-    if len(plist_paths) < 1:
-        print 'no dock plists were found'
-        sys.exit(1)
-
-    # loop over plist paths
-    for plist_path in plist_paths:
-
-        verboseOutput('processing', plist_path)
-        # a home directory is allowed as an argument, so if the plist_path is a
-        # directory, we append the relative path to the plist
-        if os.path.isdir(plist_path):
-            plist_path = os.path.join(plist_path,'Library/Preferences/com.apple.dock.plist')
-
-        # verify that the plist exists at the given path
-        # and expand and quote it for use when shelling out
-        if os.path.exists(os.path.expanduser(plist_path)):
-            plist_path = os.path.expanduser(plist_path)
-            plist_path = os.path.abspath(plist_path)
-        else:
-            print plist_path, 'does not seem to be a home directory or a dock plist'
-            sys.exit(1)
-
-        # If we are modifying the currently logged in user's dock, wait for mod-count to be > 1 because dock is still being setup by Apple
-        if os.stat(plist_path).st_uid == os.stat('/dev/console').st_uid:
-            pl = readPlist(plist_path)
-            mod_count = int(pl.get('mod-count', 0))
-            seconds_waited = 0
-            while mod_count < 2 and seconds_waited < 5:
-                verboseOutput("Waiting for Apple's initial dock setup. Dock mod-count is: %s (should be > 1 after Apple's setup is done)" % mod_count)
-                time.sleep(1)
-                seconds_waited += 1
-                verboseOutput("Waited %s seconds so far" % seconds_waited)
-                pl = readPlist(plist_path)
-                mod_count = int(pl.get('mod-count', 0))
-            if mod_count < 2:
-                verboseOutput("Warning: Timed out waiting for dock to be setup (mod-count > 1). Modifications may not work as expected without Apple's initial setup")
-
-        # check for each action and process accordingly
-        if remove_labels: # --remove action(s)
-            pl = readPlist(plist_path)
-            changed = False
-            for remove_label in remove_labels:
-                if removeItem(pl, remove_label):
-                    changed = True
-                else:
-                    print 'item', remove_label, 'was not found in', plist_path
-            if changed:
-                commitPlist(pl, plist_path, restart_dock)
-        elif list: # --list action
-            pl = readPlist(plist_path)
-            # print a tab separated line for each item in the plist
-            # for each section
-            for section in ['persistent-apps', 'persistent-others']:
-                # for item in section
-                for item in pl.get(section, []):
-                    try:
-                        # join and print relevant data into a string separated by tabs
-                        print '\t'.join((item['tile-data']['file-label'], item['tile-data']['file-data']['_CFURLString'], section, plist_path))
-                    except:
-                        try:
-                            # join and print relevant data into a string separated by tabs
-                            print '\t'.join((item['tile-data']['label'], item['tile-data']['url']['_CFURLString'], section, plist_path))
-                        except:
-                            pass
-
-        elif find_label != None: # --find action
-            # since we are only reading the plist, make a copy before converting it to be read
-            pl = readPlist(plist_path)
-            # set found state
-            item_found = False
-            # loop through dock items looking for a match with provided find_label
-            for section in ['persistent-apps', 'persistent-others']:
-                for item_offset in range(len(pl[section])):
-                    try:
-                        if pl[section][item_offset]['tile-data']['file-label'] == find_label:
-                            item_found = True
-                            print find_label, "was found in", section, "at slot", item_offset+1, "in", plist_path
-                    except:
-                        try:
-                            if pl[section][item_offset]['tile-data']['label'] == find_label:
-                                item_found = True
-                                print find_label, "was found in", section, "at slot", item_offset+1, "in", plist_path
-                        except:
-                            pass
-            if not item_found:
-                print find_label, "was not found in", plist_path
-                if not all_homes:  # only exit non-zero if we aren't processing all homes, because for allhomes, exit status for find would be irrelevant
-                    sys.exit(1)
-
-        elif move_label != None: # --move action
-            pl = readPlist(plist_path)
-            # check for a position option before processing
-            if position is None and before_item is None and after_item is None:
-                usage('move action requires a position destination')
-            # perform the move and save the plist if it was successful
-            if moveItem(pl, move_label, position, before_item, after_item):
-                commitPlist(pl, plist_path, restart_dock)
-            else:
-                print 'move failed for', move_label, 'in', plist_path
-
-        elif add_path != None:  # --add action
-            if add_path.startswith('file://'): # remove 'file://' from start of path, so its not treated as a url
-                add_path = re.sub('^file://', '', add_path)
-
-            if add_path.startswith('~'): # we've got a relative path and relative paths need to be processed by using a path relative to this home directory
-                real_add_path = re.sub('^~', plist_path.replace('/Library/Preferences/com.apple.dock.plist',''), add_path) # swap out the full home path for the ~
-            else:
-                real_add_path = add_path
-            # determine smart default values where possible
-            if section == None:
-                if real_add_path.endswith('.app') or real_add_path.endswith('.app/'): # we've got an application
-                    section = 'persistent-apps'
-                elif displayas != None or showas != None or arrangement != None: # we've got a folder
-                    section = 'persistent-others'
-
-            if tile_type is None:  # if type was not specified, we try to figure that out using the filesystem
-                if os.path.isdir(real_add_path) and section != 'persistent-apps': # app bundles are directories too
-                    tile_type = 'directory-tile'
-                elif re.match('\w*://', real_add_path): # regex to determine a url in the form xyz://abcdef.adsf.com/adsf
-                    tile_type = 'url-tile'
-                    section = 'persistent-others'
-                else:
-                    tile_type = 'file-tile'
-
-            if section == None:
-                section = 'persistent-others'
-
-
-            if tile_type != 'url-tile': # paths can't be relative in dock items
-                real_add_path = os.path.realpath(real_add_path)
-
-
-            pl = readPlist(plist_path)
-            verboseOutput('adding', real_add_path)
-            # perform the add save the plist if it was successful
-            if addItem(pl, real_add_path, replace_label, position, before_item, after_item, section, displayas, showas, arrangement, tile_type, label_name):
-                commitPlist(pl, plist_path, restart_dock)
-            else:
-                print 'item', add_path, 'was not added to Dock'
-                if not all_homes:  # only exit non-zero if we aren't processing all homes, because for allhomes, exit status for add would be irrelevant
-                    sys.exit(1)
-
-# NOTE on use of defaults
-# We use defaults because it knows how to handle cfpreferences caching even when given a path rather than a domain
-# This allows us to keep using path-based plist specifications rather than domains
-# Preserving path based plists are important for people needing to run this on a non boot volume
-# However if Apple stops using plists or moves the plist path, all of this will break
-# So at that point we will have to change the API so users pass in a defaults domain or user rather than a plist path
-def writePlist(pl, plist_path):
-    """writes a plist object down to a file"""
-    # get a tempfile path for writing our plist
-    plist_import_path = tempfile.mktemp(dir='/tmp')
-    # Write the plist to our temporary plist for importing because defaults can't import from a pipe (yet)
-    plistlib.writePlist(pl, plist_import_path)
-    # get original permissions
-    plist_stat = os.stat(plist_path)
-    # If we are running as root, ensure we run as the correct user to update cfprefsd
-    if os.geteuid() == 0:
-        # Running defaults as the user only works if the user exists
-        if valid_uid(plist_stat.st_uid):
-            subprocess.call(['sudo', '-u', '#%d' % plist_stat.st_uid, '-g', '#%d' % plist_stat.st_gid, 'defaults', 'import', plist_path, plist_import_path])
-        else:
-            subprocess.call(['defaults', 'import', plist_path, plist_import_path])
-            os.chown(plist_path, plist_stat.st_uid, plist_stat.st_gid)
-            os.chmod(plist_path, plist_stat.st_mode)
-    else:
-        subprocess.call(['defaults', 'import', plist_path, plist_import_path])
-    os.unlink(plist_import_path)
-
-
-def valid_uid(uid):
-    """returns bool of whether uid can be resolved to a user"""
-    try:
-        pwd.getpwuid(uid)
-        return True
-    except:
-        return False
-
-def getOsxVersion():
-    """returns a tuple with the (major,minor,revision) numbers"""
-    # OS X Yosemite return 10.10, so we will be happy with len(...) == 2, then add 0 for last number
-    try:
-        mac_ver = tuple(int(n) for n in platform.mac_ver()[0].split('.'))
-        assert 2 <= len(mac_ver) <= 3
-    except Exception as e:
-        raise e
-    if len(mac_ver) == 2:
-      mac_ver = mac_ver + (0, )
-    return mac_ver
-
-def readPlist(plist_path):
-    """returns a plist object read from a file path"""
-    # get a tempfile path for exporting our defaults data
-    export_fifo = tempfile.mktemp()
-    # make a fifo for defaults export in a temp file
-    os.mkfifo(export_fifo)
-    # export to the fifo
-    osx_version = getOsxVersion()
-    if osx_version[1] >= 9:
-        subprocess.Popen(['defaults', 'export', plist_path, export_fifo]).communicate()
-        # convert the export to xml
-        plist_string = subprocess.Popen(['plutil', '-convert', 'xml1', export_fifo, '-o', '-'], stdout=subprocess.PIPE).stdout.read()
-    else:
-        try:
-            cmd = ['/usr/libexec/PlistBuddy','-x','-c', 'print',plist_path]
-            proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            (plist_string,err) = proc.communicate()
-        except Exception as e:
-            raise e
-    # parse the xml into a dictionary
-    pl = plistlib.readPlistFromString(plist_string)
-    return pl
-
-def moveItem(pl, move_label=None, position=None, before_item=None, after_item=None):
-    """locates an existing dock item and moves it to a new position"""
-    for section in ['persistent-apps', 'persistent-others']:
-        item_to_move = None
-        # loop over the items looking for the item label
-        for item_offset in range(len(pl[section])):
-            if pl[section][item_offset]['tile-data']['file-label'] == move_label:
-                item_found = True
-                verboseOutput('found', move_label) 
-                # make a copy of the found dock entry
-                item_to_move = pl[section][item_offset]
-                found_offset = item_offset
-                break
-            else:
-                verboseOutput('no match for', pl[section][item_offset]['tile-data']['file-label'])
-        # if the item wasn't found, continue to next section loop iteration
-        if item_to_move == None:
-            continue
-        # we are still inside the section for loop
-        # remove the found item
-        pl[section].remove(pl[section][item_offset])
-
-        # figure out where to re-insert the original dock item back into the plist
-        if position != None:
-            if position in [ 'beginning', 'begin', 'first' ]:        
-                pl[section].insert(0, item_to_move)
-                return True
-            elif position in [ 'end', 'last' ]:
-                pl[section].append(item_to_move)
-                return True
-            elif position in [ 'middle', 'center' ]:
-                midpoint = int(len(pl[section])/2)
-                pl[section].insert(midpoint, item_to_move)
-                return True
-            else:
-                # if the position integer starts with a + or - , then add or subtract from its current position respectively
-                if position.startswith('-') or position.startswith('+'):
-                    new_position = int(position) + found_offset
-                    if new_position > len(pl[section]):
-                        pl[section].append(item_to_move)
-                    elif new_position < 0:
-                        pl[section].insert(0, item_to_move)
-                    else:
-                        pl[section].insert(int(position) + found_offset, item_to_move)
-                    return True
-
-                try:
-                    int(position)
-                except:
-                    print 'Invalid position', position
-                    return False
-                pl[section].insert(int(position)-1, item_to_move)
-                return True
-        elif after_item != None or before_item != None:
-            # if after or before is set, find the offset of that item and do the insert relative to that offset
-            for item_offset in range(len(pl[section])):
-                try:
-                    if after_item != None:
-                        if pl[section][item_offset]['tile-data']['file-label'] == after_item:
-                            pl[section].insert(item_offset+1, item_to_move)
-                            return True
-                    if before_item != None:
-                        if pl[section][item_offset]['tile-data']['file-label'] == before_item:
-                            pl[section].insert(item_offset, item_to_move)
-                            return True
-                except KeyError:
-                    pass
-
-    return False
-
-def generate_guid():
-    """returns guid string"""
-    return subprocess.Popen(['/usr/bin/uuidgen'],stdout=subprocess.PIPE).communicate()[0].rstrip()
-
-def addItem(pl, add_path, replace_label=None, position=None, before_item=None, after_item=None, section='persistent-apps', displayas=1, showas=1, arrangement=2, tile_type='file-tile',label_name=None):
-    """adds an item to an existing dock plist object"""
-    if displayas == None: displayas = 1
-    if showas == None: showas = 0
-    if arrangement == None: arrangement = 2
-
-    #fix problems with unicode file names
-    enc = (sys.stdin.encoding if sys.stdin.encoding else 'UTF-8')
-    add_path = unicode(add_path, enc)
-
-    # set a dock label if one isn't provided
-    if label_name == None:
-        if tile_type == 'url-tile':
-            label_name = add_path
-            section = 'persistent-others'
-        else:
-            base_name = re.sub('/$', '', add_path).split('/')[-1]
-            label_name = re.sub('.app$', '', base_name)
-
-
-    # only add if item label isn't already there
-
-    if replace_label != label_name:
-        for existing_dock_item in (pl[section]):
-            for label_key in ['file-label','label']:
-                if existing_dock_item['tile-data'].has_key(label_key):
-                    if existing_dock_item['tile-data'][label_key] == label_name:
-                        print "%s already exists in dock. Use --replacing '%s' to update an existing item" % (label_name, label_name)
-                        return False
-
-
-
-    if replace_label != None:
-        for item_offset in range(len(pl[section])):
-            tile_replace_candidate = pl[section][item_offset]['tile-data']
-            if tile_replace_candidate[label_key_for_tile(tile_replace_candidate)] == replace_label:
-                verboseOutput('found', replace_label)
-                del pl[section][item_offset]
-                position = item_offset + 1
-                break
-
-    new_guid = generate_guid()
-    if tile_type == 'file-tile':
-        new_item = {'GUID': new_guid, 'tile-data': {'file-data': {'_CFURLString': add_path, '_CFURLStringType': 0},'file-label': label_name, 'file-type': 32}, 'tile-type': tile_type}
-    elif tile_type == 'directory-tile':
-        if subprocess.Popen(['/usr/bin/sw_vers', '-productVersion'],
-                stdout=subprocess.PIPE).stdout.read().rstrip().split('.')[1] == '4': # gets the decimal after 10 in sw_vers; 10.4 does not use 10.5 options for stacks
-            new_item = {'GUID': new_guid, 'tile-data': {'directory': 1, 'file-data': {'_CFURLString': add_path, '_CFURLStringType': 0}, 'file-label': label_name, 'file-type': 2 }, 'tile-type': tile_type}
-        else:
-            new_item = {'GUID': new_guid, 'tile-data': {'arrangement': arrangement, 'directory': 1, 'displayas': displayas, 'file-data': {'_CFURLString': add_path, '_CFURLStringType': 0}, 'file-label': label_name, 'file-type': 2, 'showas': showas}, 'tile-type': tile_type}
-
-    elif tile_type == 'url-tile':
-        new_item = {'GUID': new_guid, 'tile-data': {'label': label_name, 'url': {'_CFURLString': add_path, '_CFURLStringType': 15}}, 'tile-type': tile_type}
-    elif tile_type == 'spacer-tile':
-        new_item = {'GUID': new_guid, 'tile-data': {}, 'tile-type': tile_type}
-    else:
-        print 'unknown type:', tile_type
-        sys.exit(1)
-
-    verboseOutput('adding', new_item)
-
-    if position != None:
-        if position in [ 'beginning', 'begin', 'first' ]:
-            pl[section].insert(0, new_item)
-            return True
-        elif position in [ 'end', 'last' ]:
-            pl[section].append(new_item)
-            return True
-        elif position in [ 'middle', 'center' ]:
-            midpoint = int(len(pl[section])/2)
-            pl[section].insert(midpoint, new_item)
-            return True
-        else:
-            try:
-                int(position)
-            except:
-                print 'Invalid position', position
-                return False
-            if int(position) == 0:
-                pl[section].insert(int(position), new_item)
-            elif int(position) > 0:
-                pl[section].insert(int(position)-1, new_item)
-            else:
-                pl[section].insert(int(position)+len(pl[section])+1, new_item)
-            return True
-    elif after_item != None or before_item !=None:
-        for item_offset in range(len(pl[section])):
-            try:
-                if after_item != None:
-                    if pl[section][item_offset]['tile-data']['file-label'] == after_item:
-                        pl[section].insert(item_offset+1, new_item)
-                        return True
-                if before_item != None:
-                    if pl[section][item_offset]['tile-data']['file-label'] == before_item:
-                        pl[section].insert(item_offset, new_item)
-                        return True
-            except KeyError:
-                pass
-    pl[section].append(new_item)
-    verboseOutput('item added at end')
-    return True
-
-def removeItem(pl, item_name):
-    removal_succeeded = False
-    item_name = item_name.decode('utf-8')
-    if item_name == u'all':
-        verboseOutput('Removing all items')
-        pl['persistent-apps'] = []
-        pl['persistent-others'] = []
-        return True
-    if item_name == u'spacer-tiles':
-        verboseOutput('Removing all spacers')
-        for section in ['persistent-apps', 'persistent-others']:
-            for item in pl.get(section, []):
-                if item['tile-type'] == "spacer-tile":
-                    pl[section].remove(item)
-                    removal_succeeded = True
-    for dock_item in pl['persistent-apps']:
-        if (dock_item['tile-data'].get('file-label') == item_name) or (dock_item['tile-data'].get('bundle-identifier') == item_name):
-            verboseOutput('found', item_name)
-            pl['persistent-apps'].remove(dock_item)
-            removal_succeeded = True
-    for dock_item in pl['persistent-others']:
-        if dock_item['tile-type'] == "url-tile":
-            if dock_item['tile-data'].get('label') == item_name:
-                verboseOutput('found', item_name)
-                pl['persistent-others'].remove(dock_item)
-                removal_succeeded = True
-        else:
-            if dock_item['tile-data'].get('file-label') == item_name:
-                verboseOutput('found', item_name)
-                pl['persistent-others'].remove(dock_item)
-                removal_succeeded = True
-    return removal_succeeded
-
-def commitPlist(pl, plist_path, restart_dock):
-    writePlist(pl, plist_path)
-    if restart_dock:
-        os.system('/usr/bin/killall Dock >/dev/null 2>&1')
-
-def label_key_for_tile(item):
-    for label_key in ['file-label','label']:
-        if item.has_key(label_key):
-            return label_key
-
-
-if __name__ == "__main__":
-    main()
diff --git a/package.json b/package.json
index ce4c578c0c..b60c3b99b5 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {
-    "dev": "concurrently --kill-others --names 'renderer,main' 'yarn dev:renderer' 'yarn dev:main'",
+    "dev": "yarn dev:renderer",
     "dev:main": "cross-env NODE_ENV=development yarn build:main --watch",
     "dev:renderer": "cross-env NODE_ENV=development yarn webpack serve -c source/renderer/webpack.config.js --progress",
     "build": "yarn build:cleanup && yarn build:main && yarn build:renderer",
@@ -37,7 +37,6 @@
     "debug": "gulp debug",
     "package": "cross-env NODE_ENV=production yarn build && cross-env NODE_ENV=production babel-node scripts/package.js",
     "package:all": "yarn package --all",
-    "cleanup": "mop -v",
     "lint": "eslint --format=node_modules/eslint-formatter-pretty source storybook utils  --ext .ts,.tsx",
     "compile": "tsc --noEmit",
     "precompile": "yarn typedef:sass",
@@ -92,15 +91,16 @@
     "@babel/preset-typescript": "7.16.7",
     "@babel/register": "7.0.0",
     "@dump247/storybook-state": "1.6.1",
+    "@faker-js/faker": "6.0.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.3",
-    "@storybook/addon-actions": "6.4.9",
+    "@storybook/addon-actions": "6.4.19",
     "@storybook/addon-knobs": "6.4.0",
-    "@storybook/addon-links": "6.4.9",
-    "@storybook/addons": "6.4.9",
-    "@storybook/builder-webpack5": "6.4.9",
-    "@storybook/core": "6.4.9",
-    "@storybook/manager-webpack5": "6.4.9",
-    "@storybook/react": "6.4.9",
+    "@storybook/addon-links": "6.4.19",
+    "@storybook/addons": "6.4.19",
+    "@storybook/builder-webpack5": "6.4.19",
+    "@storybook/core": "6.4.19",
+    "@storybook/manager-webpack5": "6.4.19",
+    "@storybook/react": "6.4.19",
     "@testing-library/jest-dom": "5.15.1",
     "@testing-library/react": "12.1.2",
     "@types/aes-js": "3.1.1",
@@ -146,7 +146,6 @@
     "eslint-plugin-react": "7.25.1",
     "eslint-plugin-react-hooks": "4.2.0",
     "esm": "3.2.25",
-    "faker": "5.1.0",
     "gulp-shell": "0.8.0",
     "hash.js": "1.1.7",
     "html-loader": "2.1.2",
@@ -190,7 +189,7 @@
     "transform-loader": "0.2.4",
     "ts-node": "10.4.0",
     "typed-scss-modules": "5.0.0",
-    "typescript": "4.5.4",
+    "typescript": "4.6.2",
     "utf-8-validate": "5.0.2",
     "webdriverio": "5.18.7",
     "webpack": "5.65.0",
@@ -293,7 +292,7 @@
     "validator": "13.7.0"
   },
   "devEngines": {
-    "node": ">=16.13.2",
+    "node": ">=v14.18.1",
     "yarn": "1.22.4"
   },
   "husky": {
diff --git a/source/common/assets/pdf/NotoSansMono-Regular.ttf b/source/common/assets/pdf/NotoSansMono-Regular.ttf
deleted file mode 100644
index d866336108..0000000000
Binary files a/source/common/assets/pdf/NotoSansMono-Regular.ttf and /dev/null differ
diff --git a/source/common/assets/pdf/RobotoMono-Regular.ttf b/source/common/assets/pdf/RobotoMono-Regular.ttf
new file mode 100644
index 0000000000..b158a334eb
Binary files /dev/null and b/source/common/assets/pdf/RobotoMono-Regular.ttf differ
diff --git a/source/common/assets/pdf/fonts.d.ts b/source/common/assets/pdf/fonts.d.ts
new file mode 100644
index 0000000000..1764f41e08
--- /dev/null
+++ b/source/common/assets/pdf/fonts.d.ts
@@ -0,0 +1 @@
+declare module '*.ttf';
diff --git a/source/common/types/environment.types.ts b/source/common/types/environment.types.ts
index 8513e67d0f..c464aee363 100644
--- a/source/common/types/environment.types.ts
+++ b/source/common/types/environment.types.ts
@@ -2,7 +2,6 @@ export type Environment = {
   network: Network;
   apiVersion: string;
   nodeVersion: string;
-  mobxDevTools: boolean | string;
   current: string;
   isDev: boolean;
   isTest: boolean;
@@ -14,7 +13,6 @@ export type Environment = {
   isShelleyQA: boolean;
   isSelfnode: boolean;
   isDevelopment: boolean;
-  isWatchMode: boolean;
   build: string;
   buildNumber: string;
   platform: string;
diff --git a/source/main/environment.ts b/source/main/environment.ts
index 89eab9f420..b27b6818d0 100644
--- a/source/main/environment.ts
+++ b/source/main/environment.ts
@@ -1,6 +1,6 @@
 import os from 'os';
 import { get, includes, uniq } from 'lodash';
-import { version } from '../../package.json';
+import packageJson from '../../package.json';
 import type { Environment } from '../common/types/environment.types';
 import { DEVELOPMENT, OS_NAMES } from '../common/types/environment.types';
 import {
@@ -19,6 +19,8 @@ import {
   checkIsWindows,
   checkIsLinux,
 } from '../common/utils/environmentCheckers';
+
+const { version } = packageJson;
 // Daedalus requires minimum 16 gigabytes of RAM, but some devices having 16 GB
 // actually have a slightly smaller RAM size (eg. 15.99 GB), therefore we used 15 GB threshold
 //
@@ -58,7 +60,6 @@ const isBlankScreenFixActive = includes(process.argv.slice(1), '--safe-mode');
 const BUILD = process.env.BUILD_NUMBER || 'dev';
 const BUILD_NUMBER = uniq([API_VERSION, BUILD]).join('.');
 const INSTALLER_VERSION = uniq([API_VERSION, BUILD]).join('.');
-const MOBX_DEV_TOOLS = process.env.MOBX_DEV_TOOLS || false;
 const isMacOS = checkIsMacOS(PLATFORM);
 const isWindows = checkIsWindows(PLATFORM);
 const isLinux = checkIsLinux(PLATFORM);
@@ -73,7 +74,6 @@ export const environment: Environment = Object.assign(
     network: NETWORK,
     apiVersion: API_VERSION,
     nodeVersion: NODE_VERSION,
-    mobxDevTools: MOBX_DEV_TOOLS,
     current: CURRENT_NODE_ENV,
     isDev,
     isTest,
@@ -85,7 +85,6 @@ export const environment: Environment = Object.assign(
     isShelleyQA,
     isSelfnode,
     isDevelopment,
-    isWatchMode,
     build: BUILD,
     buildNumber: BUILD_NUMBER,
     platform: PLATFORM,
diff --git a/source/main/ipc/generateAddressPDFChannel.ts b/source/main/ipc/generateAddressPDFChannel.ts
index 0412ab273d..6339a19e5f 100644
--- a/source/main/ipc/generateAddressPDFChannel.ts
+++ b/source/main/ipc/generateAddressPDFChannel.ts
@@ -9,17 +9,12 @@ import type {
   GenerateAddressPDFRendererRequest,
   GenerateAddressPDFMainResponse,
 } from '../../common/ipc/api';
-// @ts-ignore ts-migrate(2307) FIXME: Cannot find module '../../common/assets/pdf/NotoSa... Remove this comment to see the full error message
 import fontRegularEn from '../../common/assets/pdf/NotoSans-Regular.ttf';
-// @ts-ignore ts-migrate(2307) FIXME: Cannot find module '../../common/assets/pdf/NotoSa... Remove this comment to see the full error message
 import fontMediumEn from '../../common/assets/pdf/NotoSans-Medium.ttf';
-// @ts-ignore ts-migrate(2307) FIXME: Cannot find module '../../common/assets/pdf/arial-... Remove this comment to see the full error message
 import fontUnicode from '../../common/assets/pdf/arial-unicode.ttf';
-// @ts-ignore ts-migrate(2307) FIXME: Cannot find module '../../common/assets/pdf/NotoSa... Remove this comment to see the full error message
-import fontMono from '../../common/assets/pdf/NotoSansMono-Regular.ttf';
+import fontMono from '../../common/assets/pdf/RobotoMono-Regular.ttf';
 
-export const generateAddressPDFChannel: // IpcChannel<Incoming, Outgoing>
-MainIpcChannel<
+export const generateAddressPDFChannel: MainIpcChannel<
   GenerateAddressPDFRendererRequest,
   GenerateAddressPDFMainResponse
 > = new MainIpcChannel(GENERATE_ADDRESS_PDF_CHANNEL);
diff --git a/source/main/webpack.config.js b/source/main/webpack.config.js
index 1b7a82c102..c4de51aca7 100644
--- a/source/main/webpack.config.js
+++ b/source/main/webpack.config.js
@@ -94,7 +94,6 @@ module.exports = {
     new webpack.EnvironmentPlugin({
       API_VERSION: 'dev',
       NETWORK: 'development',
-      MOBX_DEV_TOOLS: 'false',
       BUILD_NUMBER: 'dev',
       IS_WATCH_MODE: 'false',
       KEEP_LOCAL_CLUSTER_RUNNING: 'false',
diff --git a/source/main/windows/main.ts b/source/main/windows/main.ts
index 1e7fe70d88..b07e6944f6 100644
--- a/source/main/windows/main.ts
+++ b/source/main/windows/main.ts
@@ -77,7 +77,11 @@ export const createMainWindow = (locale: string, windowBounds?: Rectangle) => {
     if (event.sender !== window.webContents) return;
     window.close();
   });
-  window.loadURL(`file://${__dirname}/../renderer/index.html`);
+  if (isDev) {
+    window.loadURL(`http://localhost:8080`);
+  } else {
+    window.loadURL(`file://${__dirname}/../renderer/index.html`);
+  }
   window.on('page-title-updated', (event) => {
     event.preventDefault();
   });
diff --git a/source/renderer/app/App.tsx b/source/renderer/app/App.tsx
index d89ec81216..4cf5deda95 100755
--- a/source/renderer/app/App.tsx
+++ b/source/renderer/app/App.tsx
@@ -1,9 +1,9 @@
 import React, { Component, Fragment } from 'react';
 import { Provider, observer } from 'mobx-react';
+import { History } from 'history';
 import { ThemeProvider } from 'react-polymorph/lib/components/ThemeProvider';
 import { SimpleSkins } from 'react-polymorph/lib/skins/simple';
 import { SimpleDefaults } from 'react-polymorph/lib/themes/simple';
-import DevTools from 'mobx-react-devtools';
 import { Router } from 'react-router-dom';
 import { IntlProvider } from 'react-intl';
 import { Routes } from './Routes';
@@ -16,8 +16,8 @@ import DaedalusDiagnosticsDialog from './containers/status/DaedalusDiagnosticsDi
 import NotificationsContainer from './containers/notifications/NotificationsContainer';
 import NewsOverlayContainer from './containers/news/NewsOverlayContainer';
 import { DIALOGS } from '../../common/ipc/constants';
-import type { StoresMap } from './stores/index';
-import type { ActionsMap } from './actions/index';
+import type { StoresMap } from './stores';
+import type { ActionsMap } from './actions';
 import NewsFeedContainer from './containers/news/NewsFeedContainer';
 import ToggleRTSFlagsDialogContainer from './containers/knownIssues/ToggleRTSFlagsDialogContainer';
 import RTSFlagsRecommendationOverlayContainer from './containers/knownIssues/RTSFlagsRecommendationOverlayContainer';
@@ -27,7 +27,7 @@ import { MenuUpdater } from './containers/MenuUpdater';
 class App extends Component<{
   stores: StoresMap;
   actions: ActionsMap;
-  history: Record<string, any>;
+  history: History;
 }> {
   componentDidMount() {
     // Loads app's global environment variables into AppStore via ipc
@@ -41,7 +41,6 @@ class App extends Component<{
     const { isActiveDialog, isSetupPage } = app;
     const { isNodeStopping, isNodeStopped } = networkStatus;
     const locale = stores.profile.currentLocale;
-    const mobxDevTools = global.environment.mobxDevTools ? <DevTools /> : null;
     const { currentTheme } = stores.profile;
 
     const themeVars = require(`./themes/daedalus/${currentTheme}.ts`).default;
@@ -80,7 +79,6 @@ class App extends Component<{
                 <Router history={history}>
                   <Routes />
                 </Router>
-                {mobxDevTools}
                 {[
                   // @ts-ignore ts-migrate(2345) FIXME: Argument of type 'string' is not assignable to par... Remove this comment to see the full error message
                   isActiveDialog(ABOUT) && <AboutDialog key="aboutDialog" />,
diff --git a/source/renderer/app/components/loading/syncing-connecting/LogosDisplay.scss b/source/renderer/app/components/loading/syncing-connecting/LogosDisplay.scss
index 7961b95c08..d66f9fde29 100644
--- a/source/renderer/app/components/loading/syncing-connecting/LogosDisplay.scss
+++ b/source/renderer/app/components/loading/syncing-connecting/LogosDisplay.scss
@@ -1,3 +1,5 @@
+@use 'sass:math';
+
 .component {
   align-items: center;
   display: flex;
@@ -22,7 +24,7 @@ $cardanoLogoWidth: 86px;
 
 $adaLogoWidth: 43px;
 .adaLogo > svg {
-  margin: 3px ($cardanoLogoWidth - $adaLogoWidth) / 2 0; // Visually align in the middle + Needs to be the same dimension as the apiLogo
+  margin: 3px math.div(($cardanoLogoWidth - $adaLogoWidth), 2) 0; // Visually align in the middle + Needs to be the same dimension as the apiLogo
   width: $adaLogoWidth;
 }
 
diff --git a/source/renderer/app/components/wallet/WalletSendForm.spec.tsx b/source/renderer/app/components/wallet/WalletSendForm.spec.tsx
index ca61fbf5f1..9ae61a58e0 100644
--- a/source/renderer/app/components/wallet/WalletSendForm.spec.tsx
+++ b/source/renderer/app/components/wallet/WalletSendForm.spec.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { addLocaleData } from 'react-intl';
 import BigNumber from 'bignumber.js';
 import { Provider as MobxProvider } from 'mobx-react';
-import faker from 'faker';
+import faker from '@faker-js/faker';
 import {
   render,
   fireEvent,
@@ -28,12 +28,12 @@ describe('wallet/Wallet Send Form', () => {
   const currencyMaxFractionalDigits = 6;
 
   function createAssets(index: number) {
-    const id = `${faker.random.uuid()}:${index}`;
+    const id = `${faker.datatype.uuid()}:${index}`;
     return {
       policyId: id,
       assetName: faker.internet.domainWord(),
       uniqueId: id,
-      fingerprint: faker.random.uuid(),
+      fingerprint: faker.datatype.uuid(),
       quantity: new BigNumber(faker.finance.amount()),
       decimals: 0,
       recommendedDecimals: null,
diff --git a/source/renderer/app/config/generateStakePoolFakeData.ts b/source/renderer/app/config/generateStakePoolFakeData.ts
index bdf13d96be..88a81a969d 100644
--- a/source/renderer/app/config/generateStakePoolFakeData.ts
+++ b/source/renderer/app/config/generateStakePoolFakeData.ts
@@ -1,33 +1,31 @@
 /**
  * It generates stake pool dummy json content
- * Command to run: node source/renderer/app/config/generateStakePoolFakeData.js
+ * Command to run: yarn ts-node source/renderer/app/config/generateStakePoolFakeData.ts
  */
-const faker = require('faker');
+import faker from '@faker-js/faker';
+import fs from 'fs';
+import path from 'path';
+import BigNumber from 'bignumber.js';
 
-// const fs = require('fs');
-const path = require('path');
-
-const BigNumber = require('bignumber.js');
-
-function generatStakePoolsFakeData() {
+function generateStakePoolsFakeData() {
   const stakePools = [];
 
   for (let i = 1; i <= 300; i++) {
-    const relativeStake = faker.random.number(100);
-    const cost = new BigNumber(faker.random.number(100));
+    const relativeStake = faker.datatype.number(100);
+    const cost = new BigNumber(faker.datatype.number(100));
     const createdAt = faker.date.recent();
     const description = faker.lorem.words();
     const homepage = faker.internet.url();
     const id = faker.random.alphaNumeric(64);
-    const isCharity = faker.random.boolean();
+    const isCharity = faker.datatype.boolean();
     const name = faker.name.findName();
-    const performance = faker.random.number(100);
-    const pledge = new BigNumber(faker.random.number(100));
-    const producedBlocks = faker.random.number(10000000);
-    const profitMargin = faker.random.number(100);
+    const performance = faker.datatype.number(100);
+    const pledge = new BigNumber(faker.datatype.number(100));
+    const producedBlocks = faker.datatype.number(10000000);
+    const profitMargin = faker.datatype.number(100);
     const ranking = i;
     const retiring = null;
-    const saturation = faker.random.number({
+    const saturation = faker.datatype.number({
       min: 0,
       max: 120,
       precision: 0.01,
@@ -56,11 +54,10 @@ function generatStakePoolsFakeData() {
   return stakePools;
 }
 
-const fakeStakePools = generatStakePoolsFakeData();
+const fakeStakePools = generateStakePoolsFakeData();
 // @TODO - remove flow fix and move fs to main process
 
 /* eslint-disable no-undef */
-// @ts-ignore
 fs.writeFileSync(
   `${path.join(__dirname, '/')}stakingStakePools.dummy.json`,
   JSON.stringify(fakeStakePools, null, '\t')
diff --git a/source/renderer/app/index.tsx b/source/renderer/app/index.tsx
index 2579b4d148..1dd930ec81 100755
--- a/source/renderer/app/index.tsx
+++ b/source/renderer/app/index.tsx
@@ -14,7 +14,7 @@ import Action from './actions/lib/Action';
 import translations from './i18n/translations';
 import '!style-loader!css-loader!sass-loader!./themes/index.global.scss'; // eslint-disable-line
 
-import { setupApi } from './api/index';
+import { setupApi } from './api';
 import LocalStorageApi from './api/utils/localStorage';
 import {
   DiscreetModeFeatureProvider,
diff --git a/source/renderer/webpack.config.js b/source/renderer/webpack.config.js
index ccea475ed0..fe1ea919c6 100644
--- a/source/renderer/webpack.config.js
+++ b/source/renderer/webpack.config.js
@@ -3,6 +3,9 @@ const webpack = require('webpack');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
+const { exec } = require('child_process');
+
+const isDevelopment = process.env.NODE_ENV === 'development';
 
 class DevMainPlugin {
   apply(compiler) {
@@ -25,10 +28,6 @@ class DevMainPlugin {
   }
 }
 
-const { exec } = require('child_process');
-
-const isDevelopment = process.env.NODE_ENV === 'development';
-
 module.exports = {
   entry: {
     index: './source/renderer/index.ts',
@@ -43,9 +42,6 @@ module.exports = {
   optimization: {
     minimize: false,
   },
-  resolve: {
-    extensions: ['.tsx', '.ts', '.js', '.json'],
-  },
   devServer: {
     hot: true,
     static: {
@@ -155,7 +151,6 @@ module.exports = {
     new webpack.EnvironmentPlugin({
       API_VERSION: 'dev',
       NETWORK: 'development',
-      MOBX_DEV_TOOLS: 'false',
       BUILD_NUMBER: 'dev',
     }),
     new HtmlWebpackPlugin({
@@ -167,6 +162,6 @@ module.exports = {
       filename: 'styles.css',
     }),
     isDevelopment && new ReactRefreshWebpackPlugin(),
-    isDevelopment && new DevMainPlugin(),
+    // isDevelopment && new DevMainPlugin(),
   ].filter(Boolean),
 };
diff --git a/storybook/stories/_support/StoryProvider.tsx b/storybook/stories/_support/StoryProvider.tsx
index 47de79a7a5..6ca5182710 100644
--- a/storybook/stories/_support/StoryProvider.tsx
+++ b/storybook/stories/_support/StoryProvider.tsx
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 // @ts-ignore ts-migrate(2305) FIXME: Module '"react"' has no exported member 'Node'.
 import type { Node } from 'react';
 import { Provider, observer } from 'mobx-react';
-import faker from 'faker';
+import faker from '@faker-js/faker';
 import { observable, computed, runInAction } from 'mobx';
 import BigNumber from 'bignumber.js';
 import moment from 'moment';
diff --git a/storybook/stories/_support/utils.ts b/storybook/stories/_support/utils.ts
index c3d7ad6d3c..da0139e63c 100644
--- a/storybook/stories/_support/utils.ts
+++ b/storybook/stories/_support/utils.ts
@@ -1,5 +1,5 @@
 import hash from 'hash.js';
-import faker from 'faker';
+import faker from '@faker-js/faker';
 import JSONBigInt from 'json-bigint';
 import moment from 'moment';
 import { get } from 'lodash';
@@ -200,7 +200,7 @@ export const generateTransaction = (
   metadata: TransactionMetadata = EXAMPLE_METADATA
 ) =>
   new WalletTransaction({
-    id: faker.random.uuid(),
+    id: faker.datatype.uuid(),
     title: '',
     type,
     amount: amount.plus(fee),
diff --git a/storybook/webpack.config.js b/storybook/webpack.config.js
index 3f6bbf82c0..bda2b67914 100644
--- a/storybook/webpack.config.js
+++ b/storybook/webpack.config.js
@@ -32,7 +32,7 @@ module.exports = async ({ config }) => {
             'bs58',
             'classnames',
             'es6-error',
-            'faker',
+            '@faker-js/faker',
             'humanize-duration',
             'lodash',
             'mobx',
diff --git a/tests/_utils/TestDecorator.tsx b/tests/_utils/TestDecorator.tsx
index 822945505e..364f1dd931 100644
--- a/tests/_utils/TestDecorator.tsx
+++ b/tests/_utils/TestDecorator.tsx
@@ -1,24 +1,28 @@
-import React, { Component, Children } from "react";
+import React from 'react';
 // @ts-ignore ts-migrate(2305) FIXME: Module '"react"' has no exported member 'Node'.
-import type { Node } from "react";
-import { ThemeProvider } from "react-polymorph/lib/components/ThemeProvider";
-import { IntlProvider, addLocaleData } from "react-intl";
-import { SimpleSkins } from "react-polymorph/lib/skins/simple";
-import { SimpleDefaults } from "react-polymorph/lib/themes/simple";
-import en from "react-intl/locale-data/en";
-import { daedalusTheme } from "../../source/renderer/app/themes/daedalus";
-import { themeOverrides } from "../../source/renderer/app/themes/overrides";
-import translations from "../../source/renderer/app/i18n/locales/en-US.json";
+import type { Node } from 'react';
+import { ThemeProvider } from 'react-polymorph/lib/components/ThemeProvider';
+import { IntlProvider } from 'react-intl';
+import { SimpleSkins } from 'react-polymorph/lib/skins/simple';
+import { SimpleDefaults } from 'react-polymorph/lib/themes/simple';
+import { daedalusTheme } from '../../source/renderer/app/themes/daedalus';
+import { themeOverrides } from '../../source/renderer/app/themes/overrides';
+import translations from '../../source/renderer/app/i18n/locales/en-US.json';
 
 type Props = {
   children: Node;
 };
-export function TestDecorator({
-  children
-}: Props) {
-  return <IntlProvider locale="en-US" messages={translations}>
-        <ThemeProvider theme={daedalusTheme} skins={SimpleSkins} variables={SimpleDefaults} themeOverrides={themeOverrides}>
-          {children}
-        </ThemeProvider>
-      </IntlProvider>;
-}
\ No newline at end of file
+export function TestDecorator({ children }: Props) {
+  return (
+    <IntlProvider locale="en-US" messages={translations}>
+      <ThemeProvider
+        theme={daedalusTheme}
+        skins={SimpleSkins}
+        variables={SimpleDefaults}
+        themeOverrides={themeOverrides}
+      >
+        {children}
+      </ThemeProvider>
+    </IntlProvider>
+  );
+}