Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/6.11.1 #4416

Merged
merged 38 commits into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
796c3b6
kyranjamie Oct 13, 2023
176ac33
ci: add merge back msg
kyranjamie Oct 13, 2023
c006894
fix: refactor modals to overlay on top of backgroundLocation consiste…
pete-watters Oct 4, 2023
10b7246
fix: close original recieve modal before opening qr code modal to pre…
pete-watters Oct 9, 2023
e4bfd24
fix: use independant route for FundReceiveStx
pete-watters Oct 10, 2023
a3710c5
chore: deprecate unused routes
pete-watters Oct 10, 2023
8645144
wip: debug ledger tests
pete-watters Oct 11, 2023
e7c8d8d
fix: allow direct access to /receive/stx
pete-watters Oct 12, 2023
5826143
fix: get build passing
pete-watters Oct 12, 2023
77a4822
fix: clean code
pete-watters Oct 12, 2023
0dbbdcf
chore: explore routing issues
kyranjamie Oct 12, 2023
12571b0
fix: re-introduce bg location for hometabs so modals overlay on top o…
pete-watters Oct 13, 2023
1477c96
fix: do not nest recieve sub routes to prevent double overlay of moda…
pete-watters Oct 13, 2023
36c969f
fix: enable bg redirect to overlay modal in new tab
pete-watters Oct 13, 2023
2c897ab
fix: update path to receive stx to fix test
pete-watters Oct 13, 2023
07c5c98
fix: use bg location to open in new tab. share modal bg logic
pete-watters Oct 13, 2023
200907a
fix: pass child routes as children to appease dep cruiser
pete-watters Oct 13, 2023
993df34
fix: clean code, add note re ordinals modal
pete-watters Oct 13, 2023
a06aa39
fix: clean code, add note re ordinals modal
pete-watters Oct 13, 2023
d79ee62
fix: improve type loading
kyranjamie Oct 13, 2023
529c03d
fix: use grid for asset rows to stop overflow while allowing width, c…
pete-watters Oct 16, 2023
bd25751
fix: align text and caption left so it appears correctly in extension…
pete-watters Oct 16, 2023
ceaf228
fix: use network.chain.bitcoin.url in api hooks, closes #4330
friedger Oct 17, 2023
47aa2e2
feat: rework onboarding ledger flow, closes #4281
alter-eggo Oct 17, 2023
618923f
fix: ledger tx sign error process
alter-eggo Oct 17, 2023
3903ba1
feat: add connect btn
alter-eggo Oct 17, 2023
2febd49
feat: add unsupported browsers modal
alter-eggo Oct 17, 2023
ddc91e3
fix: wallet type definition
alter-eggo Oct 18, 2023
ce13789
fix: change acc bug
alter-eggo Oct 18, 2023
a28678d
feat: added bitcoin contract list page and entry point
Polybius93 Oct 18, 2023
db35a49
fix: code spanning past viewport width
kyranjamie Oct 18, 2023
0817a5e
fix: welcome page header padding, closes #4374
kyranjamie Oct 18, 2023
e437710
fix: revert drawer changes from brand audit, closes #4249
pete-watters Oct 18, 2023
77056e7
chore: debug window close util
kyranjamie Oct 18, 2023
017fa3a
refactor: local copyToClipboard hook
kyranjamie Oct 18, 2023
a0717e3
feat: return addresses of regtest and signet
friedger Oct 18, 2023
157f97e
feat: added tests for bitcoin contract request
Polybius93 Oct 19, 2023
e71e457
refactor: psbt stackui layout
kyranjamie Oct 23, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ module.exports = {
property: 'open',
message: avoidWindowOpenMsg,
},
{
object: 'window',
property: 'close',
message: 'Use `closeWindow` utility helper',
},
],
'@typescript-eslint/no-floating-promises': ['warn'],
'@typescript-eslint/no-unnecessary-type-assertion': ['warn'],
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/build-extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ jobs:
set-in-progress-message:
if: github.repository == 'leather-wallet/extension' && github.actor != 'dependabot[bot]'
runs-on: ubuntu-latest
needs:
- pre-run
steps:
- name: Make short commit SHA
run: echo "SHORT_SHA=`echo ${{ github.event.pull_request.head.sha }} | cut -c1-7`" >> $GITHUB_ENV

- uses: kyranjamie/[email protected]
with:
header: '> _Building Leather_'
header: '> _Building Leather at commit `${{ env.SHORT_SHA }}`_'
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build:
Expand All @@ -29,28 +30,27 @@ jobs:
strategy:
matrix:
target: [chromium, firefox]
env:
WALLET_ENVIRONMENT: feature
TARGET_BROWSER: ${{ matrix.target }}
COINBASE_APP_ID: ${{ secrets.COINBASE_APP_ID }}
MOONPAY_API_KEY: ${{ secrets.MOONPAY_API_KEY }}
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
SEGMENT_WRITE_KEY: ${{ secrets.SEGMENT_WRITE_KEY_STAGING }}
TRANSAK_API_KEY: ${{ secrets.TRANSAK_API_KEY }}
PR_NUMBER: ${{ github.event.number }}
COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}

- uses: ./.github/actions/provision

- name: Add SHORT_SHA env property with commit short sha
run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
- run: echo "SHORT_SHA=`echo ${{ github.event.pull_request.head.sha }} | cut -c1-7`" >> $GITHUB_ENV

- name: Build project
run: yarn build
env:
WALLET_ENVIRONMENT: feature
TARGET_BROWSER: ${{ matrix.target }}
COINBASE_APP_ID: ${{ secrets.COINBASE_APP_ID }}
MOONPAY_API_KEY: ${{ secrets.MOONPAY_API_KEY }}
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
SEGMENT_WRITE_KEY: ${{ secrets.SEGMENT_WRITE_KEY_STAGING }}
TRANSAK_API_KEY: ${{ secrets.TRANSAK_API_KEY }}
PR_NUMBER: ${{ github.event.number }}
COMMIT_SHA: ${{ env.SHORT_SHA }}

- uses: actions/upload-artifact@v3
name: Upload ${{ matrix.target }} Extension Zip
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/create-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,5 @@ jobs:
type: now
from_branch: main
target_branch: dev
message: 'chore: post-release merge back'
github_token: ${{ secrets.SEMANTIC_RELEASE_TOKEN }}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
"@babel/preset-typescript": "7.23.0",
"@btckit/types": "0.0.19",
"@ls-lint/ls-lint": "2.1.0",
"@pandacss/dev": "0.15.4",
"@pandacss/dev": "0.16.0",
"@playwright/test": "1.38.1",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
"@redux-devtools/cli": "3.0.2",
Expand Down
218 changes: 0 additions & 218 deletions public/assets/base.css
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
/*
* Web Fonts from colophon-foundry.org
*
* The fonts included in this stylesheet are subject to the End User License you purchased
* from Colophon Foundry. The fonts are protected under domestic and international trademark and
* copyright law. You are prohibited from modifying, reverse engineering, duplicating, or
* distributing this font software.
*
* (c) 2023 Colophon Foundry
*
* Licenced to Trustmachines,
*/

@font-face {
font-family: 'Diatype';
src: url('/assets/fonts/diatype/diatype-regular.woff2') format('woff2');
Expand Down Expand Up @@ -55,208 +42,3 @@
font-weight: 400;
font-style: normal;
}

html,
body {
-webkit-font-smoothing: antialiased;
font-size: 100%;
line-height: 1.15;
-webkit-text-size-adjust: 100%;
}

html,
body {
font-family: 'Diatype', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif,
'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
}

body {
margin: 0;
}

main {
display: block;
}

h1 {
font-size: 2em;
margin: 0.67em 0;
}

hr {
box-sizing: content-box;
height: 0;
overflow: visible;
}

pre {
font-family: 'Fira Code', monospace;
font-size: 1em;
}

code {
font-family: 'Fira Code', monospace;
}

a {
background-color: transparent;
}

abbr[title] {
border-bottom: none;
text-decoration: underline;
text-decoration: underline dotted;
}

b,
strong {
font-weight: bolder;
}

code,
kbd,
samp {
font-family: monospace, monospace;
font-size: 1em;
}

small {
font-size: 80%;
}

sub,
sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}

sub {
bottom: -0.25em;
}

sup {
top: -0.5em;
}

img {
border-style: none;
}

button,
input,
optgroup,
select,
textarea {
font-family: inherit;
font-size: 100%;
line-height: 1.15;
margin: 0;
}

button,
input {
overflow: visible;
}

button,
select {
text-transform: none;
}

button,
[type='button'],
[type='reset'],
[type='submit'] {
-webkit-appearance: button;
}

button::-moz-focus-inner,
[type='button']::-moz-focus-inner,
[type='reset']::-moz-focus-inner,
[type='submit']::-moz-focus-inner {
border-style: none;
padding: 0;
}

button:-moz-focusring,
[type='button']:-moz-focusring,
[type='reset']:-moz-focusring,
[type='submit']:-moz-focusring {
outline: 1px dotted ButtonText;
}

fieldset {
padding: 0.35em 0.75em 0.625em;
}

legend {
box-sizing: border-box;
color: inherit;
display: table;
max-width: 100%;
padding: 0;
white-space: normal;
}

progress {
vertical-align: baseline;
}

textarea {
overflow: auto;
}

[type='checkbox'],
[type='radio'] {
box-sizing: border-box;
padding: 0;
}

[type='number']::-webkit-inner-spin-button,
[type='number']::-webkit-outer-spin-button {
-webkit-appearance: none;
height: auto;
margin: 0;
}

[type='search'] {
-webkit-appearance: textfield;
outline-offset: -2px;
}

[type='search']::-webkit-search-decoration {
-webkit-appearance: none;
}

::-webkit-file-upload-button {
-webkit-appearance: button;
font: inherit;
}

details {
display: block;
}

summary {
display: list-item;
}

template {
display: none;
}

[hidden] {
display: none;
}

h1,
h2,
h3,
h4,
h5,
h6 {
font-family: 'Diatype', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial,
sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
}
Binary file removed public/assets/images/ledger/connect-ledger-error.png
Binary file not shown.
2 changes: 1 addition & 1 deletion public/html/debug.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html class="mode__full-page light">
<head>
<meta charset="UTF-8" />
Expand Down
2 changes: 1 addition & 1 deletion public/html/devtool.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html class="mode__devtool">
<head>
<meta charset="UTF-8" />
Expand Down
30 changes: 29 additions & 1 deletion public/html/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html class="mode__full-page light">
<!--
Hello! Thanks for showing interest in our code.
Expand All @@ -9,6 +9,34 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link href="/assets/base.css" rel="stylesheet" />
<link
rel="preload"
href="/assets/fonts/diatype/diatype-light.woff2"
as="font"
crossorigin
type="font/woff2"
/>
<link
rel="preload"
href="/assets/fonts/diatype/diatype-medium.woff2"
as="font"
crossorigin
type="font/woff2"
/>
<link
rel="preload"
href="/assets/fonts/diatype/diatype-regular.woff2"
as="font"
crossorigin
type="font/woff2"
/>
<link
rel="preload"
href="/assets/fonts/marche/marche-super-pro.woff2"
as="font"
crossorigin
type="font/woff2"
/>
</head>
<body>
<div id="app"></div>
Expand Down
2 changes: 1 addition & 1 deletion public/html/popup-center.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html class="mode__popup-center light">
<head>
<meta charset="UTF-8" />
Expand Down
2 changes: 1 addition & 1 deletion public/html/popup.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html class="mode__popup light">
<head>
<meta charset="UTF-8" />
Expand Down
4 changes: 4 additions & 0 deletions src/app/common/authentication/use-finish-auth-request.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,14 @@ export function useFinishAuthRequest() {
p2tr: {
mainnet: taprootAccount.mainnet.payment.address,
testnet: taprootAccount.testnet.payment.address,
regtest: taprootAccount.regtest.payment.address,
signet: taprootAccount.signet.payment.address,
},
p2wpkh: {
mainnet: nativeSegwitAccount.mainnet.payment.address,
testnet: nativeSegwitAccount.testnet.payment.address,
regtest: nativeSegwitAccount.regtest.payment.address,
signet: nativeSegwitAccount.signet.payment.address,
},
},
btcPublicKey: {
Expand Down
Loading
Loading