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

Activity panel #674

Merged
merged 54 commits into from Apr 16, 2019

Conversation

Projects
None yet
4 participants
@2color
Copy link
Contributor

2color commented Apr 3, 2019

No description provided.

drcmda and others added some commits Jan 17, 2019

Merge remote-tracking branch 'origin/master' into notifications
* origin/master: (55 commits)
  Identity - Improve LocalIdentityBadge (#673)
  Menu panel footer separator (#666)
  fix(MenuPanel): avoid clickable margin above system apps toggle (#671)
  Local identities (#656)
  MenuPanel: add toggle animation to show/hide system apps (#658)
  Add github workflow for linting/building (#663)
  Permissions: added system and background app labels (#650)
  Use the same component to render every app icon (#655)
  chore: add all contributors and contributing guidelines (#649)
  Manage the menu button using messages + prevent re-mounting on resize (#651)
  Update melon (#647)
  Apps <> System apps separator (#648)
  Upgrade lint-staged (#646)
  fix: always leave Kernel as first app (#645)
  fix: avoid assigning a registry tag if app is not on a registry (#644)
  chore: upgrade @aragon/wrapper to v4.0.0-beta.1 (#639)
  DaoSettings: add bottom margin on app items (#638)
  Refactor common components (#615)
  Enforce MenuPanel’s width (#636)
  Menu panel swipe open close (#606)
  ...

@2color 2color changed the base branch from master to notifications Apr 3, 2019

@2color 2color changed the base branch from notifications to master Apr 3, 2019

2color added some commits Apr 4, 2019

Move activities to context from wrapper state
- Rename notifications to activities
- Pass activity count down the tree
Fix bug with activity panel not closing properly
The callback for toggling activity panel was called twice
once by notification alert component and once by the onBlur event with
a short delay. This caused it to start closing and then to open again.
Merge remote-tracking branch 'origin/master' into activity-panel
* origin/master:
  Organization switcher: open or create another org (#665)

@2color 2color referenced this pull request Apr 9, 2019

Closed

Feat/message signing #683

Show resolved Hide resolved src/contexts/ActivityContext.js Outdated

@bpierre bpierre referenced this pull request Apr 10, 2019

Merged

Activity Panel: UI #687

@2color 2color marked this pull request as ready for review Apr 12, 2019

Show resolved Hide resolved src/components/SignerPanel/SignerPanel.js Outdated
Show resolved Hide resolved src/components/SignerPanel/SignerPanel.js Outdated
Show resolved Hide resolved src/contexts/ActivityContext.js Outdated
Show resolved Hide resolved src/contexts/ActivityContext.js Outdated
Show resolved Hide resolved src/contexts/ActivityContext.js Outdated
Show resolved Hide resolved src/contexts/ActivityContext.js Outdated
Show resolved Hide resolved src/contexts/ActivityContext.js Outdated
Show resolved Hide resolved src/contexts/ActivityContext.js

sohkai added some commits Apr 14, 2019

@sohkai

This comment has been minimized.

Copy link
Member

sohkai commented Apr 14, 2019

Something else I noticed: there are some pretransactions (e.g. Finance's deposit, which first needs to make a token approval before the actual transaction can succeed) that show up as the actual action. We should do a bit of parsing to say that there was a pretransaction needed (and for now hardcode some text; the only pretransactions are token approvals).

You can detect one by checking transaction.pretransaction and the signer panel will have some other cases of this.

@2color 2color force-pushed the activity-panel branch from aff9a9f to 158508a Apr 15, 2019

2color added some commits Apr 16, 2019

Merge remote-tracking branch 'origin/master' into activity-panel
* origin/master:
  fix: align connect account with preferences button (#700)
  Fix import file button (#698)
  feat: add current account with connect account button (#693)
  feat: load app icon from new icon schema with size selector (#691)
  Discover Apps: update Espresso + Payroll icons (#696)

2color and others added some commits Apr 16, 2019

Ensure MenuPanel is only displayed when needed + code refresh (#695)
- Add a new state to App: daoStatus. Similar to appsStatus, but for the
  resolution of the DAO name. Add corresponding type (DaoStatusType) and
  symbols (DAO_STATUS_LOADING, etc.).
- In App, set daoStatus and appsStatus more consistently.
- Add a APPS_STATUS_UNLOADED state, instead of using APPS_STATUS_LOADING
  when no apps are being loaded. This prevents the loading indicator of
  the MenuPanel to be active.
- The Organization Switcher now only displays its loading indicator if
  daoStatus is DAO_STATUS_LOADING.
- Wrap Onboarding and Wrapper to set their z-index explicitly.
- CombinedPanel: ensure the overlay doesn’t flash while transitioning
  from static to autoclosing mode.
- Use symbols for app mode (APP_MODE_XYZ).
- Cosmetic: rename APP_MODE_HOME to APP_MODE_START.
- Fix: pass down all props needed by Wrapper.
- Fix: move web3 initialization to App's construction.
- Fix: increase Preferences panel's z-index to overlay on top of MenuPanel.
- Fix: simplify routing.js.

@sohkai sohkai merged commit a1125a7 into master Apr 16, 2019

4 checks passed

License Compliance All checks passed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details

@sohkai sohkai deleted the activity-panel branch Apr 16, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.