From 361042ee44d1a45f775ba87a183380a29a036c58 Mon Sep 17 00:00:00 2001
From: Denis Davidyuk <denis_davidyuk@hotmail.com>
Date: Fri, 24 Apr 2020 23:49:39 +1000
Subject: [PATCH 1/2] TransactionFilters: Fix positioning

---
 src/popup/App.vue                             |  1 +
 .../router/components/TransactionFilters.vue  | 51 +++++++------------
 2 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/src/popup/App.vue b/src/popup/App.vue
index 1c8650dc1..43a1977d1 100644
--- a/src/popup/App.vue
+++ b/src/popup/App.vue
@@ -139,6 +139,7 @@ export default {
   position: relative;
   min-height: 600px;
   margin: 0 auto;
+  overflow: visible !important;
 
   &.ae-main-popup {
     background-color: $bg-color !important;
diff --git a/src/popup/router/components/TransactionFilters.vue b/src/popup/router/components/TransactionFilters.vue
index 149acc819..5e5958473 100644
--- a/src/popup/router/components/TransactionFilters.vue
+++ b/src/popup/router/components/TransactionFilters.vue
@@ -1,22 +1,20 @@
 <template>
-  <div :style="fixedheader" class="popup">
-    <div :style="fixedheader" id="filters" class="filters" data-cy="filters">
-      <span
-        class="date d-flex"
-        :class="type == 'date' ? 'active' : ''"
-        @click="filtrateTx('date', date_type)"
-      >
-        <span>{{ $t('pages.transactionDetails.date') }}</span>
-        <FilterArrow :class="direction" />
-      </span>
-      <span
-        v-for="filter in filters"
-        v-bind:key="filter.id"
-        :class="type == filter ? 'active' : filter"
-        @click="filtrateTx(filter)"
-        >{{ $t(`pages.transactionDetails.${filter}`) }}</span
-      >
-    </div>
+  <div id="filters" class="filters" data-cy="filters">
+    <span
+      class="date d-flex"
+      :class="type === 'date' ? 'active' : ''"
+      @click="filtrateTx('date', date_type)"
+    >
+      <span>{{ $t('pages.transactionDetails.date') }}</span>
+      <FilterArrow :class="direction" />
+    </span>
+    <span
+      v-for="filter in filters"
+      v-bind:key="filter.id"
+      :class="type === filter ? 'active' : filter"
+      @click="filtrateTx(filter)"
+      >{{ $t(`pages.transactionDetails.${filter}`) }}</span
+    >
   </div>
 </template>
 
@@ -35,26 +33,12 @@ export default {
       direction: '',
       type: 'date',
       date_type: 'recent',
-      fixedheader: '',
     };
   },
-  created() {
-    window.addEventListener('scroll', this.handleScroll);
-  },
-  destroyed() {
-    window.removeEventListener('scroll', this.handleScroll);
-  },
   computed: {
     ...mapGetters(['account', 'popup', 'sdk', 'current', 'transactions']),
   },
   methods: {
-    handleScroll() {
-      if (window.scrollY > 150) {
-        this.fixedheader = 'position:fixed; top:50px;max-width:357px';
-      } else {
-        this.fixedheader = '';
-      }
-    },
     filtrateTx(type, deteType) {
       switch (type) {
         case 'date':
@@ -111,6 +95,9 @@ export default {
 <style lang="scss" scoped>
 @import '../../../common/variables';
 .filters {
+  position: sticky;
+  top: 50px;
+  top: calc(env(safe-area-inset-top) + 50px);
   background: $filters-bg;
   height: 40px;
   width: 100%;

From 406358778ba0a49c1666d229e5c9d9d490d05403 Mon Sep 17 00:00:00 2001
From: Milen Radkov <milenradkov@me.com>
Date: Fri, 24 Apr 2020 17:15:39 +0300
Subject: [PATCH 2/2] 0.0.20

---
 config.xml        | 2 +-
 package-lock.json | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.xml b/config.xml
index df6b4c077..552e89236 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.superhero.cordova" version="0.0.19" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.superhero.cordova" version="0.0.20" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>SuperHero</name>
     <description>SuperHero wallet</description>
     <author email="dev@cordova.apache.org" href="http://cordova.io">
diff --git a/package-lock.json b/package-lock.json
index fe6645591..ccb56c48f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "superhero-wallet",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b8d109d0c..362d4be8f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "superhero-wallet",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "description": "Superhero wallet",
   "author": "SuperHero",
   "license": "MIT",