Skip to content

Commit d5bc852

Browse files
committed
feat: improve icon for midnight wallet
1 parent a788d37 commit d5bc852

File tree

7 files changed

+61
-37
lines changed

7 files changed

+61
-37
lines changed

v1/apps/browser-extension-wallet/src/components/MainMenu/DropdownMenuOverlay/DropdownMenuOverlay.module.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,3 +227,7 @@
227227
.walletOptionBitcoin > div {
228228
background: var(--data-orange);
229229
}
230+
231+
.walletOptionMidnight > div {
232+
background: var(--data-bright-blue);
233+
}

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ export const UserInfo = ({
196196
);
197197

198198
const renderLmpWallet = useCallback(
199-
({ walletIcon, walletId, walletName }: LmpBundleWallet, isLast: boolean) => (
199+
({ walletId, walletName }: LmpBundleWallet, isLast: boolean) => (
200200
<div key={walletId}>
201201
<ProfileDropdown.WalletOption
202202
style={{ textAlign: 'left' }}
@@ -206,8 +206,11 @@ export const UserInfo = ({
206206
onClick={switchToLMP}
207207
type={'hot'}
208208
profile={{
209-
fallbackText: walletName,
210-
imageSrc: walletIcon
209+
customProfileComponent: (
210+
<span className={styles.walletOptionMidnight}>
211+
<ProfileDropdown.WalletIcon type="hot" testId={'wallet-option-icon'} />
212+
</span>
213+
)
211214
}}
212215
/>
213216
{isLast ? undefined : <Separator />}

v1/apps/browser-extension-wallet/src/lib/scripts/background/services/lmpService.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,12 @@ const api: BundleAppApi = {
5252
map((wallets) =>
5353
wallets.map(
5454
(wallet): LmpBundleWallet => ({
55-
// TODO: icon should be different based on wallet type (same as in v1 dropdown menu)
5655
walletIcon: isBitcoinWallet(wallet) ? bitcoinLogo : cardanoLogo,
5756
walletId: wallet.walletId,
5857
walletName: wallet.metadata.name,
59-
encryptedRecoveryPhrase: isInMemoryWallet(wallet) ? wallet.encryptedSecrets.keyMaterial : undefined
58+
encryptedRecoveryPhrase: isInMemoryWallet(wallet) ? wallet.encryptedSecrets.keyMaterial : undefined,
59+
blockchain: isBitcoinWallet(wallet) ? 'Bitcoin' : 'Cardano',
60+
walletType: wallet.type
6061
})
6162
)
6263
)

v1/apps/browser-extension-wallet/src/utils/lmp.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
// mostly duplicated in v1 and lmp module, could be a shared library
2-
import { RemoteApiProperties, RemoteApiPropertyType } from '@cardano-sdk/web-extension';
2+
import { RemoteApiProperties, RemoteApiPropertyType, WalletType } from '@cardano-sdk/web-extension';
33
import { Observable } from 'rxjs';
44
import { storage } from 'webextension-polyfill';
55
import { Language } from '@lace/translation';
66

7+
export type BlockchainName = 'Bitcoin' | 'Cardano' | 'Midnight';
8+
79
export type LmpBundleWallet = {
810
walletId: string;
911
walletName: string;
1012
walletIcon: string;
1113
encryptedRecoveryPhrase?: string;
14+
blockchain: BlockchainName;
15+
walletType: WalletType;
1216
};
1317

1418
export type BundleAppApi = {

v1/apps/browser-extension-wallet/src/views/browser-view/features/dapp/explorer/styles/themes/_shared-colors.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ $data: (
1111
'pink-10': rgba(255, 84, 112, 0.1),
1212
'orange': #ff8e3c,
1313
'green': #2cb67d,
14-
'blue': #3489f7
14+
'blue': #3489f7,
15+
'bright-blue': #0000FE
1516
);

v1/packages/common/src/ui/styles/themes/_shared-colors.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@ $data: (
1212
'pink-10': rgba(255, 84, 112, 0.1),
1313
'orange': #ff8e3c,
1414
'green': #2cb67d,
15-
'blue': #3489f7
15+
'blue': #3489f7,
16+
'bright-blue': #0000FE
1617
);

yarn.lock

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,13 @@ __metadata:
393393
languageName: node
394394
linkType: hard
395395

396+
"async-generator-function@npm:^1.0.0":
397+
version: 1.0.0
398+
resolution: "async-generator-function@npm:1.0.0"
399+
checksum: 74a71a4a2dd7afd06ebb612f6d612c7f4766a351bedffde466023bf6dae629e46b0d2cd38786239e0fbf245de0c7df76035465e16d1213774a0efb22fec0d713
400+
languageName: node
401+
linkType: hard
402+
396403
"available-typed-arrays@npm:^1.0.7":
397404
version: 1.0.7
398405
resolution: "available-typed-arrays@npm:1.0.7"
@@ -409,12 +416,12 @@ __metadata:
409416
languageName: node
410417
linkType: hard
411418

412-
"baseline-browser-mapping@npm:^2.8.25":
413-
version: 2.8.30
414-
resolution: "baseline-browser-mapping@npm:2.8.30"
419+
"baseline-browser-mapping@npm:^2.9.0":
420+
version: 2.9.2
421+
resolution: "baseline-browser-mapping@npm:2.9.2"
415422
bin:
416423
baseline-browser-mapping: dist/cli.js
417-
checksum: d10303cea329afc702e6d7cba4ecae234a6c056352c20dbbb23658fa93c233474193d98e10e9d0cc98c171ee465660e93d9bf3374b2e17fdbb3a0be801792a32
424+
checksum: 8b4281a246ecc7dcb949c2e2c1c5b40433bc84af7d0e2d61e1666223e1c09e1c6d47ab41ebefe80fe503c0e0a88afea88171d8231fef707f9cde911d874189d7
418425
languageName: node
419426
linkType: hard
420427

@@ -429,17 +436,17 @@ __metadata:
429436
linkType: hard
430437

431438
"browserslist@npm:^4.26.3":
432-
version: 4.28.0
433-
resolution: "browserslist@npm:4.28.0"
439+
version: 4.28.1
440+
resolution: "browserslist@npm:4.28.1"
434441
dependencies:
435-
baseline-browser-mapping: ^2.8.25
436-
caniuse-lite: ^1.0.30001754
437-
electron-to-chromium: ^1.5.249
442+
baseline-browser-mapping: ^2.9.0
443+
caniuse-lite: ^1.0.30001759
444+
electron-to-chromium: ^1.5.263
438445
node-releases: ^2.0.27
439-
update-browserslist-db: ^1.1.4
446+
update-browserslist-db: ^1.2.0
440447
bin:
441448
browserslist: cli.js
442-
checksum: c19fe2c6f123851d899d5b207f76de93064e247931e32ca0adcaceb3b48aec65c7c3310c0dc969de96922d488af7de0a0b77b41505e7dfa0a8d3736500748e11
449+
checksum: 895357d912ae5a88a3fa454d2d280e9869e13432df30ca8918e206c0783b3b59375b178fdaf16d0041a1cf21ac45c8eb0a20f96f73dbd9662abf4cf613177a1e
443450
languageName: node
444451
linkType: hard
445452

@@ -482,10 +489,10 @@ __metadata:
482489
languageName: node
483490
linkType: hard
484491

485-
"caniuse-lite@npm:^1.0.30001754":
486-
version: 1.0.30001756
487-
resolution: "caniuse-lite@npm:1.0.30001756"
488-
checksum: abcbb01eceb921f3462721792ede7ab9dc95eb676e2f6873837ebf5c163f5fe74a629de20b56b8bd10147af2ba255a608d422e72597149e19c91b9b760593bb6
492+
"caniuse-lite@npm:^1.0.30001759":
493+
version: 1.0.30001759
494+
resolution: "caniuse-lite@npm:1.0.30001759"
495+
checksum: db200cf52ab976df18aaf75415e4c407a989bd538ac195f8ddd0993f0e158cfe0d048c26c0161b0409ed754745ea82830abbcbecace4afef9f1ecc9a4c0a0a50
489496
languageName: node
490497
linkType: hard
491498

@@ -667,10 +674,10 @@ __metadata:
667674
languageName: node
668675
linkType: hard
669676

670-
"electron-to-chromium@npm:^1.5.249":
671-
version: 1.5.259
672-
resolution: "electron-to-chromium@npm:1.5.259"
673-
checksum: 8711e642257f83d3f17b15917389e95a4da047f680976c48fb00eb6a6868e55f2d300eb6359be745a93ef0fe7720e93a72302f199284039bc453bcb1684772e6
677+
"electron-to-chromium@npm:^1.5.263":
678+
version: 1.5.264
679+
resolution: "electron-to-chromium@npm:1.5.264"
680+
checksum: b8e12508ce9805f3ba012749670aec56c7995aa3387729589f7c7d477d4c46d00e6eefc8c3eb18ae44ddb70dd09d1b5e058075234d4979cad032d9c77f7b02ec
674681
languageName: node
675682
linkType: hard
676683

@@ -685,11 +692,11 @@ __metadata:
685692
linkType: hard
686693

687694
"envinfo@npm:^7.14.0":
688-
version: 7.20.0
689-
resolution: "envinfo@npm:7.20.0"
695+
version: 7.21.0
696+
resolution: "envinfo@npm:7.21.0"
690697
bin:
691698
envinfo: dist/cli.js
692-
checksum: 5e7e7a4ec5b445939efd2634a8f2d7f926d6f79ae872acf5d7ebd46387f74b7c700667b2ffa795c109e53e70389e46c38726f24a834448dbddfc53f63376f5cb
699+
checksum: c9526266810a328396c387c0580d6fc10f6ce8464074ae6eaef6798e2a05b5800b480b2eaf739cf523e3bfb407baba2ef23ff8edebb76c2b8fa7fbac995b3b9b
693700
languageName: node
694701
linkType: hard
695702

@@ -968,20 +975,23 @@ __metadata:
968975
linkType: hard
969976

970977
"get-intrinsic@npm:^1.2.4, get-intrinsic@npm:^1.2.5, get-intrinsic@npm:^1.2.6, get-intrinsic@npm:^1.2.7, get-intrinsic@npm:^1.3.0":
971-
version: 1.3.0
972-
resolution: "get-intrinsic@npm:1.3.0"
978+
version: 1.3.1
979+
resolution: "get-intrinsic@npm:1.3.1"
973980
dependencies:
981+
async-function: ^1.0.0
982+
async-generator-function: ^1.0.0
974983
call-bind-apply-helpers: ^1.0.2
975984
es-define-property: ^1.0.1
976985
es-errors: ^1.3.0
977986
es-object-atoms: ^1.1.1
978987
function-bind: ^1.1.2
988+
generator-function: ^2.0.0
979989
get-proto: ^1.0.1
980990
gopd: ^1.2.0
981991
has-symbols: ^1.1.0
982992
hasown: ^2.0.2
983993
math-intrinsics: ^1.1.0
984-
checksum: 301008e4482bb9a9cb49e132b88fee093bff373b4e6def8ba219b1e96b60158a6084f273ef5cafe832e42cd93462f4accb46a618d35fe59a2b507f2388c5b79d
994+
checksum: c02b3b6a445f9cd53e14896303794ac60f9751f58a69099127248abdb0251957174c6524245fc68579dc8e6a35161d3d94c93e665f808274716f4248b269436a
985995
languageName: node
986996
linkType: hard
987997

@@ -2343,17 +2353,17 @@ __metadata:
23432353
languageName: node
23442354
linkType: hard
23452355

2346-
"update-browserslist-db@npm:^1.1.4":
2347-
version: 1.1.4
2348-
resolution: "update-browserslist-db@npm:1.1.4"
2356+
"update-browserslist-db@npm:^1.2.0":
2357+
version: 1.2.2
2358+
resolution: "update-browserslist-db@npm:1.2.2"
23492359
dependencies:
23502360
escalade: ^3.2.0
23512361
picocolors: ^1.1.1
23522362
peerDependencies:
23532363
browserslist: ">= 4.21.0"
23542364
bin:
23552365
update-browserslist-db: cli.js
2356-
checksum: b757805a63d7954985753c97a48e313abd2d35f2bb10d2bffa65d73a4b81ec9e1305a7b06296819bac8a6b4db8e7be88582487fae2ad7e24731e4ee372b919a6
2366+
checksum: 1b3b916c932d95a7a92c5a801b9e1d7c64722265cbae4675a808f7695fc6ada11d51ce674b4140ee8e323216124ffae9b05935fe82678698188a809dcf44c708
23572367
languageName: node
23582368
linkType: hard
23592369

0 commit comments

Comments
 (0)