Skip to content

Commit 088cf7e

Browse files
committed
Merge branch 'develop' into feature/ddw-952
# Conflicts: # CHANGELOG.md
2 parents a49ca20 + a0e800f commit 088cf7e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+307
-840
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,25 @@
55
### Features
66

77
- Improved UI regarding the Hardware Wallet public key export error ([PR 2922](https://github.com/input-output-hk/daedalus/pull/2922))
8+
- Added ASCII name to token header when metadata name is missing ([PR 2904](https://github.com/input-output-hk/daedalus/pull/2904))
9+
- Improved IPC by reducing the amount of messages from periodic events ([PR 2892](https://github.com/input-output-hk/daedalus/pull/2892))
810
- Improved RTS flags splash screen message ([PR 2901](https://github.com/input-output-hk/daedalus/pull/2901))
911
- Implemented error message when trying to leave wallet without enough ada to support tokens ([PR 2783](https://github.com/input-output-hk/daedalus/pull/2783))
1012

1113
### Fixes
1214

15+
- Fixed issue with missing character when copying address from PDF ([PR 2925](https://github.com/input-output-hk/daedalus/pull/2925))
16+
- Fixed stake pool list view overlapping news feed ([PR 2917](https://github.com/input-output-hk/daedalus/pull/2917))
17+
- Restored opacity for search icon when focused ([PR 2909](https://github.com/input-output-hk/daedalus/pull/2909))
1318
- Fixed styling of the incentivized testnet rewards wallet dropdown ([PR 2907](https://github.com/input-output-hk/daedalus/pull/2907))
1419
- Fix warning sign displayed when recommend decimals is zero ([PR 2905](https://github.com/input-output-hk/daedalus/pull/2905))
1520
- Fixed discrete tooltip being clipped by loading overlay when stake pools are adjusted ([PR 2902](https://github.com/input-output-hk/daedalus/pull/2902))
1621
- Sets minimum transaction fee to ada input field when tokens are removed ([PR 2918](https://github.com/input-output-hk/daedalus/pull/2918))
1722

1823
### Chores
1924

25+
- Using new faker.js ([PR 2855](https://github.com/input-output-hk/daedalus/pull/2855))
26+
- Removed `dockutil` due compatibility issues with MacOs Monterey 12.3 ([PR 2929](https://github.com/input-output-hk/daedalus/pull/2929))
2027
- Fixed spelling issues and typos ([PR 2915](https://github.com/input-output-hk/daedalus/pull/2915))
2128
- Removed SASS ts-lint ignore comments ([PR 2870](https://github.com/input-output-hk/daedalus/pull/2870))
2229
- Enabled debugging of the main process ([PR 2893](https://github.com/input-output-hk/daedalus/pull/2893))

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ If you get SSL error when running `nix-shell` (SSL peer certificate or SSH remot
6565

6666
1. Run `yarn nix:selfnode` from `daedalus`.
6767
2. Run `yarn dev` from the subsequent `nix-shell` (use `KEEP_LOCAL_CLUSTER_RUNNING` environment variable to keep the local cluster running after Daedalus exits: `KEEP_LOCAL_CLUSTER_RUNNING=true yarn dev`)
68+
1. Alternatively: run `yarn nix:selfnode yarn dev` to achieve the same thing in a single command. Note: after `yarn dev` exits, you will still remain in the `nix-shell`.
6869
3. Once Daedalus has started and has gotten past the loading screen run the following commands from a new terminal window if you wish to import funded wallets:
6970
- Byron wallets: `yarn byron:wallet:importer`
7071
- Shelley wallets: `yarn shelley:wallet:importer`
@@ -94,31 +95,37 @@ If you get SSL error when running `nix-shell` (SSL peer certificate or SSH remot
9495

9596
1. Run `yarn nix:mainnet` from `daedalus`.
9697
2. Run `yarn dev` from the subsequent `nix-shell`
98+
3. Or in one command: `yarn nix:mainnet yarn dev`
9799

98100
#### Flight
99101

100102
1. Run `yarn nix:flight` from `daedalus`.
101103
2. Run `yarn dev` from the subsequent `nix-shell`
104+
3. Or in one command: `yarn nix:flight yarn dev`
102105

103106
#### Testnet
104107

105108
1. Run `yarn nix:testnet` from `daedalus`.
106109
2. Run `yarn dev` from the subsequent `nix-shell`
110+
3. Or in one command: `yarn nix:testnet yarn dev`
107111

108112
#### Staging
109113

110114
1. Run `yarn nix:staging` from `daedalus`.
111115
2. Run `yarn dev` from the subsequent `nix-shell`
116+
3. Or in one command: `yarn nix:staging yarn dev`
112117

113118
#### Shelley QA
114119

115120
1. Run `yarn nix:shelley_qa` from `daedalus`.
116121
2. Run `yarn dev` from the subsequent `nix-shell`
122+
3. Or in one command: `yarn nix:shelley_qa yarn dev`
117123

118124
#### Alonzo Purple
119125

120126
1. Run `yarn nix:alonzo_purple` from `daedalus`.
121127
2. Run `yarn dev` from the subsequent `nix-shell`
128+
3. Or in one command: `yarn nix:alonzo_purple yarn dev`
122129

123130
#### Native token metadata server
124131

installers/common/MacInstaller.hs

Lines changed: 12 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -177,27 +177,6 @@ codeSignEntitlements = [r|<?xml version="1.0" encoding="UTF-8"?>
177177
</dict>
178178
</plist>|]
179179

180-
makePostInstall :: Format a (Text -> a)
181-
makePostInstall = "#!/usr/bin/env bash\n" %
182-
"#\n" %
183-
"# See /var/log/install.log to debug this\n" %
184-
"\n" %
185-
"src_pkg=\"$1\"\ndst_root=\"$2\"\ndst_mount=\"$3\"\nsys_root=\"$4\"\n" %
186-
"./dockutil --add \"${dst_root}/" % s % "\" --allhomes\n"
187-
188-
makeScriptsDir :: Options -> DarwinConfig -> Managed T.Text
189-
makeScriptsDir Options{oBackend} DarwinConfig{dcAppNameApp} = case oBackend of
190-
Cardano _ -> common
191-
where
192-
common = do
193-
tmp <- fromString <$> (liftIO $ getEnv "TMP")
194-
tempdir <- mktempdir tmp "scripts"
195-
liftIO $ do
196-
cp "data/scripts/dockutil" (tempdir </> "dockutil")
197-
writeTextFile (tempdir </> "postinstall") (format makePostInstall dcAppNameApp)
198-
chmod executable (tempdir </> "postinstall")
199-
pure $ tt tempdir
200-
201180
makeSigningDir :: Managed (T.Text, T.Text)
202181
makeSigningDir = do
203182
tmp <- fromString <$> (liftIO $ getEnv "TMP")
@@ -389,27 +368,21 @@ makeComponentRoot Options{oBackend,oCluster} appRoot darwinConfig@DarwinConfig{d
389368
exit $ ExitFailure 1
390369

391370
makeInstaller :: Options -> DarwinConfig -> FilePath -> FilePath -> IO FilePath
392-
makeInstaller opts@Options{oOutputDir} darwinConfig@DarwinConfig{dcPkgName} componentRoot pkg = do
371+
makeInstaller Options{oOutputDir} DarwinConfig{dcPkgName} componentRoot pkg = do
393372
echo "Making installer ..."
394-
let tempPkg1 = format fp (oOutputDir </> pkg)
395-
tempPkg2 = oOutputDir </> (dropExtension pkg <.> "unsigned" <.> "pkg")
373+
let
374+
tempPkg1 = format fp (oOutputDir </> pkg)
375+
tempPkg2 = oOutputDir </> (dropExtension pkg <.> "unsigned" <.> "pkg")
376+
pkgargs :: [ T.Text ]
377+
pkgargs =
378+
[ "--identifier", dcPkgName
379+
, "--component", tt componentRoot
380+
, "--install-location", "/Applications"
381+
, tempPkg1
382+
]
396383

397384
mktree oOutputDir
398-
with (makeScriptsDir opts darwinConfig) $ \scriptsDir -> do
399-
let
400-
pkgargs :: [ T.Text ]
401-
pkgargs =
402-
[ "--identifier"
403-
, dcPkgName
404-
, "--scripts", scriptsDir
405-
, "--component"
406-
, tt componentRoot
407-
, "--install-location"
408-
, "/Applications"
409-
, tempPkg1
410-
]
411-
run "ls" [ "-ltrh", scriptsDir ]
412-
run "pkgbuild" pkgargs
385+
run "pkgbuild" pkgargs
413386

414387
run "productbuild" [ "--product", "data/plist"
415388
, "--package", tempPkg1

0 commit comments

Comments
 (0)