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

Profile updates #105

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
082d038
make aragon-profile compatible with new client
Schwartz10 Sep 23, 2019
d94263b
use ipfs light http client
Schwartz10 Sep 23, 2019
34463c8
fix link styling
Schwartz10 Sep 23, 2019
f58f3b5
fix css issues
Schwartz10 Sep 23, 2019
17bcdd7
update 3box, cancel logging
Schwartz10 Sep 26, 2019
8192557
fix educationHistoryTile btn ui
Schwartz10 Sep 26, 2019
2091e1e
bump version
Schwartz10 Sep 26, 2019
861b985
use older 3box version
Schwartz10 Sep 26, 2019
8bae36d
add more robust web3 handling
Schwartz10 Sep 29, 2019
ee05e16
bump 3box, better naming & profile syncing
Schwartz10 Sep 29, 2019
8d57f34
disable logging behavior
Schwartz10 Sep 29, 2019
e9fa85c
Fix info edit button hover issue
listenaddress Sep 29, 2019
0f64f42
Merge pull request #100 from AutarkLabs/fix/profile-edit-icon
Schwartz10 Sep 30, 2019
dc37c61
bump version
Schwartz10 Sep 30, 2019
2b9e96d
Merge branch 'upgrade/new-aragon-ui' of github.com:AutarkLabs/aragon-…
Schwartz10 Sep 30, 2019
79dbae0
bump peer deps
Schwartz10 Sep 30, 2019
91f6620
fix enable metamask screen
Schwartz10 Sep 30, 2019
2107493
update readme.md and bump package.json version
Schwartz10 Dec 22, 2019
1018cf7
Merge branch 'master' of github.com:AutarkLabs/aragon-profile into up…
Schwartz10 Dec 22, 2019
eec8d4b
not working 3box upgrade
Schwartz10 Dec 22, 2019
72f381b
feat: dark mode support
PeterMPhillips Jan 28, 2020
8d3871b
fix: update person_sign override
PeterMPhillips Feb 8, 2020
f70d681
fix: modals and loading screen
PeterMPhillips Feb 26, 2020
1a7eb62
fix: modal closing on click
PeterMPhillips Feb 27, 2020
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
Prev Previous commit
Next Next commit
not working 3box upgrade
Schwartz10 committed Dec 22, 2019
commit eec8d4b422025330430e3f9e8f047fe4936e69a3
1,341 changes: 975 additions & 366 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@
"web3-utils": "^1.2.1"
},
"dependencies": {
"3box": "1.11.0",
"3box": "^1.15.0",
"ajv": "^6.10.0",
"dayjs": "^1.8.14",
"husky": "^3.0.1",
16 changes: 8 additions & 8 deletions src/client/stateManagers/box/reducer.js
Original file line number Diff line number Diff line change
@@ -65,14 +65,14 @@ import {
} from './states'

const logStateUpdate = (action, prevState, nextState) => {
// console.log(
// 'ACTION: ',
// action,
// 'PREV STATE: ',
// prevState,
// 'NEXT STATE:',
// nextState
// )
console.log(
'ACTION: ',
action,
'PREV STATE: ',
prevState,
'NEXT STATE:',
nextState
)
}

const boxReducer = (prevState, action) => {
16 changes: 12 additions & 4 deletions src/client/utils/login.js
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ export const unlockAndCreateBoxIfRequired = async (
dispatch(profileSyncRequest(ethereumAddress, profile))
try {
await profile.sync()
dispatch(profileSyncSuccess(ethereumAddress))
dispatch(profileSyncSuccess(ethereumAddress, profile))
return profile
} catch (error) {
dispatch(profileSyncFailure(ethereumAddress, error))
@@ -90,11 +90,19 @@ export const unlockAndCreateBoxIfRequired = async (
try {
const profileExists = await hasProfile()
// no signature required, return the box
if (box.unlockedProfSuccess && profileExists) return box.unlockedBox
if (box.unlockedProfSuccess && profileExists) {
return box.unlockedBox
}
// only create profile signature required, return box once finished
if (box.unlockedProfSuccess) return createProfSig(box.unlockedBox)
if (box.unlockedProfSuccess) {
return createProfSig(box.unlockedBox)
}
// open box signature only, return box once finished
if (!box.unlockedProfSuccess && profileExists) return openBoxSig()
if (!box.unlockedProfSuccess && profileExists) {
return openBoxSig()
}

console.log('need both')
// both signatures, return box once finished
return invokeBothSigs()
} catch (error) {