Backporting to beta

js/scripts/release.sh

@@ -50,32 +50,32 @@ setup_git_user
 git remote set-url origin $GIT_PARITY
 git reset --hard origin/$BRANCH 2>$GITLOG
 
-echo "*** Bumping package.json patch version"
-cd js
-npm --no-git-tag-version version
-npm version patch
-cd ..
+if [ "$BRANCH" == "master" ]; then
+  cd js
+  echo "*** Bumping package.json patch version"
+  npm --no-git-tag-version version
+  npm version patch
+
+  echo "*** Building packages for npmjs"
+  # echo -e "$NPM_USERNAME\n$NPM_PASSWORD\n$NPM_EMAIL" | npm login
+  echo "$NPM_TOKEN" >> ~/.npmrc
+  npm run ci:build:npm
+
+  echo "*** Publishing $PACKAGE to npmjs"
+  cd .npmjs
+  npm publish --access public
+  cd ../..
+fi
 
 echo "*** Updating cargo parity-ui-precompiled#$PRECOMPILED_HASH"
 cargo update -p parity-ui-precompiled
 # --precise "$PRECOMPILED_HASH"
 
 echo "*** Committing updated files"
-git add Cargo.lock js/package.json
+git add .
 git commit -m "[ci skip] js-precompiled $UTCDATE"
 git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG
 
-echo "*** Building packages for npmjs"
-cd js
-# echo -e "$NPM_USERNAME\n$NPM_PASSWORD\n$NPM_EMAIL" | npm login
-echo "$NPM_TOKEN" >> ~/.npmrc
-npm run ci:build:npm
-
-echo "*** Publishing $PACKAGE to npmjs"
-cd .npmjs
-npm publish --access public
-cd ..
-
 # back to root
 echo "*** Release completed"
 popd

js/src/modals/Transfer/GasPriceSelector/gasPriceSelector.js

@@ -539,7 +539,7 @@ export default class GasPriceSelector extends Component {
     const gasPriceBIdx = gasPriceAIdx + 1;
 
     if (gasPriceBIdx === N + 1) {
-      const gasPrice = gasPrices[gasPriceAIdx];
+      const gasPrice = gasPrices[gasPriceAIdx].round();
       this.props.onChange(event, gasPrice);
       return;
     }
@@ -548,7 +548,9 @@ export default class GasPriceSelector extends Component {
     const gasPriceB = gasPrices[gasPriceBIdx];
 
     const mult = Math.round((sliderValue % 1) * 100) / 100;
-    const gasPrice = gasPriceA.plus(gasPriceB.minus(gasPriceA).times(mult));
+    const gasPrice = gasPriceA
+      .plus(gasPriceB.minus(gasPriceA).times(mult))
+      .round();
 
     this.setSliderValue(sliderValue, gasPrice);
     this.props.onChange(event, gasPrice);

js/src/modals/Transfer/transfer.js

@@ -411,6 +411,7 @@ export default class Transfer extends Component {
     const { api } = this.context;
     const { account } = this.props;
     const { data, gas, gasPrice, recipient, value } = this.state;
+
     const options = {
       from: account.address,
       to: recipient,

js/src/ui/CopyToClipboard/index.js

@@ -14,4 +14,4 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-export default from './CopyToClipboard';
+export default from './copyToClipboard';

js/src/views/Application/Status/status.css

@@ -15,12 +15,10 @@
 /* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 */
 .status {
-  padding: 1.5em;
-  text-align: right;
-  color: #ddd;
-  display: flex;
-  flex-direction: column;
-  align-items: flex-end;
+  padding: 0.5em;
+  font-size: x-small;
+  color: #ccc;
+  background-color: rgba(0, 0, 0, 0.2)
 }
 
 .title {
@@ -29,12 +27,13 @@
 
 .enode {
   word-wrap: break-word;
-  margin: 0.5em 0 0.25em 0;
+  float: right;
 }
 
 .enode > * {
   display: inline-block;
-  margin-left: .5em;
+  margin: 0.25em 0.5em;
+  vertical-align: top;
 }
 
 .block {
@@ -43,9 +42,7 @@
 .netinfo {
   display: flex;
   align-items: center;
-  flex-direction: row;
-  justify-content: flex-end;
-  margin-top: 0.25em;
+  color: #ddd;  
 }
 
 .netinfo > * {
@@ -73,6 +70,8 @@
 }
 
 .version {
+  padding: 0.25em 0.5em;
+  float: left;
 }
 
 .syncing {

js/src/views/Application/Status/status.js

@@ -48,15 +48,13 @@ class Status extends Component {
         </div>
         { this.renderEnode() }
         <div className={ styles.netinfo }>
-          <div>
-            <BlockStatus />
-            <div className={ styles.peers }>
-              { netPeers.active.toFormat() }/{ netPeers.connected.toFormat() }/{ netPeers.max.toFormat() } peers
-            </div>
-          </div>
+          <BlockStatus />
           <div className={ netStyle }>
             { isTest ? 'test' : netChain }
           </div>
+          <div className={ styles.peers }>
+            { netPeers.active.toFormat() }/{ netPeers.connected.toFormat() }/{ netPeers.max.toFormat() } peers
+          </div>
         </div>
       </div>
     );

parity/cli/config.full.toml

@@ -47,7 +47,7 @@ hosts = ["none"]
 [ipc]
 disable = false
 path = "$HOME/.parity/jsonrpc.ipc"
-apis = ["web3", "eth", "net", "ethcore", "traces", "rpc", "personal_safe"]
+apis = ["web3", "eth", "net", "ethcore", "traces", "rpc", "personal", "personal_safe"]
 
 [dapps]
 disable = false

parity/cli/mod.rs

@@ -155,7 +155,7 @@ usage! {
 			or |c: &Config| otry!(c.ipc).disable.clone(),
 		flag_ipc_path: String = "$HOME/.parity/jsonrpc.ipc",
 			or |c: &Config| otry!(c.ipc).path.clone(),
-		flag_ipc_apis: String = "web3,eth,net,ethcore,traces,rpc,personal_safe",
+		flag_ipc_apis: String = "web3,eth,net,ethcore,traces,rpc,personal,personal_safe",
 			or |c: &Config| otry!(c.ipc).apis.clone().map(|vec| vec.join(",")),
 
 		// DAPPS
@@ -549,7 +549,7 @@ mod tests {
 			// IPC
 			flag_no_ipc: false,
 			flag_ipc_path: "$HOME/.parity/jsonrpc.ipc".into(),
-			flag_ipc_apis: "web3,eth,net,ethcore,traces,rpc,personal_safe".into(),
+			flag_ipc_apis: "web3,eth,net,ethcore,traces,rpc,personal,personal_safe".into(),
 
 			// DAPPS
 			flag_no_dapps: false,

parity/rpc.rs

@@ -63,7 +63,7 @@ impl Default for IpcConfiguration {
 		IpcConfiguration {
 			enabled: true,
 			socket_addr: parity_ipc_path("$HOME/.parity/jsonrpc.ipc"),
-			apis: ApiSet::UnsafeContext,
+			apis: ApiSet::IpcContext,
 		}
 	}
 }

parity/rpc_apis.rs

@@ -69,6 +69,7 @@ impl FromStr for Api {
 pub enum ApiSet {
 	SafeContext,
 	UnsafeContext,
+	IpcContext,
 	List(HashSet<Api>),
 }
 
@@ -139,6 +140,10 @@ impl ApiSet {
 				vec![Api::Web3, Api::Net, Api::Eth, Api::Ethcore, Api::Traces, Api::Rpc, Api::PersonalSafe]
 					.into_iter().collect()
 			},
+			ApiSet::IpcContext => {
+				vec![Api::Web3, Api::Net, Api::Eth, Api::Ethcore, Api::Traces, Api::Rpc, Api::PersonalAccounts, Api::PersonalSafe]
+					.into_iter().collect()
+			},
 			ApiSet::SafeContext => {
 				vec![Api::Web3, Api::Net, Api::Eth, Api::PersonalAccounts, Api::PersonalSafe, Api::Signer, Api::Ethcore, Api::EthcoreSet, Api::Traces, Api::Rpc]
 					.into_iter().collect()