Skip to content

Commit 828a18c

Browse files
authored
legacy mode merge
1 parent c85bcf6 commit 828a18c

File tree

253 files changed

+32358
-194
lines changed

Some content is hidden

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

253 files changed

+32358
-194
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ yarn.lock @input-output-hk/lace-core
77
/packages/common/ @input-output-hk/lace-core
88
/packages/core/ @input-output-hk/lace-core
99
/packages/e2e-tests/ @input-output-hk/xsy-lace-test-engineers
10+
/packages/nami/ @input-output-hk/lace-core
1011
/packages/staking/ @input-output-hk/lace-core
1112
/packages/translation/ @input-output-hk/lace-core
1213

.github/workflows/chromatic-nami.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Chromatic deploy packages/nami
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened, ready_for_review]
6+
paths:
7+
- packages/nami/**
8+
push:
9+
paths:
10+
- packages/nami/**
11+
branches:
12+
- main
13+
14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
16+
cancel-in-progress: true
17+
18+
jobs:
19+
chromatic-deployment:
20+
name: Chromatic Nami
21+
if: github.event.pull_request.draft == false
22+
runs-on: ubuntu-22.04
23+
steps:
24+
- name: Checkout repository
25+
uses: actions/checkout@v4
26+
with:
27+
fetch-depth: 0
28+
29+
- name: Setup Node.js and install dependencies
30+
uses: ./.github/actions/install
31+
with:
32+
WALLET_PASSWORD: ${{ secrets.WALLET_PASSWORD_TESTNET }}
33+
34+
- name: Build
35+
run: yarn workspaces foreach -Rpt -v --from '@lace/nami' run build
36+
37+
- name: Chromatic packages-nami
38+
uses: ./.github/actions/chromatic
39+
with:
40+
DIR: packages/nami
41+
NAME: packages-nami
42+
TOKEN: ${{ secrets.CHROMATIC_LACE_NAMI_TOKEN }}

.github/workflows/ci.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,12 @@ jobs:
7171
DIR: packages/staking
7272
NAME: packages-staking
7373

74+
- name: Build nami
75+
uses: ./.github/actions/build/package
76+
with:
77+
DIR: packages/nami
78+
NAME: packages-nami
79+
7480
unitTests:
7581
name: Unit tests
7682
runs-on: ubuntu-20.04
@@ -116,6 +122,12 @@ jobs:
116122
name: packages-staking
117123
path: packages/staking/dist
118124

125+
- name: Download packages-nami
126+
uses: actions/download-artifact@v4
127+
with:
128+
name: packages-nami
129+
path: packages/nami/dist
130+
119131
- name: Collect Workflow Telemetry Unit Tests
120132
uses: catchpoint/workflow-telemetry-action@v2
121133
with:
@@ -169,6 +181,12 @@ jobs:
169181
name: packages-staking
170182
path: packages/staking/dist
171183

184+
- name: Download packages-nami
185+
uses: actions/download-artifact@v4
186+
with:
187+
name: packages-nami
188+
path: packages/nami/dist
189+
172190
- name: Collect Workflow Telemetry Smoke Tests
173191
uses: catchpoint/workflow-telemetry-action@v2
174192
with:

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,5 @@ result
3434
!.yarn/releases
3535
!.yarn/sdks
3636
!.yarn/versions
37+
38+
yalc.lock

apps/browser-extension-wallet/package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,22 @@
4747
"@cardano-sdk/input-selection": "0.13.19",
4848
"@cardano-sdk/tx-construction": "0.21.4",
4949
"@cardano-sdk/util": "0.15.5",
50+
"@cardano-sdk/util-rxjs": "0.7.32",
5051
"@cardano-sdk/wallet": "0.44.3",
5152
"@cardano-sdk/web-extension": "0.34.2",
5253
"@emurgo/cip14-js": "~3.0.1",
5354
"@input-output-hk/lace-ui-toolkit": "1.21.0",
5455
"@lace/cardano": "0.1.0",
5556
"@lace/common": "0.1.0",
5657
"@lace/core": "0.1.0",
58+
"@lace/nami": "^0.1.0",
5759
"@lace/staking": "0.1.0",
5860
"@lace/translation": "0.1.0",
5961
"@pdfme/generator": "^4.0.2",
6062
"@react-rxjs/core": "^0.9.8",
6163
"@react-rxjs/utils": "^0.9.5",
6264
"@shiroyasha9/axios-fetch-adapter": "^1.0.3",
65+
"@xsy/nami-migration-tool": "file:./xsy-nami-migration-tool-0.0.39.tgz",
6366
"antd": "^4.24.10",
6467
"are-you-es5": "^2.1.2",
6568
"bignumber.js": "9.0.1",
@@ -90,7 +93,7 @@
9093
"react-router-dom": "5.2.0",
9194
"readable-stream": "^3.6.0",
9295
"rxjs": "7.4.0",
93-
"webextension-polyfill": "0.8.0",
96+
"webextension-polyfill": "0.10.0",
9497
"zustand": "3.5.14"
9598
},
9699
"devDependencies": {
@@ -106,13 +109,13 @@
106109
"@types/text-encoding-utf-8": "^1",
107110
"@types/uuid": "^8.3.4",
108111
"@types/w3c-web-hid": "^1.0.3",
109-
"@types/webextension-polyfill": "0.8.0",
112+
"@types/webextension-polyfill": "0.10.0",
110113
"dotenv-defaults": "5.0.2",
111114
"dotenv-webpack": "8.0.1",
112115
"eslint-plugin-prettier": "^4.0.0",
113116
"fake-indexeddb": "3.1.3",
114117
"fork-ts-checker-webpack-plugin": "^7.2.1",
115-
"jest-webextension-mock": "^3.7.19",
118+
"jest-webextension-mock": "^3.9.0",
116119
"text-encoding-utf-8": "^1.0.2",
117120
"tsconfig-paths-webpack-plugin": "3.5.2",
118121
"webassembly-loader-sw": "^1.1.0"
Lines changed: 9 additions & 0 deletions
Loading
Binary file not shown.
Binary file not shown.

apps/browser-extension-wallet/src/components/MainMenu/DropdownMenuOverlay/components/WalletAccounts.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,14 +236,16 @@ export const WalletAccounts = ({ isPopup, onBack }: { isPopup: boolean; onBack:
236236

237237
const renameAccount = useCallback(
238238
async (newAccountName: string) => {
239+
const account = wallet.accounts.find(({ accountIndex }) => accountIndex === editAccountDrawer.data.accountNumber);
240+
239241
await walletRepository.updateAccountMetadata({
240242
walletId: wallet.walletId,
241243
accountIndex: editAccountDrawer.data.accountNumber,
242-
metadata: { name: newAccountName }
244+
metadata: { ...account?.metadata, name: newAccountName }
243245
});
244246
editAccountDrawer.hide();
245247
},
246-
[walletRepository, wallet.walletId, editAccountDrawer]
248+
[walletRepository, wallet.walletId, editAccountDrawer, wallet.accounts]
247249
);
248250

249251
return (

apps/browser-extension-wallet/src/config.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export type Config = {
2525
CEXPLORER_BASE_URL: Record<EnvironmentTypes, string>;
2626
CEXPLORER_URL_PATHS: CExplorerUrlPaths;
2727
SAVED_PRICE_DURATION: number;
28+
DEFAULT_SUBMIT_API: string;
2829
};
2930

3031
// eslint-disable-next-line complexity
@@ -94,6 +95,7 @@ export const config = (): Config => {
9495
},
9596
SAVED_PRICE_DURATION: !Number.isNaN(Number(process.env.SAVED_PRICE_DURATION_IN_MINUTES))
9697
? Number(process.env.SAVED_PRICE_DURATION_IN_MINUTES)
97-
: 720
98+
: 720,
99+
DEFAULT_SUBMIT_API: 'http://localhost:8090/api/submit/tx'
98100
};
99101
};

0 commit comments

Comments
 (0)