Skip to content
This repository has been archived by the owner on Jun 7, 2023. It is now read-only.

Shared: Improvements to alerts #1488

Merged
merged 10 commits into from
May 17, 2019
Merged

Shared: Improvements to alerts #1488

merged 10 commits into from
May 17, 2019

Conversation

cvarley100
Copy link
Contributor

Description

  • Desktop: Display a test version warning on RC versions
  • Desktop: Don't display update alert on RC versions

Type of change

  • Enhancement (a non-breaking change which adds functionality)

How Has This Been Tested?

Tested on relevant platforms

Checklist:

Please delete items that are not relevant.

  • My code follows the style guidelines for this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • New and existing unit tests pass locally with my changes
  • For changes to mobile that include native code (including React Native modules): I have verified that both iOS and Android successfully build in both Debug and Release modes
  • For changes to shared: If applicable, I have verified that my changes are implemented correctly in desktop and mobile

Copy link
Contributor

@laumair laumair left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

One minor suggestion (We can cover it later though)

if (get(err, 'message') === Errors.LEDGER_CANCELLED) {
    dispatch(generateLedgerCancelledAlert(err));
} else if (get(err, 'message') === Errors.LEDGER_INVALID_INDEX) {
    dispatch(generateLedgerIncorrectIndexAlert(err));
} ... 

Instead of calling lodash.get in each if block, we can do:

const message = get(error, 'message');

if (message ===  Errors.LEDGER_CANCELLED) { }

@cvarley100 cvarley100 merged commit 9014d0a into develop May 17, 2019
@rajivshah3 rajivshah3 deleted the feat/alert-improvements branch May 17, 2019 15:42
rihardsgravis pushed a commit that referenced this pull request May 20, 2019
* develop: (21 commits)
  Bump @ledgerhq/hw-transport-node-hid in /src/desktop (#1555)
  Bump appcompat-v7 from 27.1.0 to 28.0.0 in /src/mobile/android (#961)
  Bump snyk from 1.165.0 to 1.165.1 (#1552)
  Desktop: Improve UX during Ledger setup (#1550)
  Shared: Improvements to alerts (#1488)
  Shared: Add device time suggestion to out of sync errors (#1485)
  Bump eslint-config-prettier from 4.2.0 to 4.3.0 (#1546)
  Bump express from 4.16.4 to 4.17.0 in /src/desktop (#1547)
  Bump keytar from 4.6.0 to 4.7.0 in /src/desktop (#1548)
  fix: ignore transition addresses if a user swaps account (#1528)
  Bump @ledgerhq/hw-transport-node-hid in /src/desktop (#1504)
  Bump webpack-hot-middleware from 2.24.4 to 2.25.0 in /src/desktop (#1533)
  Bump webpack-dev-middleware from 3.6.2 to 3.7.0 in /src/desktop (#1536)
  Bump fastlane from 2.122.0 to 2.123.0 in /src/mobile/ios (#1529)
  Bump lint-staged from 8.1.6 to 8.1.7 (#1535)
  Bump snyk from 1.164.0 to 1.165.0 (#1534)
  Bump @babel/register from 7.0.0 to 7.4.4 in /src/shared (#1532)
  Bump fastlane from 2.122.0 to 2.123.0 in /src/mobile/android (#1530)
  Bump husky from 2.2.0 to 2.3.0 (#1523)
  Desktop: Fix Tray application Fiat value (#1511)
  ...

# Conflicts:
#	src/desktop/npm-shrinkwrap.json
#	src/desktop/package.json
#	src/desktop/src/ui/components/input/Seed.js
#	src/desktop/src/ui/global/SeedExport.js
#	src/desktop/src/ui/views/onboarding/SeedIntro.js
rihardsgravis pushed a commit that referenced this pull request May 20, 2019
* develop:
  Bump timekeeper from 2.0.0 to 2.2.0 in /src/shared (#1507)
  Bump bignumber.js from 8.0.1 to 8.1.1 in /src/shared (#1545)
  New Crowdin translations (#1516)
  Desktop: Catch and display preload and initialisation errors (#1549)
  Remove auditjs (#1553)
  Revert and lock to `usb` `1.5.0` (#1558)
  Desktop: Update ledger warning string (#1557)
  Bump @ledgerhq/hw-transport-node-hid in /src/desktop (#1555)
  Bump appcompat-v7 from 27.1.0 to 28.0.0 in /src/mobile/android (#961)
  Bump snyk from 1.165.0 to 1.165.1 (#1552)
  Desktop: Improve UX during Ledger setup (#1550)
  Shared: Improvements to alerts (#1488)
  Shared: Add device time suggestion to out of sync errors (#1485)
  Bump eslint-config-prettier from 4.2.0 to 4.3.0 (#1546)
  Bump express from 4.16.4 to 4.17.0 in /src/desktop (#1547)
  Bump keytar from 4.6.0 to 4.7.0 in /src/desktop (#1548)
  fix: ignore transition addresses if a user swaps account (#1528)
  Bump @ledgerhq/hw-transport-node-hid in /src/desktop (#1504)

# Conflicts:
#	src/mobile/src/ui/views/wallet/ChangePassword.js
#	src/shared/actions/wallet.js
rihardsgravis pushed a commit that referenced this pull request May 21, 2019
* feat/nodes-granularity: (48 commits)
  fix: update/fix failing tests
  Bump timekeeper from 2.0.0 to 2.2.0 in /src/shared (#1507)
  Bump bignumber.js from 8.0.1 to 8.1.1 in /src/shared (#1545)
  New Crowdin translations (#1516)
  Desktop: Catch and display preload and initialisation errors (#1549)
  Remove auditjs (#1553)
  feat: make sure prepareTransfer method of SeedStore class accept node settings parameter
  Revert and lock to `usb` `1.5.0` (#1558)
  feat: make sure promotion & reattachment actions are wrapped inside NodeManager.withRetries method
  feat: make sure @iota/core methods are passed with username & password
  Desktop: Update ledger warning string (#1557)
  Bump @ledgerhq/hw-transport-node-hid in /src/desktop (#1555)
  Bump appcompat-v7 from 27.1.0 to 28.0.0 in /src/mobile/android (#961)
  Bump snyk from 1.165.0 to 1.165.1 (#1552)
  Desktop: Improve UX during Ledger setup (#1550)
  Shared: Improvements to alerts (#1488)
  feat: add password property in nodes data
  Shared: Add device time suggestion to out of sync errors (#1485)
  Bump eslint-config-prettier from 4.2.0 to 4.3.0 (#1546)
  Bump express from 4.16.4 to 4.17.0 in /src/desktop (#1547)
  ...

# Conflicts:
#	src/mobile/src/ui/views/wallet/ChangePassword.js
rihardsgravis pushed a commit that referenced this pull request May 22, 2019
* develop: (49 commits)
  Desktop: Use executable icon for application window
  Desktop: Lock node-usb to 1.5.0 (#1580)
  Bump snyk from 1.165.1 to 1.166.0 (#1570)
  Bump @ledgerhq/hw-transport-node-hid in /src/desktop (#1562)
  Bump i18next from 15.1.1 to 15.1.2 in /src/desktop (#1561)
  Bump webpack from 4.31.0 to 4.32.0 in /src/desktop (#1564)
  Bump recharts from 1.6.0 to 1.6.1 in /src/desktop (#1567)
  Bump timekeeper from 2.0.0 to 2.2.0 in /src/shared (#1507)
  Bump bignumber.js from 8.0.1 to 8.1.1 in /src/shared (#1545)
  New Crowdin translations (#1516)
  Desktop: Catch and display preload and initialisation errors (#1549)
  Remove auditjs (#1553)
  Revert and lock to `usb` `1.5.0` (#1558)
  Desktop: Update ledger warning string (#1557)
  Bump @ledgerhq/hw-transport-node-hid in /src/desktop (#1555)
  Bump appcompat-v7 from 27.1.0 to 28.0.0 in /src/mobile/android (#961)
  Bump snyk from 1.165.0 to 1.165.1 (#1552)
  Desktop: Improve UX during Ledger setup (#1550)
  Shared: Improvements to alerts (#1488)
  Shared: Add device time suggestion to out of sync errors (#1485)
  ...

# Conflicts:
#	src/desktop/src/index.js
#	src/desktop/src/ui/global/FatalError.js
#	src/shared/store.js
This was referenced May 23, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants