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

v1.1 Test Release #52

Merged
merged 118 commits into from
Jan 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
6f71a99
add full node support
KayBeSee Sep 1, 2020
e55ba43
full node support
KayBeSee Sep 1, 2020
7911130
Merge pull request #23 from KayBeSee/full-node
KayBeSee Sep 1, 2020
ed887b3
update setup wizard to be less confusing, refactor
KayBeSee Sep 1, 2020
e94dfeb
Merge pull request #24 from KayBeSee/wizard-redo-refactor
KayBeSee Sep 1, 2020
6d2bdb3
merge
KayBeSee Sep 2, 2020
85b9433
initial styling
KayBeSee Sep 3, 2020
85f689c
initial commit for titlebar and sidebar
KayBeSee Sep 4, 2020
249f065
add OutsideClick component to dropdown
KayBeSee Sep 4, 2020
4846b2e
add switching between bitcoin core, blockstream, and custom node to t…
KayBeSee Sep 11, 2020
37848b1
merge
KayBeSee Sep 11, 2020
f7630dd
fixes 13
KayBeSee Sep 12, 2020
06ef0f2
Merge pull request #32 from KayBeSee/fix-13-overlap
KayBeSee Sep 12, 2020
5b4c7f5
merge
KayBeSee Sep 16, 2020
36174a5
move fee estimate logic to main
KayBeSee Sep 16, 2020
df60961
fixes issue #14
KayBeSee Sep 16, 2020
22a1982
save config to app data directory
KayBeSee Sep 21, 2020
56a9e5b
merge password screen
KayBeSee Sep 21, 2020
605407e
merge in password confirmation branch, update some styles
KayBeSee Sep 21, 2020
4a4acee
create new account flow
KayBeSee Sep 22, 2020
a331295
update modal to include close button at top
KayBeSee Sep 22, 2020
5523442
minor style changes
KayBeSee Sep 22, 2020
5fe651c
fix build issue #31
KayBeSee Sep 22, 2020
ac97205
update box-shadows and fix bug with coldcard file not taking currentb…
KayBeSee Sep 22, 2020
2f6c98f
fix bug with signingthreshold not being properly set in signdevices
KayBeSee Sep 23, 2020
1a6494d
update delete account and create account with appropriate buttons
KayBeSee Sep 23, 2020
751ac8f
fixes bug with tx broadcasting using block explorer and testnet
bilthon Sep 24, 2020
2a800a8
wip
KayBeSee Sep 28, 2020
b721314
Merge pull request #35 from bilthon/next
KayBeSee Sep 30, 2020
71e770a
add saving custom node config
KayBeSee Oct 2, 2020
c85a459
remove unused function
KayBeSee Oct 2, 2020
2a2e538
Merge pull request #37 from KayBeSee/full-node-modifications
KayBeSee Oct 2, 2020
662d8d0
cleanup unused variables
KayBeSee Oct 2, 2020
4b0efbd
fix feeEstimate error on full node
KayBeSee Oct 3, 2020
74194d8
always add modified date to uploaded files
KayBeSee Oct 5, 2020
c60043c
fixes issue with balance history graph and introduces some tests
bilthon Oct 12, 2020
99d4e40
introduces a special icon for 'moved' transfers and adjusts color sch…
bilthon Oct 12, 2020
fd5a610
some styling changes, added initial functionality
KayBeSee Oct 13, 2020
151ffc4
refactor send pages and device select for phone
KayBeSee Oct 14, 2020
6107ff2
animiated qr code
KayBeSee Oct 16, 2020
6dc59b4
Merge pull request #40 from bilthon/next
KayBeSee Oct 19, 2020
232a954
change color scheme from blue to green/yellow
KayBeSee Oct 19, 2020
fea21ba
merge
KayBeSee Oct 19, 2020
5852864
some cleanup, added to lilymobile modal
KayBeSee Oct 19, 2020
0f249e1
Merge pull request #41 from KayBeSee/phone-integration
KayBeSee Oct 19, 2020
20033ed
merge
KayBeSee Oct 19, 2020
24f8f94
Merge pull request #42 from KayBeSee/color-scheme
KayBeSee Oct 19, 2020
856d914
fix bugs with account map, deleting accounts
KayBeSee Oct 20, 2020
4716db9
modify receive addresspage, add overflow scroll to sidebar
KayBeSee Oct 21, 2020
665b36c
fix scrolltotop bug when loading
KayBeSee Oct 22, 2020
aacd269
reset lily mobile modal step on close
KayBeSee Oct 22, 2020
b3cb3b2
adjust color in steps component to green
KayBeSee Oct 22, 2020
31f52bc
use reducer for account map
KayBeSee Oct 23, 2020
364c802
Merge pull request #43 from KayBeSee/use-reducer-for-accountmap
KayBeSee Oct 23, 2020
cce65a4
add AccountMapContext file
KayBeSee Oct 23, 2020
e0cab37
Merge pull request #44 from KayBeSee/use-reducer-for-accountmap
KayBeSee Oct 23, 2020
8a41941
fix ui bug with unlock button jumping
KayBeSee Oct 23, 2020
97ed8c7
Merge branch 'next' of github.com:KayBeSee/cc-kitchen-frontend into next
KayBeSee Oct 23, 2020
fd16e26
refactor, get currentAccount and setCurrentAccountId from context
KayBeSee Oct 25, 2020
be2ba3d
cleanup
KayBeSee Oct 25, 2020
8a883d0
Merge pull request #45 from KayBeSee/use-reducer-for-accountmap
KayBeSee Oct 25, 2020
3ccd7b9
cleanup unused vars
KayBeSee Oct 25, 2020
0606dbe
add typescript, add types to App.tsx
KayBeSee Oct 25, 2020
0569a20
setup typescript and convert transactions.js and App.js
KayBeSee Oct 25, 2020
fdb32a0
cleanup
KayBeSee Oct 25, 2020
7b41360
convert home.js to home.tsx
KayBeSee Oct 26, 2020
ffe185a
update button, loading, and receive to typescript
KayBeSee Oct 26, 2020
86a3598
update settings page to typescript
KayBeSee Oct 26, 2020
5779619
convert login page to typescript
KayBeSee Oct 26, 2020
45396c7
convert settings page to typescript
KayBeSee Oct 26, 2020
c00024e
convert send files to typescript
KayBeSee Oct 27, 2020
8447096
convert setup files to typescript
KayBeSee Oct 27, 2020
4dd2aab
convert remaining components to typescript
KayBeSee Oct 27, 2020
57832bf
convert tx row components to typescript
KayBeSee Oct 27, 2020
2ee9b80
tieing up some loose ends
KayBeSee Oct 27, 2020
57c0c5a
move types into devDependencies
KayBeSee Oct 27, 2020
6336765
Merge pull request #46 from KayBeSee/typescript-conversion
KayBeSee Oct 27, 2020
2ac1b50
add width 100% on promptpinmodal
KayBeSee Oct 29, 2020
bd5a305
add tests for transactions and send
KayBeSee Nov 5, 2020
71a4963
styling upgrades
KayBeSee Nov 17, 2020
b80b76a
Merge pull request #47 from KayBeSee/tsc-tests
KayBeSee Nov 17, 2020
761a0f6
Merge pull request #48 from KayBeSee/style-upgrade
KayBeSee Nov 17, 2020
205a40c
purchase license and license modal styling
KayBeSee Nov 18, 2020
a505257
refactor send page, finish license flow
KayBeSee Nov 22, 2020
89e10d4
initial commit, alertbar
KayBeSee Nov 22, 2020
e60e76d
add breadcrumbs component, style settings page
KayBeSee Nov 22, 2020
5af0712
refactor vault settings page initial commit
KayBeSee Nov 24, 2020
8bbba78
minor refactor, add tests to send functions
KayBeSee Nov 24, 2020
0716cba
changes to settings styling, adjust license logic to be trustless
KayBeSee Nov 26, 2020
0c09e5c
update cobo vault flow, remove compiled typescript
KayBeSee Nov 30, 2020
5df3611
add open external links in browser, increase sizes on send preview page
KayBeSee Dec 1, 2020
43729ce
add automatic signing for mnemonic wallets
KayBeSee Dec 1, 2020
1c19b92
add extendedPublicKey array to hww and singlesig
KayBeSee Dec 1, 2020
993712b
add padding to input name screen, remove phone action
KayBeSee Dec 1, 2020
34915a4
add empty state to receive and send pages, move software wallet to dr…
KayBeSee Dec 4, 2020
f055bfc
add single sig coldcard import from file
KayBeSee Dec 5, 2020
ad2d687
add tx detail modal on vault page, update empty state with dead flowe…
KayBeSee Dec 10, 2020
cdf7ddd
add back in bitcoin core support
KayBeSee Dec 17, 2020
0c6756a
Merge pull request #50 from KayBeSee/license-flow
KayBeSee Dec 17, 2020
b4b82a0
missed id when loading node client
KayBeSee Dec 18, 2020
8978e65
cobo export multisig attempt
KayBeSee Dec 21, 2020
4049a88
cleanup nodeconfig implementation
KayBeSee Dec 22, 2020
83ff1f3
extra internal true set
KayBeSee Dec 22, 2020
12b2bc3
add cobo export qr
KayBeSee Dec 22, 2020
425fbfd
wallet v1 => v2 config, rescan modal, some linting
KayBeSee Jan 4, 2021
d0407a1
lint cleanup
KayBeSee Jan 4, 2021
0b36a0b
clean up network dropdown, move content to network tab in settings
KayBeSee Jan 4, 2021
75371f6
license refactor, upload license via file
KayBeSee Jan 6, 2021
ada6e92
add account select bar to license payment screen
KayBeSee Jan 7, 2021
836b273
bug fix single sig addresses with full node
KayBeSee Jan 8, 2021
f40adc2
add loading to license page, minor tweaks
KayBeSee Jan 8, 2021
a066730
better info when scanning for new txs with full node
KayBeSee Jan 10, 2021
3161ac1
update axios
KayBeSee Jan 10, 2021
2367dff
small style changes
KayBeSee Jan 10, 2021
fc2faa5
camera access on mac
KayBeSee Jan 11, 2021
b686fc1
fix DeviceSelect overflow when more than three devices
KayBeSee Jan 11, 2021
eb8c64b
lint
KayBeSee Jan 12, 2021
cc40436
merge
KayBeSee Jan 12, 2021
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ LilyWallet-darwin-x64
.DS_Store
dist/
LilyWallet-*
.env
compiled-ts/
Binary file modified HWIs/HWI_LINUX
Binary file not shown.
Binary file modified HWIs/HWI_MAC
Binary file not shown.
Binary file modified HWIs/hwi.exe
Binary file not shown.
13 changes: 13 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// babel.config.js
module.exports = {
presets: [
[
'@babel/preset-env',
{
targets: {
node: 'current',
},
},
],
],
};
17,889 changes: 17,889 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

52 changes: 44 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
"scripts": {
"electron": "electron .",
"start": "PORT=3001 react-scripts start",
"electron-testnet": "TESTNET=true electron .",
"build": "react-scripts build",
"test": "react-scripts test",
"test": "react-scripts test --testPathIgnorePatterns=src/__tests__/mock",
"eject": "react-scripts eject",
"pack": "electron-builder --dir",
"dist": "electron-builder -mwl",
Expand All @@ -27,12 +28,17 @@
"target": [
"dmg"
],
"entitlements": "./build/entitlements.mac.inherit.plist",
"extendInfo": {
"NSCameraUsageDescription": "Allow your camera to scan QR codes during account setup and transaction signing."
},
"files": [
"./build/**/*",
"./src/main.js",
"./src/preload.js",
"./src/server/**/*",
"./src/utils/**/*",
"./src/types/*",
"./HWIs/HWI_MAC"
]
},
Expand All @@ -52,6 +58,7 @@
"./src/preload.js",
"./src/server/**/*",
"./src/utils/**/*",
"./src/types/*",
"./HWIs/HWI_LINUX"
]
},
Expand All @@ -62,35 +69,41 @@
"./src/preload.js",
"./src/server/**/*",
"./src/utils/**/*",
"./src/types/*",
"./HWIs/hwi.exe"
]
}
},
"dependencies": {
"axios": "^0.19.2",
"@cvbb/qr-protocol": "^0.1.6",
"@cvbb/sdk": "^0.1.8",
"axios": "^0.21.1",
"babel-preset-es2015": "^6.24.1",
"babel-register": "^6.26.0",
"bignumber.js": "^9.0.0",
"bip39": "^3.0.2",
"bitcoin-core": "^3.0.0",
"bitcoinjs-lib": "^5.1.10",
"bitcoinjs-message": "^2.1.4",
"bs58check": "^2.1.2",
"coinselect": "^3.1.12",
"cors": "^2.8.5",
"crypto-js": "^4.0.0",
"electron-dl": "^3.0.0",
"moment": "^2.24.0",
"dotenv": "^8.2.0",
"moment": "^2.29.1",
"polished": "^3.5.1",
"react": "^16.13.1",
"react-copy-to-clipboard": "^5.0.2",
"react-dom": "^16.13.1",
"react-modal": "^3.11.2",
"react-qr-svg": "^2.2.2",
"react-router-dom": "^5.1.2",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.1",
"react-spring": "^8.0.27",
"react-webcam-barcode-scanner": "0.0.2-rc2",
"recharts": "^1.8.5",
"styled-components": "^5.1.0",
"styled-icons": "^10.2.1",
"styled-icons": "^10.19.0",
"unchained-bitcoin": "0.0.9",
"uuid": "^8.0.0"
},
Expand All @@ -107,11 +120,34 @@
]
},
"devDependencies": {
"@types/crypto-js": "^4.0.1",
"@types/jest": "^26.0.15",
"@types/react": "^16.9.53",
"@types/react-copy-to-clipboard": "^4.3.0",
"@types/react-dom": "^16.9.8",
"@types/react-modal": "^3.10.6",
"@types/react-router-dom": "^5.1.6",
"@types/recharts": "^1.8.16",
"@types/rewire": "^2.5.28",
"@types/styled-components": "^5.1.4",
"@types/uuid": "^8.3.0",
"electron": "^9.0.0",
"electron-builder": "^22.7.0",
"electron-installer-dmg": "^3.0.0",
"electron-mock-ipc": "^0.3.8",
"electron-packager": "^14.2.1",
"electron-winstaller": "^4.0.0",
"react-app-rewired": "^2.1.6"
"jest-when": "^3.0.0",
"mocha": "^8.1.3",
"react-app-rewired": "^2.1.6",
"rewire": "^5.0.0",
"source-map-loader": "^1.1.1",
"ts-loader": "^8.0.7",
"typescript": "^4.0.3"
},
"jest": {
"moduleNameMapper": {
"^electron$": "<rootDir>/src/__tests__/mock/electron-mock.ts"
}
}
}
}
Binary file modified public/.DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions public/entitlements.mac.inherit.plist
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@
<dict>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
<true/>
<key>com.apple.security.device.camera</key>
<true/>
</dict>
</plist>
44 changes: 44 additions & 0 deletions src/AccountMapContext.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import React, { createContext, useReducer, useCallback, useState } from 'react';

import {
accountMapReducer,
ACCOUNTMAP_UPDATE,
ACCOUNTMAP_SET
} from './reducers/accountMap';

import { AccountMap, LilyAccount } from './types'

export const AccountMapContext = createContext({
setAccountMap: (accountMap: AccountMap) => { },
updateAccountMap: (account: LilyAccount) => { },
setCurrentAccountId: (id: string) => { },
accountMap: {} as AccountMap,
currentAccount: {} as LilyAccount
});

export const AccountMapProvider = ({ children }: { children: React.ReactChild }) => {
const [accountMap, dispatch] = useReducer(accountMapReducer, {});
const [currentAccountId, setCurrentAccountId] = useState('satoshi');

const currentAccount = accountMap[currentAccountId!] || { name: 'Loading...', loading: true, transactions: [], unusedAddresses: [], currentBalance: 0, config: {} };

const updateAccountMap = useCallback((account: LilyAccount) => {
dispatch({
type: ACCOUNTMAP_UPDATE,
payload: {
account
}
})
}, [dispatch])

const setAccountMap = useCallback((accountMap: AccountMap) => {
dispatch({
type: ACCOUNTMAP_SET,
payload: accountMap
})
}, [dispatch])

const value = { accountMap, updateAccountMap, setAccountMap, currentAccount, setCurrentAccountId }

return <AccountMapContext.Provider value={value}>{children}</AccountMapContext.Provider>
}
Loading