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

Ignore transition addresses if a user swaps account #1528

Merged
merged 1 commit into from
May 16, 2019

Conversation

laumair
Copy link
Contributor

@laumair laumair commented May 15, 2019

Description

Fixes #1502

Type of change

  • Bug fix

How Has This Been Tested?

  • Manually tested iOS (debug)

Checklist:

  • 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
  • I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works
  • 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

@laumair laumair added T - Bug Type - Bug: Something isn't working C - Mobile C - Desktop C - Shared L - Need reviews Lifecycle - Each PR must have at least two reviewers P2 - High Priority - Prefer to fix or merge this labels May 15, 2019
@cvarley100 cvarley100 merged commit 46d177a into iotaledger:develop May 16, 2019
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
This was referenced May 23, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
C - Desktop C - Mobile C - Shared L - Need reviews Lifecycle - Each PR must have at least two reviewers P2 - High Priority - Prefer to fix or merge this T - Bug Type - Bug: Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Snapshot transition leads to duplicate addresses
2 participants