Skip to content

Commit 87825dd

Browse files
Merge branch 'develop' into feature/ddw-970
2 parents 8fb0968 + 150a0b9 commit 87825dd

File tree

3 files changed

+26
-2
lines changed

3 files changed

+26
-2
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ Debug
124124
/cardano-cli
125125
/cardano-wallet
126126
.vscode
127+
.yalc
128+
yalc.lock
127129

128130
# Typescript
129131
*.scss.d.ts

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
### Chores
1414

15+
- Added steps on how to link with `react-polymorph` and other external UI libraries ([PR 2948](https://github.com/input-output-hk/daedalus/pull/2948))
1516
- Published selfnode installers for all 3 platforms ([PR 2971](https://github.com/input-output-hk/daedalus/pull/2971))
1617

1718
## 4.10.0
@@ -100,12 +101,12 @@
100101

101102
### Fixes
102103

103-
- Improved error handling for incorrect passphrase and incorrect hardware wallet error ([PR 2860](https://github.com/input-output-hk/daedalus/pull/2860))
104+
- Improved error handling for incorrect passphrase and incorrect hardware wallet error ([PR 2860](https://github.com/input-output-hk/daedalus/pull/2860))
104105
- Fixed rewards CSV export issues ([PR 2885](https://github.com/input-output-hk/daedalus/pull/2885))
105106
- Fixed behaviour of wallet settings option of the app menu ([PR 2838](https://github.com/input-output-hk/daedalus/pull/2838))
106107
- Fixed styling of ITN rewards feature ([PR 2861](https://github.com/input-output-hk/daedalus/pull/2861))
107108
- Fixed available disk space takes a long time to show ([PR 2849](https://github.com/input-output-hk/daedalus/pull/2849))
108-
109+
109110
### Chores
110111

111112
- Migrated codebase from javascript to typescript ([PR 2843](https://github.com/input-output-hk/daedalus/pull/2843))

README.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ Daedalus - Cryptocurrency Wallet
4242
trusted-substituters =
4343
trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
4444
extra-sandbox-paths = /System/Library/Frameworks /System/Library/PrivateFrameworks /usr/lib
45+
experimental-features = nix-command flakes
4546
4647
# If you are running on a Mac with M1 chip please uncomment 'system' setting to enforce running on Rosetta2
4748
# system = x86_64-darwin
@@ -207,6 +208,26 @@ You can debug the main process by following one of these approaches:
207208

208209
The inspector runs on port 9229
209210

211+
### Linking with UI Libraries (e.g. React Polymorph)
212+
213+
You can link libraries with Daedalus using one of the following steps:
214+
215+
#### 1) Using `yalc`
216+
217+
1) Install `yalc` globally using `yarn global add yalc`.
218+
2) Run `yalc publish` from the library's root directory that you want to link with Daedalus.
219+
3) Switch to Daedalus and run `yalc add <package-name>` or preferably `yalc link <package-name>`.
220+
4) You should be able to start Daedalus and see the changes you are making locally in the library.
221+
5) To make sure your changes are reflected as you update code in the library, use `yalc push`.
222+
223+
#### 2) Using `yarn link`
224+
225+
1) From the Daedalus root directory, go to `node_modules/react` and `yarn link`.
226+
2) Navigate to the `react-dom` package in the same directory and run `yarn link` again.
227+
3) Go to the library's root directory and run `yarn link`, `yarn link react` and `yarn link react-dom`.
228+
4) Go back to the Daedalus root directory and run `yarn link <package-name>`.
229+
5) Finally, run `yarn build:watch` from the library's root directory.
230+
210231
## Testing
211232

212233
You can find more details regarding tests setup within

0 commit comments

Comments
 (0)