Merge pull request #55 from GetScatter/master

Sidebar and FIO requests bugfix
GetScatter · Sep 29, 2020 · aa0b3a9 · aa0b3a9
2 parents 8b5561a + a7749c2
commit aa0b3a9
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bridge",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "private": true,
   "scripts": {
     "build": "npm run check && yarn && cross-env NODE_ENV=production BABEL_ENV=prod vue-cli-service build && npm run zip",

diff --git a/src/components/ManageAccounts.vue b/src/components/ManageAccounts.vue
@@ -201,7 +201,7 @@
 
 		&:not(.collapsed){
 			&.mobile {
-				z-index:9999999999999999;
+				z-index:9999;
 				background:white;
 				width:100%;
 			}

diff --git a/src/components/TopActions.vue b/src/components/TopActions.vue
@@ -15,6 +15,9 @@
 					<span v-if="!isSettings">Settings</span>
 					<span v-if="isSettings">Back</span>
 				</figure>
+				<figure v-if="isMobile" @click="toggleCollapsed" class="icon">
+					<i class="fas fa-user"></i>
+				</figure>
 				<!--<figure @click="selectAccount" class="icon"><i class="fal fa-user"></i><span>Accounts</span></figure>-->
 				<figure v-if="featureFlags.premium" class="icon breaker"></figure>
 				<figure v-if="featureFlags.premium" @click="transfer" class="icon"><i class="fal fa-money-bill-alt"></i><span>Send Money</span></figure>
@@ -80,7 +83,8 @@
 				'scatter',
 				'topActionsColor',
 				'currencies',
-				'loadingBalances'
+				'loadingBalances',
+				'collapsedSidebar'
 			]),
 			currency(){
 				return PriceService.fiatSymbol()
@@ -128,6 +132,9 @@
 					PopupService.push(Popups.editNetworkAccount(selectedNetwork));
 				}));
 			},
+			toggleCollapsed(){
+				this[UIActions.SET_COLLAPSED_SIDEBAR](!this.collapsedSidebar);
+			},
 			friends(){
 				if(!this.hasPremium){
 					PopupService.push(Popups.goPremium(success => {
@@ -223,7 +230,8 @@
 			},
 
 			...mapActions([
-				UIActions.SET_THEME
+				UIActions.SET_THEME,
+				UIActions.SET_COLLAPSED_SIDEBAR,
 			])
 		}
 	}

diff --git a/src/components/popups/fio/ShowFioRequests.vue b/src/components/popups/fio/ShowFioRequests.vue
@@ -140,7 +140,8 @@
 						if(this.fioData.length >= 5) break;
 						const request = requests[i];
 
-						const sharedSecret = await window.wallet.createSharedSecret('fio', this.account.publicKey, request.payee_fio_public_key).catch(() => null);
+						const key = this.state === STATES.RECEIVED ? request.payee_fio_public_key : request.payer_fio_public_key;
+						const sharedSecret = await window.wallet.createSharedSecret('fio', this.account.publicKey, key).catch(() => null);
 						if(!sharedSecret) continue;
 
 						const content = await plugin.decrypt('new_funds_content', request.content, sharedSecret).catch(err => {

diff --git a/src/views/_ViewBase.vue b/src/views/_ViewBase.vue
@@ -300,6 +300,16 @@
 				min-height:calc(100vh - #{$mobilenavbarheight});
 			}
 		}
+
+		.main-panel {
+			width:calc(100% - #{$accountssidebar} + 7px);
+
+			transition:width 0.2s ease;
+
+			&.expanded {
+				width:calc(100% + 7px);
+			}
+		}
 	}
 
 

diff --git a/yarn.lock b/yarn.lock
@@ -1309,10 +1309,10 @@
     web3 "^1.2.0"
     web3-provider-engine "^15.0.4"
 
-"@walletpack/fio@^0.0.27":
-  version "0.0.27"
-  resolved "https://registry.yarnpkg.com/@walletpack/fio/-/fio-0.0.27.tgz#300814243006f7cdea222642d90f0ea7030607ec"
-  integrity sha512-ak79iHiYkhpKS5SoxZk3NYUGnedfV5LzpUKN8WS640fWToonQAYA3Dx+7Uxef+hVVmnQAvjuz48w428TU0t3PQ==
+"@walletpack/fio@^0.0.28":
+  version "0.0.28"
+  resolved "https://registry.yarnpkg.com/@walletpack/fio/-/fio-0.0.28.tgz#551df9216ea362c83200aa5b782db0983ad35dc5"
+  integrity sha512-CJkj0Cgrd33kFZbuQd/+2h8tvF/4VwlG6Jo3AWZJ6QLj/j5AuE6KS3bRDZPupJA1sWBKazl5ZMdeUQiCkCfVEg==
   dependencies:
     "@fioprotocol/fiojs" "^1.0.1"
     "@walletpack/core" "^1.0.50"