diff --git a/Cargo.lock b/Cargo.lock index acc33e9ca..07a5b58f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1783,7 +1783,7 @@ dependencies = [ [[package]] name = "parity-ui-precompiled" version = "1.4.0" -source = "git+https://github.com/paritytech/js-precompiled.git#1be3eaa4cefa85e25b48ac5e8cf579c92108e562" +source = "git+https://github.com/paritytech/js-precompiled.git#05e0ea878ee54bed2e62a5f434663706bdf1919e" dependencies = [ "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/js/package.json b/js/package.json index 212108acc..e54238ac3 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "parity.js", - "version": "1.7.75", + "version": "1.7.76", "main": "release/index.js", "jsnext:main": "src/index.js", "author": "Parity Team ", diff --git a/js/src/shared/util/tx.js b/js/src/shared/util/tx.js index 67c1e3efc..a42a89a68 100644 --- a/js/src/shared/util/tx.js +++ b/js/src/shared/util/tx.js @@ -16,6 +16,38 @@ import WalletsUtils from './wallets'; +/** + * The sender is by default (when the UI loads) the + * default dapp address. It can then be modified when + * sending transactions.... + */ +let currentSender = ''; +let hasCurrentSenderChanged = false; + +export function getSender () { + currentSender; +} + +export function loadSender (api) { + // If the current sender has been changed + // then don't bother checking changes of the + // default sender + if (hasCurrentSenderChanged) { + return Promise.resolve(currentSender); + } + + return api.parity.getNewDappsDefaultAddress() + .then((defaultAccount) => { + currentSender = defaultAccount; + return defaultAccount; + }); +} + +export function setSender (sender) { + currentSender = sender; + hasCurrentSenderChanged = true; +} + export function trackRequest (api, options, statusCallback) { const { requestId, transactionHash } = options; const txHashPromise = transactionHash diff --git a/js/src/views/Accounts/CreateWallet/createWallet.spec.js b/js/src/views/Accounts/CreateWallet/createWallet.spec.js index 45c9776e1..e38174b81 100644 --- a/js/src/views/Accounts/CreateWallet/createWallet.spec.js +++ b/js/src/views/Accounts/CreateWallet/createWallet.spec.js @@ -27,7 +27,11 @@ let component; let onClose; function createApi () { - api = {}; + api = { + parity: { + getNewDappsDefaultAddress: sinon.stub().resolves('') + } + }; return api; }