From 6ede0eba4c4843e87c8d0159169e055066464aae Mon Sep 17 00:00:00 2001
From: sairaj mote <sairajmote3@gmail.com>
Date: Sun, 6 Sep 2020 02:48:21 +0530
Subject: [PATCH] 0.0.21

---
 css/main.css     |  143 +++---
 css/main.min.css |    1 +
 css/main.scss    |  134 +++---
 index.html       | 1161 ++++++++++++++++++++++++----------------------
 4 files changed, 738 insertions(+), 701 deletions(-)
 create mode 100644 css/main.min.css

diff --git a/css/main.css b/css/main.css
index 5b2d5d0..1d8e0aa 100644
--- a/css/main.css
+++ b/css/main.css
@@ -1,9 +1,8 @@
-@import url("https://fonts.googleapis.com/css2?family=Barlow:wght@400;500;600;700&family=Roboto:wght@400;500;700&display=swap");
 * {
   box-sizing: border-box;
   padding: 0;
   margin: 0;
-  font-family: "Barlow", sans-serif;
+  font-family: "Roboto", sans-serif;
 }
 
 :root {
@@ -33,8 +32,35 @@ a {
   color: #111;
 }
 
+h1 {
+  font-size: 3.5rem;
+}
+
+h2 {
+  font-size: 2rem;
+}
+
+h3 {
+  font-size: 1.5rem;
+}
+
+h4 {
+  font-size: 1rem;
+}
+
+h5 {
+  font-size: 0.8rem;
+}
+
 h1, h2, h3, h4, h5 {
-  font-weight: 600;
+  font-family: "Manrope", sans-serif;
+  font-weight: 700;
+}
+
+p {
+  line-height: 1.5;
+  max-width: 60ch;
+  color: rgba(var(--text-color), 0.9);
 }
 
 button {
@@ -42,24 +68,24 @@ button {
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  text-transform: uppercase;
-  letter-spacing: 0.08em;
-  padding: 0.4rem 0.7rem;
-  font-weight: 600;
+  text-transform: capitalize;
+  padding: 0.6rem 1.2rem;
+  font-weight: 700;
   cursor: pointer;
-  border-radius: 0.2em;
+  border-radius: 0.3rem;
   color: var(--accent-color);
   transition: transform 0.3s;
   border: none;
   background: rgba(var(--text-color), 0.1);
   -webkit-tap-highlight-color: transparent;
+  font-family: "Manrope", sans-serif;
 }
 button:focus {
   outline: thin solid rgba(var(--text-color-light), 0.4);
 }
 button:disabled {
   cursor: default;
-  background: rgba(var(--text-color-light), 1);
+  background: rgba(var(--text-color), 0.5);
 }
 button:disabled ~ .loader {
   opacity: 0;
@@ -187,12 +213,6 @@ input:invalid {
     stroke-dashoffset: -210;
   }
 }
-p {
-  line-height: 1.5;
-  font-family: "Roboto", sans-serif;
-  color: rgba(var(--text-color), 0.8);
-}
-
 .action {
   position: relative;
   display: inline-flex;
@@ -205,9 +225,8 @@ p {
   background: none;
 }
 .action h4 {
-  font-weight: 500;
   padding: 0.5rem 0.8rem;
-  font-size: 1rem;
+  font-size: 0.9rem;
   clip-path: circle(100%);
   transition: clip-path 0.3s;
   border-radius: 0.2rem;
@@ -265,21 +284,19 @@ p {
   display: inline-grid;
   align-items: center;
   grid-template-columns: auto 1fr;
-  gap: 0.6rem 0.2rem;
+  gap: 0.6rem 0.4rem;
   margin-right: 1rem;
 }
 #logo h4 {
   letter-spacing: 0.06rem;
   word-spacing: 0.12rem;
-  margin-top: 0.2rem;
 }
 #logo h5 {
-  font-family: "Roboto", sans-serif;
   font-weight: 400;
 }
 #logo #main_logo {
-  height: 1.4rem;
-  width: 1.4rem;
+  height: 1.6rem;
+  width: 1.6rem;
   fill: rgba(var(--text-color), 1);
   stroke: none;
 }
@@ -315,7 +332,7 @@ textarea {
   border: 0.1em solid var(--accent-color);
 }
 .input .placeholder {
-  opacity: 0.7;
+  opacity: 0.6;
   font-weight: 500;
   font-size: 1em;
   position: absolute;
@@ -367,7 +384,6 @@ textarea {
 }
 .container-header h2 {
   flex: 1;
-  font-weight: 600;
 }
 .container-header button {
   align-self: center;
@@ -437,24 +453,23 @@ form {
   margin-left: auto;
 }
 .popup-container .popup .container-header {
-  display: grid;
-  grid-template-columns: auto 1fr auto;
+  display: flex;
   align-items: center;
   padding: 0;
-  gap: 1rem;
-  margin-bottom: 1.5rem;
+  margin-bottom: 1rem;
+}
+.popup-container .popup .container-header h4 {
+  flex: 1;
+}
+.popup-container .popup .container-header button {
+  width: auto;
 }
 .popup-container .popup .container-header .icon {
   cursor: pointer;
   padding-right: 0.4rem;
+  margin-right: 0.3rem;
   stroke-width: 8;
 }
-.popup-container .popup .container-header .btn {
-  padding: 0.6em 1.2em;
-}
-.popup-container .popup .container-header h3 {
-  text-transform: capitalize;
-}
 .popup-container .popup p {
   margin-bottom: 1.5rem !important;
 }
@@ -464,9 +479,6 @@ form {
 }
 #confirmation p, #prompt p {
   margin: 1rem;
-  font-size: 1rem;
-  font-weight: 500;
-  color: rgba(var(--rgb-bw), 1) !important;
 }
 #confirmation h4, #prompt h4 {
   font-weight: 500;
@@ -504,7 +516,6 @@ form {
 }
 #sign_in_popup p {
   margin-top: 1rem;
-  font-size: 0.9rem;
   margin-bottom: 0 !important;
 }
 #sign_in_popup .input {
@@ -513,7 +524,6 @@ form {
 
 .primary-btn {
   background: var(--accent-color);
-  padding: 0.8em 1.6em;
   justify-content: center;
   color: rgba(var(--foreground-color), 1);
 }
@@ -598,10 +608,8 @@ form {
 }
 
 #home_page h1 {
-  margin-top: 4vw;
-  margin-bottom: 1rem;
-  font-weight: 700;
-  font-size: 3rem;
+  margin-bottom: 0;
+  font-weight: 800;
 }
 #home_page p {
   margin-bottom: 3rem;
@@ -623,9 +631,10 @@ form {
   padding: 1.5rem;
   margin-right: 1rem;
   margin-bottom: 1rem;
-  width: 9rem;
-  border: solid 1px rgba(var(--text-color), 0.2);
+  width: 10rem;
+  box-shadow: 0 1px 0.1rem #00000030, 0 0 0.4rem #00000016;
   text-transform: capitalize;
+  transition: transform 0.3s;
   cursor: pointer;
 }
 .options-tab .option .icon {
@@ -636,8 +645,8 @@ form {
   margin-bottom: 1rem;
   stroke: rgba(var(--text-color), 0.4);
 }
-.options-tab .option h4 {
-  font-weight: 400;
+.options-tab .option:active {
+  transform: scale(0.95);
 }
 .options-tab .option:nth-of-type(1) .icon {
   background: #ffe5ea;
@@ -681,8 +690,11 @@ form {
   background: linear-gradient(rgba(var(--foreground-color), 1) 90%, transparent);
 }
 
-.secondary-btn {
-  background: none;
+sm-tab-header {
+  position: sticky;
+  top: 0;
+  background: rgba(var(--foreground-color), 1);
+  z-index: 1;
 }
 
 .request {
@@ -693,14 +705,11 @@ form {
   border: solid 1px rgba(var(--text-color), 0.2);
 }
 .request h5 {
-  color: rgba(var(--text-color-light), 1);
-  margin-bottom: 0.4rem;
+  margin-bottom: 0.2rem;
   text-transform: capitalize;
 }
 .request h3, .request h4 {
   margin-bottom: 1.5rem;
-  font-family: "Roboto", sans-serif;
-  font-weight: 500;
 }
 .request h4:last-of-type {
   margin-bottom: 0;
@@ -753,6 +762,7 @@ form {
 .container {
   display: grid;
   gap: 1em;
+  width: 100%;
   grid-template-columns: 1fr;
 }
 
@@ -765,15 +775,11 @@ form {
   grid-template-columns: 1fr auto;
   grid-template-areas: ". ." "search search";
   gap: 1rem;
-  position: sticky;
   top: 0;
   background: rgba(var(--foreground-color), 1);
   will-change: auto;
   z-index: 2;
 }
-.page .container-header h2 {
-  font-weight: 600;
-}
 .page .container-header .search {
   grid-area: search;
 }
@@ -814,16 +820,12 @@ form {
 }
 
 .time {
-  font-family: "Roboto", sans-serif;
   margin-bottom: 1.5rem !important;
-  font-weight: 400;
+  font-weight: 500;
 }
 
-#report_popup h4 {
-  font-weight: 400;
-}
-#report_popup textarea {
-  margin-top: 1rem;
+#report_popup {
+  width: 32rem;
 }
 
 #profile_page {
@@ -861,6 +863,7 @@ form {
 .complaints-container {
   padding-top: 1.5rem;
   display: grid;
+  align-items: flex-start;
   gap: 1.5rem;
 }
 
@@ -909,7 +912,7 @@ form {
     transform: translateY(0) scale(0.96);
     width: 24rem;
     align-self: center;
-    border-radius: 0.2rem;
+    border-radius: 0.4rem;
     height: auto;
   }
 
@@ -1003,8 +1006,6 @@ form {
 }
 
 #activity_page sm-tab-header {
-  position: sticky;
-  top: 0;
   margin-bottom: 1rem;
 }
 
@@ -1037,10 +1038,6 @@ form {
   body {
     padding: 1rem 12vw;
   }
-
-  .container {
-    grid-template-columns: repeat(3, 1fr);
-  }
 }
 @media only screen and (min-width: 1920px) {
   body {
@@ -1057,10 +1054,6 @@ form {
     font-size: 24px;
     padding: 2rem 30vw;
   }
-
-  .container {
-    grid-template-columns: repeat(4, 1fr);
-  }
 }
 @media only screen and (max-width: 320px) {
   body {
diff --git a/css/main.min.css b/css/main.min.css
new file mode 100644
index 0000000..ba4667a
--- /dev/null
+++ b/css/main.min.css
@@ -0,0 +1 @@
+#main_loader svg,.icon,.loader{fill:none;overflow:visible}.action,button{position:relative}*{box-sizing:border-box;padding:0;margin:0;font-family:Roboto,sans-serif}button,h1,h2,h3,h4,h5{font-family:Manrope,sans-serif}:root{scroll-behavior:smooth}body{--accent-color:#303F9F;--text-color:17,17,17;--text-color-light:85,85,85;--foreground-color:255,255,255;--background-color:#e8e8e8;--dark-shade:#dadada;background:var(--foreground-color);color:rgba(var(--text-color),1);font-size:16px;margin:1.5rem}a{font-weight:600;text-decoration:none;color:var(--accent-color)}.dark-text{color:#111}h1{font-size:3.5rem}h2{font-size:2rem}h3{font-size:1.5rem}h4{font-size:1rem}h5{font-size:.8rem}h1,h2,h3,h4,h5{font-weight:700}p{line-height:1.5;max-width:60ch;color:rgba(var(--text-color),.9)}button{display:inline-flex;align-items:center;justify-content:center;text-transform:capitalize;padding:.6rem 1.2rem;font-weight:700;cursor:pointer;border-radius:.3rem;color:var(--accent-color);transition:transform .3s;border:none;background:rgba(var(--text-color),.1);-webkit-tap-highlight-color:transparent}button:focus{outline:solid thin}button:disabled{cursor:default;background:rgba(var(--text-color),.5)}.action,.action[disabled] .primary-btn{background:0 0}button:disabled~.loader{opacity:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{-webkit-appearance:none;margin:0}.request .flex,.request button,.top-margin{margin-top:1.5rem}input[type=text]::-ms-clear{display:none;width:0;height:0}input[type=text]::-ms-reveal{display:none;width:0;height:0}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration,input[type=search]::-webkit-search-results-button,input[type=search]::-webkit-search-results-decoration{display:none}input[type=number]{-moz-appearance:textfield}input:invalid{outline:0;box-shadow:none}::-moz-focus-inner{border:none}.bottom-padding{padding-bottom:1.5rem}.top-padding{padding-top:1em}.bottom-margin{margin-bottom:1.5rem}.flex{display:flex}.grid{display:grid}.grid-2{grid-template-columns:auto auto;gap:1em}.label{margin-bottom:.4rem}.light-text{color:rgba(var(--text-color-light),1)}.hide{opacity:0;pointer-events:none}.hide-completely{display:none!important}.breakable{word-break:break-all}.separator{padding:.1em}.no-transformations{transform:none!important}.loader{stroke-width:10;stroke:var(--accent-color);height:2rem;width:2rem;stroke-dashoffset:230;stroke-dasharray:230;padding:2px;justify-self:center}#logo,.action{align-items:center}@keyframes rotate{100%{transform:rotate(360deg)}}@keyframes load{50%{stroke-dashoffset:0}100%{stroke-dashoffset:-210}}.action{display:inline-flex;justify-content:center;padding:0}#sign_in_popup .input,.input,textarea{background:rgba(var(--text-color),.1)}.action h4{padding:.5rem .8rem;font-size:.9rem;clip-path:circle(100%);transition:clip-path .3s;border-radius:.2rem}.action .btn{z-index:2}.action .loader{position:absolute;z-index:1;padding:.4em}.clip{clip-path:circle(0)!important}.animate-loader{animation:load 2.6s infinite,rotate 1s infinite linear}.expand{width:100%}.fade-left{animation:fadeleft .3s}.fade-right{animation:faderight .3s}@keyframes faderight{from{opacity:0;transform:translateX(-1em)}to{opacity:1;transform:none}}@keyframes fadeleft{from{opacity:0;transform:translateX(1em)}to{opacity:1;transform:none}}#logo{display:inline-grid;grid-template-columns:auto 1fr;gap:.6rem .4rem;margin-right:1rem}#logo h4{letter-spacing:.06rem;word-spacing:.12rem}#logo h5{font-weight:400}#logo #main_logo{height:1.6rem;width:1.6rem;fill:rgba(var(--text-color),1);stroke:none}textarea{width:100%;max-width:100%;border:none;border-radius:.2rem;resize:none;font-size:1rem;line-height:1.6;padding:.8rem}.input{display:flex;width:100%;align-items:center;position:relative;padding:.8em;margin-bottom:1.5em;border-radius:.2rem;border:.1em solid transparent;cursor:text}.input:last-of-type{margin-bottom:0}.input:focus-within{border:.1em solid var(--accent-color)}.input .placeholder{opacity:.6;font-weight:500;font-size:1em;position:absolute;transition:transform .3s ease;transform-origin:left;pointer-events:none;will-change:contents;text-transform:capitalize}.input input{flex:1;font-size:1rem;border:none;background:0 0;outline:0;color:rgba(var(--text-color),1)}.animate-label input{transform:translateY(.5em)}.animate-label .placeholder{transform:translateY(-60%) scale(.7);opacity:1;color:var(--accent-color)}.btn,.primary-btn{color:rgba(var(--foreground-color),1)}.container:empty~.empty{display:grid}.empty{display:none;place-items:center;width:100%}.empty svg{stroke:rgba(var(--text-color),.8);height:12em;width:12em}.container-header{display:flex;align-items:center;flex-direction:row;width:100%;padding:1rem 0}.container-header h2{flex:1}.container-header button{align-self:center}.btn{background:var(--accent-color);padding:.4em 1em}.back-arrow{stroke:rgba(var(--text-color),1);stroke-width:6;fill:none;height:2rem;padding:.5rem .5rem .5rem 0;cursor:pointer}.card{border-radius:.6rem;padding:1.5em;background:rgba(var(--foreground-color),1)}.solid-background{background:rgba(var(--foreground-color),1)!important}form{width:100%}.popup-container{display:grid;position:fixed;top:0;bottom:0;left:0;right:0;place-items:center;background:rgba(0,0,0,.4);z-index:10;transition:opacity .3s ease}.popup-container .popup{flex-direction:column;align-self:flex-end;align-items:flex-start;flex-wrap:wrap;width:100%;border-radius:.5rem .5rem 0 0;padding:1.5rem;position:relative;display:flex;background:rgba(var(--foreground-color),1);transform:translateY(100%);transition:transform .3s;box-shadow:0 2rem 2rem rgba(0,0,0,.24);overflow-y:auto}.popup-container .popup h5{margin:.5rem 0}.popup-container .popup button:first-of-type{margin-left:auto}.popup-container .popup .container-header{display:flex;align-items:center;padding:0;margin-bottom:1rem}.popup-container .popup .container-header h4{flex:1}.popup-container .popup .container-header button{width:auto}.popup-container .popup .container-header .icon{cursor:pointer;padding-right:.4rem;margin-right:.3rem;stroke-width:8}.popup-container .popup p{margin-bottom:1.5rem!important}#confirmation,#prompt{flex-direction:column}#confirmation p,#prompt p{margin:1rem}#confirmation h4,#prompt h4{font-weight:500;margin-bottom:1.5rem}#confirmation .input,#prompt .input{margin-bottom:1rem}#confirmation .btns,#prompt .btns{display:flex;justify-content:right;width:100%}#confirmation .btns button,#prompt .btns button{background:0 0}#confirmation .btns button:first-of-type,#prompt .btns button:first-of-type{margin-right:.6em}.refresh{margin-top:.6em;margin-bottom:1em}#sign_in_popup h1{margin-top:2rem}#sign_in_popup h4{font-weight:500;margin-bottom:3rem}#sign_in_popup button{margin:1rem 0}#sign_in_popup p{margin-top:1rem;margin-bottom:0!important}.primary-btn{background:var(--accent-color);justify-content:center}#main_header{align-items:center;padding:1em 0;justify-content:space-between}#main_header #display_balance{display:grid;grid-template-columns:1fr auto;grid-template-areas:"title title" " . .";gap:.3rem .5rem;align-items:center;text-align:right}#main_header #display_balance h5{grid-area:title}#main_header #display_balance .icon{height:1.4rem;width:1.4rem;padding:.3rem;stroke-width:10;cursor:pointer}.icon{height:1.2rem;width:1.2rem;stroke:rgba(var(--text-color),.8);stroke-width:6;stroke-linecap:round;stroke-linejoin:round}#navbar{display:flex;flex-direction:row;align-items:center;justify-content:space-evenly;position:fixed;left:0;right:0;bottom:0;top:auto;border-top:solid 1px rgba(var(--text-color),.2);border-right:none;z-index:3;background:rgba(var(--foreground-color),1)}#navbar .navbar-item{position:relative;text-align:center;cursor:pointer;padding:.3em;margin:.3em;border-radius:.4em;color:rgba(var(--text-color),.8);font-size:.9em;text-transform:uppercase;width:100%;letter-spacing:.08em}#navbar .navbar-item h5{font-size:.6em;margin-top:.4em;font-weight:700}#navbar .active{color:var(--accent-color)}#navbar .active .icon{stroke:var(--accent-color)}.banking{stroke-width:4}#home_page h1{margin-bottom:0;font-weight:800}#home_page p{margin-bottom:3rem}#home_page h2{margin-bottom:1rem}.options-tab{display:flex;margin-top:1rem;margin-bottom:1rem;flex-wrap:wrap}.options-tab .option{display:inline-flex;flex-direction:column;border-radius:.4rem;padding:1.5rem;margin-right:1rem;margin-bottom:1rem;width:10rem;box-shadow:0 1px .1rem #00030,0 0 .4rem #00016;text-transform:capitalize;transition:transform .3s;cursor:pointer}.options-tab .option .icon{height:2.8rem;width:2.8rem;padding:.8rem;border-radius:2rem;margin-bottom:1rem;stroke:rgba(var(--text-color),.4)}.options-tab .option:active{transform:scale(.95)}.options-tab .option:nth-of-type(1) .icon{background:#ffe5ea;stroke:#af0f2c}.options-tab .option:nth-of-type(2) .icon{background:#fff9d5;stroke:#e69620}.options-tab .option:nth-of-type(3) .icon{background:#e5ffe3;stroke:#189b0f}.options-tab .option:nth-of-type(4) .icon{background:#e4fbff;stroke:#0b8ea5}.options-tab .option:nth-of-type(5) .icon{background:#efe5ff;stroke:#10359b}.notification-dot::after{content:"";position:absolute;z-index:1;top:0;right:0;height:.6em;width:.6em;background-color:#E53935;border-radius:.4em;transition:transform .3s}.shrink.notification-dot::after{transform:scale(0)}#deposit .container-header,#withdraw .container-header{background:linear-gradient(rgba(var(--foreground-color),1) 90%,transparent)}.page .container-header,sm-tab-header{top:0;background:rgba(var(--foreground-color),1)}sm-tab-header{position:sticky;z-index:1}.request{display:inline-flex;flex-direction:column;padding:1.5em;border-radius:.4em;border:1px solid}.request h5{margin-bottom:.2rem;text-transform:capitalize}.request h3,.request h4{margin-bottom:1.5rem}.copy-row h4,.request button{margin-bottom:0}.request h4:last-of-type{margin-bottom:0}.request .action{align-self:flex-end}.request .amount{font-size:1.4em}.request button{width:auto;align-self:flex-end}.request .copy-row{margin-bottom:1.5rem}.request .flex{align-items:center;justify-content:flex-end}.request .flex button,.request .flex h5{margin:0}.deposited{color:#007732}.deposited::before{content:"+ "}.decline-request{margin-right:.5rem!important}.withdrawn{color:#d43125}.withdrawn::before{content:"- "}.container{display:grid;gap:1em;width:100%;grid-template-columns:1fr}.copy-row,.page .container-header{display:grid;grid-template-columns:1fr auto}.page{padding:2rem 0;padding-bottom:4rem}.page .container-header{grid-template-areas:". ." "search search";gap:1rem;will-change:auto;z-index:2}.page .container-header .search{grid-area:search}.page .container-header .search input{padding:1em;border:none;width:100%;background:var(--dark-shade);font-size:1rem;font-weight:500;color:rgba(var(--text-color),1);border-radius:.2em}.page .container-header .search input:focus{outline:0;background:rgba(var(--text-color-light),.2)}.copy-row{align-items:center;gap:.5rem}.copy-row .icon{cursor:pointer;padding:.4rem;height:1.8rem;width:1.8rem}.copy-row .copy{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.time{margin-bottom:1.5rem!important;font-weight:500}#report_popup{width:32rem}#profile_page{display:flex;flex-direction:column}#profile_page button{align-self:flex-start}.complaint{display:grid;gap:1.5rem 0}.complaint .complaint-actions{align-items:center;margin:1.5rem 0 0}#helpline_page sm-select,.complaint .processed,.complaint .unprocessed{margin-bottom:1.5rem}.complaint .processed{color:#007732}.complaint .unprocessed{color:#d43125}.complaint button .icon{padding:.2rem;margin-right:.5rem;stroke:var(--accent-color);stroke-width:8}.complaints-container{padding-top:1.5rem;display:grid;align-items:flex-start;gap:1.5rem}.complaint-placeholder{animation:pulse infinite .6s alternate}.complaint-placeholder h4,.complaint-placeholder h5{border-radius:.2rem}.complaint-placeholder h5{background:rgba(var(--text-color),.1);padding:.5rem .6rem}.complaint-placeholder h4{background:rgba(var(--text-color),.2);padding:.8rem}.complaint-placeholder .demo-btn{padding:.8rem 3rem}@keyframes pulse{from{opacity:.4}to{opacity:1}}@media only screen and (max-width:640px){sm-select{width:100%}}@media only screen and (min-width:640px){body{padding:1rem 6vw;margin-left:6rem}.popup-container .popup{transform:translateY(0) scale(.96);width:24rem;align-self:center;border-radius:.4rem;height:auto}#confirmation{width:24rem}.container{grid-template-columns:repeat(2,1fr)}#navbar{justify-content:center;flex-direction:column;align-items:stretch;left:0;bottom:0;top:0;right:auto;width:6rem;border-top:none;border-right:solid 1px rgba(var(--text-color),.2)}#navbar .navbar-item{width:auto;padding:1.4em 0;margin:.6em}#navbar .navbar-item .icon{height:1.4rem;width:1.4rem}#navbar .navbar-item h5{font-size:.8em}#navbar .navbar-item:hover .icon{stroke:rgba(var(--text-color),1)}#navbar .navbar-item:hover h5{color:rgba(var(--text-color),1)}#navbar .navbar-item.active:hover .icon{stroke:var(--accent-color)}#navbar .navbar-item.active:hover h5{color:var(--accent-color)}.page{padding-bottom:2em}#sign_in_popup{width:24rem}}#profile_page .copy-row{display:inline-flex}#main_loader{box-shadow:none;background:0 0;text-align:center;align-items:center;flex-direction:column}#main_loader button{margin-left:0;margin-top:1.5rem}#main_loader svg{height:2rem;width:2rem;stroke:var(--accent-color);stroke-width:6;stroke-linecap:round;stroke-dashoffset:210;stroke-dasharray:210;justify-self:center;align-self:center;margin-bottom:2rem}#main_loader h3{width:100%;text-transform:uppercase;font-weight:400;word-spacing:.16em}#activity_page sm-tab-header{margin-bottom:1rem}@media only screen and (min-width:800px){.container{grid-template-columns:repeat(3,1fr)}.complaint{gap:0 1.5rem;grid-template-columns:1fr 1fr;grid-template-areas:". . " "header header"}.complaint .complaint-actions{grid-area:header}.complaint .left{border-right:1px solid rgba(var(--text-color),.2);padding-right:1.5rem}.complaint .right{display:flex;justify-content:center;flex-direction:column}}@media only screen and (min-width:1280px){body{padding:1rem 12vw}}@media only screen and (min-width:1920px){body{font-size:24px;padding:2rem 20vw}.container{grid-template-columns:repeat(4,1fr)}}@media only screen and (min-width:2048px){body{font-size:24px;padding:2rem 30vw}}@media only screen and (max-width:320px){body{font-size:14px}}@media (prefers-color-scheme:dark){:root{--text-color:238,238,238;--text-color-light:170,170,170;--foreground-color:26,26,26;--background-color:#111;--dark-shade:#1a1a1a}}@media (prefers-color-scheme:light){:root{--text-color:17,17,17;--text-color-light:85,85,85;--foreground-color:255,255,255;--background-color:#e8e8e8;--dark-shade:#dadada}}@media (prefers-color-scheme:no-preference){:root{--text-color:17,17,17;--text-color-light:85,85,85;--foreground-color:255,255,255;--background-color:#e8e8e8;--dark-shade:#dadada}}
\ No newline at end of file
diff --git a/css/main.scss b/css/main.scss
index 40f216c..959da6b 100644
--- a/css/main.scss
+++ b/css/main.scss
@@ -1,9 +1,8 @@
-@import url('https://fonts.googleapis.com/css2?family=Barlow:wght@400;500;600;700&family=Roboto:wght@400;500;700&display=swap');
 *{
     box-sizing: border-box;
     padding: 0;
     margin: 0;
-    font-family: 'Barlow', sans-serif;
+    font-family: 'Roboto', sans-serif;
 }
 :root{
     scroll-behavior: smooth;
@@ -28,31 +27,52 @@ a{
 .dark-text{
     color: #111;
 }
+h1{
+    font-size: 3.5rem;
+}
+h2{
+    font-size: 2rem;
+}
+h3{
+    font-size: 1.5rem;
+}
+h4{
+    font-size: 1rem;
+}
+h5{
+    font-size: 0.8rem;
+}
 h1,h2,h3,h4,h5{
-    font-weight: 600;
+    font-family: 'Manrope', sans-serif;
+    font-weight: 700;
 }   
+p{
+    line-height: 1.5;
+    max-width: 60ch;
+    color: rgba(var(--text-color), 0.9);
+}
 button{
     position: relative;
     display: inline-flex;
     align-items: center;
     justify-content: center;
-    text-transform: uppercase;
-    letter-spacing: 0.08em;
-    padding: 0.4rem 0.7rem;
-    font-weight: 600;
+    text-transform: capitalize;
+    padding: 0.6rem 1.2rem;
+    font-weight: 700;
     cursor: pointer;
-    border-radius: 0.2em;
+    border-radius: 0.3rem;
     color: var(--accent-color);
     transition: transform 0.3s;
     border: none;
     background: rgba(var(--text-color), 0.1);
     -webkit-tap-highlight-color: transparent;
+    font-family: 'Manrope', sans-serif;
     &:focus{
         outline: thin solid rgba(var(--text-color-light), .4);
     }
     &:disabled{
         cursor: default;
-        background: rgba(var(--text-color-light), 1);
+        background: rgba(var(--text-color), 0.5);
     }
     &:disabled ~ .loader{
         opacity: 0;
@@ -148,11 +168,6 @@ input:invalid{
         stroke-dashoffset: -210;
     }
 }
-p{
-    line-height: 1.5;
-    font-family: 'Roboto', sans-serif;
-    color: rgba(var(--text-color), 0.8);
-}
 .action{
     position: relative;
     display: inline-flex;
@@ -166,9 +181,8 @@ p{
         }
     }
     h4{
-        font-weight: 500;
         padding: 0.5rem 0.8rem;
-        font-size: 1rem;
+        font-size: 0.9rem;
         clip-path: circle(100%);
         transition: clip-path 0.3s;
         border-radius: 0.2rem;
@@ -221,20 +235,18 @@ p{
     display: inline-grid;
     align-items: center;
     grid-template-columns: auto 1fr;
-    gap: 0.6rem 0.2rem;
+    gap: 0.6rem 0.4rem;
     margin-right: 1rem;
     h4{
         letter-spacing: 0.06rem;
         word-spacing: 0.12rem;
-        margin-top: 0.2rem;
     }
     h5{
-        font-family: 'Roboto', sans-serif;
         font-weight: 400;
     }
     #main_logo{
-        height: 1.4rem;
-        width: 1.4rem;
+        height: 1.6rem;
+        width: 1.6rem;
         fill: rgba(var(--text-color), 1);
         stroke: none;
     }
@@ -268,7 +280,7 @@ textarea{
         border: 0.1em solid var(--accent-color);
     }
     .placeholder{
-        opacity: .7;
+        opacity: .6;
         font-weight: 500;
         font-size: 1em;
         position: absolute;
@@ -318,7 +330,6 @@ textarea{
     padding: 1rem 0;
     h2{
         flex: 1;
-        font-weight: 600;
     }
     button{
         align-self: center;
@@ -381,23 +392,22 @@ form{
             margin-left: auto;
         }
         .container-header{
-            display: grid;
-            grid-template-columns: auto 1fr auto;
+            display: flex;
             align-items: center;
             padding: 0;
-            gap: 1rem;
-            margin-bottom: 1.5rem;
+            margin-bottom: 1rem;
+            h4{
+                flex: 1;
+            }
+            button{
+                width: auto;
+            }
             .icon{
                 cursor: pointer;
                 padding-right: 0.4rem;
+                margin-right: 0.3rem;
                 stroke-width: 8;
             }
-            .btn{
-                padding: 0.6em 1.2em;
-            }
-            h3{
-                text-transform: capitalize;
-            }
         }
         p{
             margin-bottom: 1.5rem !important;
@@ -408,9 +418,6 @@ form{
     flex-direction: column;
     p{
         margin: 1rem;
-        font-size: 1rem;
-        font-weight: 500;
-        color: rgba(var(--rgb-bw),1) !important;
     }
     h4{
         font-weight: 500;
@@ -448,7 +455,6 @@ form{
     }
     p{
         margin-top: 1rem;
-        font-size: 0.9rem;
         margin-bottom: 0 !important;
     }
     .input{
@@ -457,7 +463,6 @@ form{
 }
 .primary-btn{
     background: var(--accent-color);
-    padding: 0.8em 1.6em;
     justify-content: center;
     color: rgba(var(--foreground-color), 1);
 }
@@ -539,10 +544,8 @@ form{
 }
 #home_page{
     h1{
-        margin-top: 4vw;
-        margin-bottom: 1rem;
-        font-weight: 700;
-        font-size: 3rem;
+        margin-bottom: 0;
+        font-weight: 800;
     }
     p{
         margin-bottom: 3rem;
@@ -563,9 +566,10 @@ form{
         padding: 1.5rem;
         margin-right: 1rem;
         margin-bottom: 1rem;
-        width: 9rem;
-        border: solid 1px rgba(var(--text-color), 0.2);
+        width: 10rem;
+        box-shadow: 0 1px 0.1rem #00000030, 0 0 0.4rem #00000016;
         text-transform: capitalize;
+        transition: transform 0.3s;
         cursor: pointer;
         .icon{
             height: 2.8rem;
@@ -575,8 +579,8 @@ form{
             margin-bottom: 1rem;
             stroke: rgba(var(--text-color), 0.4);
         }
-        h4{
-            font-weight: 400;
+        &:active{
+            transform: scale(0.95);
         }
         &:nth-of-type(1){
             .icon{
@@ -630,8 +634,11 @@ form{
         background: linear-gradient(rgba(var(--foreground-color), 1) 90%, transparent);
     }
 }
-.secondary-btn{
-    background: none;
+sm-tab-header{
+    position: sticky;
+    top: 0;
+    background: rgba(var(--foreground-color), 1);
+    z-index: 1;
 }
 .request{
     display: inline-flex;
@@ -640,14 +647,11 @@ form{
     border-radius: 0.4em;
     border: solid 1px rgba(var(--text-color), 0.2);
     h5{
-        color: rgba(var(--text-color-light), 1);
-        margin-bottom: 0.4rem;
+        margin-bottom: 0.2rem;
         text-transform: capitalize;
     }
     h3,h4{
         margin-bottom: 1.5rem;
-        font-family: 'Roboto', sans-serif;
-        font-weight: 500;
     }
     h4:last-of-type{
         margin-bottom: 0;
@@ -697,6 +701,7 @@ form{
 .container{
     display: grid;
     gap: 1em;
+    width: 100%;
     grid-template-columns: 1fr;
 }
 .page{
@@ -708,14 +713,10 @@ form{
         grid-template-areas: '. .'
                             'search search';
         gap: 1rem;
-        position: sticky;
         top: 0;
         background: rgba(var(--foreground-color), 1);
         will-change: auto;
         z-index: 2;
-        h2{
-            font-weight: 600;
-        }
         .search{
             grid-area: search;
             input{
@@ -756,17 +757,11 @@ form{
     }
 }
 .time{
-    font-family: 'Roboto', sans-serif;
     margin-bottom: 1.5rem !important;
-    font-weight: 400;
+    font-weight: 500;
 }
 #report_popup{
-    h4{
-        font-weight: 400;
-    }
-    textarea{
-        margin-top: 1rem;
-    }
+    width: 32rem;
 }
 #profile_page{
     display: flex;
@@ -803,6 +798,7 @@ form{
 .complaints-container{
     padding-top: 1.5rem;
     display: grid;
+    align-items: flex-start;
     gap: 1.5rem;
 }
 #helpline_page{
@@ -850,7 +846,7 @@ form{
             transform: translateY(0) scale(0.96);
             width: 24rem;
             align-self: center;
-            border-radius: 0.2rem;
+            border-radius: 0.4rem;
             height: auto;
         }
     }
@@ -945,8 +941,6 @@ form{
 }
 #activity_page{
     sm-tab-header{
-        position: sticky;
-        top: 0;
         margin-bottom: 1rem;
     }
 }
@@ -978,9 +972,6 @@ form{
     body{
        padding: 1rem 12vw;
     }
-    .container{
-        grid-template-columns: repeat(3, 1fr);
-    }
 }
 @media only screen and (min-width: 1920px){
     body{
@@ -996,9 +987,6 @@ form{
         font-size: 24px;
         padding: 2rem 30vw;
     }
-    .container{
-        grid-template-columns: repeat(4, 1fr);
-    }
 }
 @media only screen and (max-width: 320px){
     body{
diff --git a/index.html b/index.html
index c324019..60432c9 100644
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Blockchain UPI</title>
     <link
-        href="https://fonts.googleapis.com/css2?family=Barlow:wght@400;500;600;700&family=Roboto:wght@400;500;700&display=swap"
+        href="https://fonts.googleapis.com/css2?family=Manrope:wght@400;500;600;700;800&family=Roboto:wght@400;500;700&display=swap"
         rel="stylesheet">
     <link rel="stylesheet" href="css/main.css">
 </head>
@@ -21,7 +21,7 @@
             <p id="confirm_message"></p>
             <div class="btns">
                 <button class="hover cancel-btn">Cancel</button>
-                <button class="hover submit-btn">Ok</button>
+                <button class="hover submit-btn">OK</button>
             </div>
         </div>
     </div>
@@ -45,7 +45,7 @@
                 <title>Loader</title>
                 <path d="M72.5,36.5c0,19.88-16.12,36-36,36s-36-16.12-36-36s16.12-36,36-36S72.5,16.62,72.5,36.5" />
             </svg>
-            <h3 id="tip_container">Loading BLOCKCHAIN UPi</h3>
+            <h4 id="tip_container">Loading BLOCKCHAIN UPI </h4>
             <button onclick="signOut()">Reset</button>
         </div>
     </div>
@@ -76,7 +76,7 @@
                     <line x1="64" y1="0" x2="0" y2="64" />
                     <line x1="64" y1="64" x2="0" y2="0" />
                 </svg>
-                <h3>Transfer Rupee</h3>
+                <h4>Transfer Rupee</h4>
                 <button id="send_tokens_btn" class="action expand" type="submit" disabled>
                     <h4 class="expand primary-btn">
                         transfer
@@ -111,10 +111,10 @@
                     <line x1="64" y1="0" x2="0" y2="64" />
                     <line x1="64" y1="64" x2="0" y2="0" />
                 </svg>
-                <h3>Deposit rupee</h3>
+                <h4>Deposit rupee</h4>
                 <button id="request_tokens_btn" class="action expand" type="submit" disabled>
                     <h4 class="primary-btn expand">
-                        deposit
+                        Continue
                     </h4>
                     <svg viewBox="0 0 73 73" class="loader">
                         <path
@@ -122,15 +122,22 @@
                     </svg>
                 </button>
             </div>
-            <p>
-                Deposit rupee through UPI to use as Digital currency powered by blockchain.
-            </p>
-            <form autocomplete="off" onsubmit="return false">
+            <form id="deposit_amount_section" autocomplete="off" onsubmit="return false">
+                <p>
+                    Deposit rupee through UPI to use as Digital currency powered by blockchain.
+                </p>
                 <label class="input">
                     <input id="token_amount_to_buy" inputmode="numeric" type="number" min="1" required>
                     <div class="placeholder">Amount</div>
                 </label>
             </form>
+            <form id="upi_txId_section" class="hide-completely top-padding" autocomplete="off" onsubmit="return false">
+                <p id="send_cash_to_deposit"></p>
+                <label class="input">
+                    <input id="deposited_rupee_txId" required disabled>
+                    <div class="placeholder">UPI TxID</div>
+                </label>
+            </form>
         </div>
     </div>
     <div class="popup-container hide">
@@ -141,7 +148,7 @@
                     <line x1="64" y1="0" x2="0" y2="64" />
                     <line x1="64" y1="64" x2="0" y2="0" />
                 </svg>
-                <h3>Withdraw rupee</h3>
+                <h4>Withdraw rupee</h4>
                 <button id="withdraw_cash_btn" class="action expand" type="submit" disabled>
                     <h4 class="primary-btn expand">
                         withdraw
@@ -175,23 +182,23 @@
                     <line x1="64" y1="0" x2="0" y2="64" />
                     <line x1="64" y1="64" x2="0" y2="0" />
                 </svg>
-                <h3>Request rupee</h3>
-                <button id="request_rupee_btn" class="action expand" type="submit" disabled>
-                    <h4 class="primary-btn expand">
-                        request
-                    </h4>
-                    <svg viewBox="0 0 73 73" class="loader">
-                        <path
-                            d="M72.5,36.5c0,19.88-16.12,36-36,36s-36-16.12-36-36s16.12-36,36-36S72.5,16.62,72.5,36.5" />
-                    </svg>
-                </button>
+                <h4>Request rupee</h3>
+                    <button id="request_rupee_btn" class="action expand" type="submit" disabled>
+                        <h4 class="primary-btn expand">
+                            request
+                        </h4>
+                        <svg viewBox="0 0 73 73" class="loader">
+                            <path
+                                d="M72.5,36.5c0,19.88-16.12,36-36,36s-36-16.12-36-36s16.12-36,36-36S72.5,16.62,72.5,36.5" />
+                        </svg>
+                    </button>
             </div>
             <p>
                 Request for rupee tokens from other's using FLO address.
             </p>
             <form autocomplete="off" onsubmit="return false">
                 <label class="input">
-                    <input id="requested_address" minlength="20" type="text" required>
+                    <input floId id="requested_address" minlength="20" type="text" required>
                     <div class="placeholder">Request from</div>
                 </label>
                 <label class="input">
@@ -209,7 +216,7 @@
                     <line x1="64" y1="0" x2="0" y2="64" />
                     <line x1="64" y1="64" x2="0" y2="0" />
                 </svg>
-                <h3>Pay through cashier</h3>
+                <h4>Pay through cashier</h4>
                 <button id="cnf_cash_payment" class="action expand" type="submit" disabled>
                     <h4 class="primary-btn expand">
                         pay
@@ -224,10 +231,10 @@
                 Don't have enough token balance? Pay to our cashier through UPI and your cash will be
                 transfered as Rupee tokens.
             </p>
-            <p><strong id="pay_cashier_info"></strong></p>
+            <p id="pay_cashier_info"></p>
             <form autocomplete="off" onsubmit="return false">
                 <label class="input">
-                    <input id="recvr_id" type="text" required>
+                    <input floId id="recvr_id" type="text" required>
                     <div class="placeholder">Reciever's FLO ID</div>
                 </label>
                 <label class="input">
@@ -250,11 +257,11 @@
                     <line x1="64" y1="0" x2="0" y2="64" />
                     <line x1="64" y1="64" x2="0" y2="0" />
                 </svg>
-                <h3>Report</h3>
-                <button id="report_btn" class="btn">report</button>
+                <h4>Report</h4>
+                <button id="report_btn" class="primary-btn">report</button>
             </div>
-            <h4>Please add any message you want to send us regarding this issue</h4>
-            <textarea name="complaint" id="complaint_field" rows="6"></textarea>
+            <textarea name="complaint" placeholder="Please describe issue in detail." id="complaint_field"
+                rows="10"></textarea>
         </div>
     </div>
 
@@ -280,7 +287,7 @@
         </div>
         <div id="display_balance">
             <h5>Rupee Balance</h5>
-            <h3 id="token_balance">0</h3>
+            <h4 id="token_balance">0</h4>
             <svg class="icon" onclick="refresh_balance(this)" viewBox="0 0 64 64">
                 <title>refresh balance</title>
                 <path d="M60.94,43.13A30.87,30.87,0,1,1,59,17.93" />
@@ -386,13 +393,13 @@
     </nav>
     <main class="hide-completely">
         <section class="page hide-completely" id="home_page">
-            <h1>What DO WE OFFER?</h1>
+            <h1>What is Blockchain UPI?</h1>
             <p>
                 Your Rupee balance is digital footprint of actual cash.<br> Deposit, Withdraw or Pay Rupee digitally
                 using a FLO Blockchain address.
             </p>
 
-            <h3>Go ahead and try something</h3>
+            <h4>Go ahead and try something</h4>
 
             <div class="options-tab">
                 <div class="option" onclick="showPopup('cash_transfer')">
@@ -651,18 +658,14 @@
             </div>
         </section>
         <section id="request_page" class="page hide-completely">
-            <div class="container-header">
-                <h2>Payment Requests</h2>
-            </div>
-            <p class="bottom-margin">These are payment requests you received.</p>
+            <h2>Payment Requests</h2>
+            <p class="bottom-margin">Your payment requests will appear here.</p>
             <div id="payment_request_container" class="container">
                 <h4>You don't have any requests.</h4>
             </div>
         </section>
         <section id="activity_page" class="page">
-            <div class="container-header">
-                <h2>Activity</h2>
-            </div>
+            <h2>Activity</h2>
             <p class="bottom-margin">*If your request isn't completed in 12hrs, use <strong>REPORT</strong> to get
                 assistance from our helpline.</p>
             <sm-tab-header target="user_activities">
@@ -946,24 +949,24 @@ opacity: 1
                         previousOption;
                     this.open = false;
                     (this.slideDown = [{
-                            transform: `translateY(-0.5rem)`
-                        },
-                        {
-                            transform: `translateY(0)`
-                        },
+                        transform: `translateY(-0.5rem)`
+                    },
+                    {
+                        transform: `translateY(0)`
+                    },
                     ]),
-                    (this.slideUp = [{
+                        (this.slideUp = [{
                             transform: `translateY(0)`
                         },
                         {
                             transform: `translateY(-0.5rem)`
                         },
-                    ]),
-                    (this.animationOptions = {
-                        duration: 300,
-                        fill: "forwards",
-                        easing: "ease",
-                    });
+                        ]),
+                        (this.animationOptions = {
+                            duration: 300,
+                            fill: "forwards",
+                            easing: "ease",
+                        });
                     selection.addEventListener("click", (e) => {
                         if (!this.open) {
                             this.optionList.classList.remove("hide");
@@ -1324,9 +1327,9 @@ opacity: 1
                                 this.previousGradient.classList.remove("hide");
                             }
                         }, {
-                            root: this.selectContainer,
-                            threshold: 0.95,
-                        }
+                        root: this.selectContainer,
+                        threshold: 0.95,
+                    }
                     );
                     const lastElementObserver = new IntersectionObserver(
                         (entries) => {
@@ -1338,9 +1341,9 @@ opacity: 1
                                 this.nextGradient.classList.remove("hide");
                             }
                         }, {
-                            root: this.selectContainer,
-                            threshold: 0.95,
-                        }
+                        root: this.selectContainer,
+                        threshold: 0.95,
+                    }
                     );
 
                     const selectObserver = new IntersectionObserver((entries) => {
@@ -1681,13 +1684,13 @@ stroke-width: 6;
                     if (window.innerWidth > 640) {
                         notification.animate(
                             [{
-                                    transform: `translateX(1rem)`,
-                                    opacity: "0",
-                                },
-                                {
-                                    transform: "translateX(0)",
-                                    opacity: "1",
-                                },
+                                transform: `translateX(1rem)`,
+                                opacity: "0",
+                            },
+                            {
+                                transform: "translateX(0)",
+                                opacity: "1",
+                            },
                             ],
                             this.animationOptions
                         ).onfinish = () => {
@@ -1716,13 +1719,13 @@ stroke-width: 6;
                     if (toLeft)
                         notification.animate(
                             [{
-                                    transform: `translateX(${this.offset}px)`,
-                                    opacity: "1",
-                                },
-                                {
-                                    transform: `translateX(-100%)`,
-                                    opacity: "0",
-                                },
+                                transform: `translateX(${this.offset}px)`,
+                                opacity: "1",
+                            },
+                            {
+                                transform: `translateX(-100%)`,
+                                opacity: "0",
+                            },
                             ],
                             this.animationOptions
                         ).onfinish = () => {
@@ -1731,13 +1734,13 @@ stroke-width: 6;
                     else {
                         notification.animate(
                             [{
-                                    transform: `translateX(${this.offset}px)`,
-                                    opacity: "1",
-                                },
-                                {
-                                    transform: `translateX(100%)`,
-                                    opacity: "0",
-                                },
+                                transform: `translateX(${this.offset}px)`,
+                                opacity: "1",
+                            },
+                            {
+                                transform: `translateX(100%)`,
+                                opacity: "0",
+                            },
                             ],
                             this.animationOptions
                         ).onfinish = () => {
@@ -1746,6 +1749,12 @@ stroke-width: 6;
                     }
                 }
 
+                clearAll = () => {
+                    Array.from(this.notificationPanel.children).forEach(child => {
+                        this.removeNotification(child)
+                    })
+                }
+
                 connectedCallback() {
                     this.notificationPanel = this.shadowRoot.querySelector(
                         ".notification-panel"
@@ -1757,9 +1766,9 @@ stroke-width: 6;
                     };
                     this.fontSize = Number(
                         window
-                        .getComputedStyle(document.body)
-                        .getPropertyValue("font-size")
-                        .match(/\d+/)[0]
+                            .getComputedStyle(document.body)
+                            .getPropertyValue("font-size")
+                            .match(/\d+/)[0]
                     );
                     this.notification;
                     this.offset;
@@ -1783,10 +1792,10 @@ stroke-width: 6;
                                     if (!mutation.addedNodes[0].classList.contains("pinned"))
                                         setTimeout(() => {
                                             this.removeNotification(mutation.addedNodes[0]);
-                                        }, 4000);
+                                        }, 5000);
                                     if (window.innerWidth > 640)
                                         this.notificationPanel.style.padding =
-                                        "1.5rem 0 3rem 1.5rem";
+                                            "1.5rem 0 3rem 1.5rem";
                                     else this.notificationPanel.style.padding =
                                         "1rem 1rem 2rem 1rem";
                                 } else if (
@@ -1920,10 +1929,10 @@ background-color: transparent;
                     this.indicator.setAttribute(
                         "style",
                         `width: ${tabDimensions.width}px; transform: translateX(${
-          tabDimensions.left -
-          this.tabHeader.getBoundingClientRect().left +
-          this.tabHeader.scrollLeft
-        }px)`
+                        tabDimensions.left -
+                        this.tabHeader.getBoundingClientRect().left +
+                        this.tabHeader.scrollLeft
+                        }px)`
                     );
                     //else
                     //this.indicator.setAttribute('style', `width: calc(${tabDimensions.width}px - 1.6rem); transform: translateX(calc(${ tabDimensions.left - this.tabHeader.getBoundingClientRect().left + this.tabHeader.scrollLeft}px + 0.8rem)`)
@@ -1998,8 +2007,8 @@ background-color: transparent;
                                 }
                             });
                         }, {
-                            threshold: 1.0
-                        }
+                        threshold: 1.0
+                    }
                     );
                     observer.observe(this);
                 }
@@ -2060,40 +2069,40 @@ background-color: transparent;
                 connectedCallback() {
                     //animations
                     let flyInLeft = [{
-                                opacity: 0,
-                                transform: "translateX(-1rem)",
-                            },
-                            {
-                                opacity: 1,
-                                transform: "none",
-                            },
-                        ],
+                        opacity: 0,
+                        transform: "translateX(-1rem)",
+                    },
+                    {
+                        opacity: 1,
+                        transform: "none",
+                    },
+                    ],
                         flyInRight = [{
-                                opacity: 0,
-                                transform: "translateX(1rem)",
-                            },
-                            {
-                                opacity: 1,
-                                transform: "none",
-                            },
+                            opacity: 0,
+                            transform: "translateX(1rem)",
+                        },
+                        {
+                            opacity: 1,
+                            transform: "none",
+                        },
                         ],
                         flyOutLeft = [{
-                                opacity: 1,
-                                transform: "none",
-                            },
-                            {
-                                opacity: 0,
-                                transform: "translateX(-1rem)",
-                            },
+                            opacity: 1,
+                            transform: "none",
+                        },
+                        {
+                            opacity: 0,
+                            transform: "translateX(-1rem)",
+                        },
                         ],
                         flyOutRight = [{
-                                opacity: 1,
-                                transform: "none",
-                            },
-                            {
-                                opacity: 0,
-                                transform: "translateX(1rem)",
-                            },
+                            opacity: 1,
+                            transform: "none",
+                        },
+                        {
+                            opacity: 0,
+                            transform: "translateX(1rem)",
+                        },
                         ],
                         animationOptions = {
                             duration: 300,
@@ -2625,11 +2634,12 @@ background-color: transparent;
 
         //Checks for internet connection status
         if (!navigator.onLine)
-            notify('There seems to be a problem connecting to the internet.', 'error', true, true)
+            notify('There seems to be a problem connecting to the internet.', 'error', '', true)
         window.addEventListener('offline', () => {
             notify('There seems to be a problem connecting to the internet.', 'error', true, true)
         })
         window.addEventListener('online', () => {
+            notifications.clearAll()
             notify('We are back online.', '', '', true)
         })
         // function required for popups or modals to appear
@@ -2653,6 +2663,7 @@ background-color: transparent;
             zIndex = 10;
 
         function showPopup(popup, permission) {
+            document.body.setAttribute('style', `overflow: hidden; top: -${window.scrollY}px`)
             let thisPopup = document.getElementById(popup);
             thisPopup.parentNode.classList.remove('hide');
             thisPopup.classList.add('no-transformations');
@@ -2680,6 +2691,11 @@ background-color: transparent;
 
         // hides the popup or modal 
         function hidePopup() {
+            const scrollY = document.body.style.top;
+            window.scrollTo(0, parseInt(scrollY || '0') * -1);
+            setTimeout(() => {
+                document.body.setAttribute('style', `overflow: auto; top: initial`)
+            }, 300);
             if (popupStack.peek() === undefined)
                 return;
             let {
@@ -2710,6 +2726,15 @@ background-color: transparent;
             }
             if (popup === 'cash_transfer') {
                 payingRequested = false;
+                tokenReceiver.disabled = false
+                tokenAmount.disabled = false
+            }
+            if (popup === 'deposit_rupee') {
+                depositRequested = 0;
+                document.getElementById('upi_txId_section').classList.add('hide-completely')
+                document.getElementById('deposit_amount_section').classList.remove('hide-completely')
+                depositedRupeeTxId.disabled = true
+                document.getElementById('request_tokens_btn').children[0].textContent = 'Continue'
             }
         }
 
@@ -2756,13 +2781,13 @@ background-color: transparent;
 
         let notifications = document.getElementById('show_message');
         //Function for displaying toast notifications. pass in error for mode param if you want to show an error.
-        function notify(message, mode, behavior, sound) {
+        function notify(message, mode, pinned, sound) {
 
             if (mode === 'error')
                 console.error(message)
             else
                 console.log(message)
-            notifications.push(message, mode, behavior)
+            notifications.push(message, mode, pinned)
             if (navigator.onLine && sound) {
                 notificationSound.currentTime = 0;
                 notificationSound.play();
@@ -2819,10 +2844,11 @@ background-color: transparent;
                     month = timeFrag[1],
                     date = timeFrag[2],
                     year = timeFrag[3],
-                    hours = timeFrag[4].slice(0, timeFrag[4].lastIndexOf(':')),
-                    finalTime = '';
-                parseInt(hours.split(':')[0]) > 12 ? finalTime = 'PM' : finalTime = 'AM'
-                return `${hours} ${finalTime} ${day} ${date} ${month} ${year}`;
+                    minutes = new Date(parseInt(time)).getMinutes(),
+                    hours = new Date(parseInt(time)).getHours()
+                minutes = minutes.length === 1 ? `0${minutes}` : minutes
+                let finalHours = hours - 12 > 0 ? `${hours - 12}:${minutes} pm` : `${hours}:${minutes} am`
+                return `${finalHours} ${month} ${date} ${year}`;
             } catch (e) {
                 console.error(e);
                 return time;
@@ -2847,7 +2873,7 @@ background-color: transparent;
         }
 
         function areInputsEmpty(parent) {
-            let allInputs = parent.querySelectorAll(".input input");
+            let allInputs = parent.querySelectorAll(".input input:not(:disabled)");
             return [...allInputs].every(input => input.checkValidity())
         }
 
@@ -2880,6 +2906,8 @@ background-color: transparent;
         let allForms = document.querySelectorAll('form'),
             payingRequested = false,
             currentPaymentRequest;
+        const tokenReceiver = document.getElementById('token_receiver'),
+            tokenAmount = document.getElementById('token_amount')
         window.addEventListener('load', () => {
             allForms.forEach((form) => {
                 form.addEventListener('input', (e) => {
@@ -2960,8 +2988,8 @@ background-color: transparent;
             document.getElementById('report_btn').addEventListener('click', async (e) => {
                 let customMsg = document.getElementById('complaint_field').value
                 if (await confirmation(
-                        'It may take upto 12hrs to complete your request, are you sure to report this issue?'
-                        )) {
+                    'It may take upto 12hrs to complete your request, are you sure to report this issue?'
+                )) {
                     file_complaint(currentRequest.dataset.type, currentRequest.dataset.vectorClock,
                         customMsg)
                 }
@@ -2970,9 +2998,10 @@ background-color: transparent;
             document.getElementById('request_rupee_btn').addEventListener('click', (e) => {
                 let requestedAddress = document.getElementById('requested_address').value,
                     requestedAmount = document.getElementById('requested_amount').value
-
+                btnLoading('request_rupee_btn', 'start')
                 request_payment(requestedAddress, requestedAmount)
             })
+
             // Function for accepting payment request
             document.getElementById('payment_request_container').addEventListener('click', async (e) => {
                 if (e.target.closest('.send-rupee')) {
@@ -2986,14 +3015,16 @@ background-color: transparent;
                         paymentRequest: parent,
                         requestId: paymentRequestId
                     }
-                    popup.querySelector('#token_receiver').value = senderAddress;
-                    popup.querySelector('#token_amount').value = amount;
+                    tokenReceiver.value = senderAddress;
+                    tokenAmount.value = amount;
+                    tokenReceiver.disabled = true
+                    tokenAmount.disabled = true
                 }
                 if (e.target.closest('.decline-request')) {
                     let parent = e.target.closest('.request'),
                         paymentRequestId = parent.dataset.paymentRequestId;
                     if (await confirmation(
-                            `Do want to decline this request? This will remove the request.`)) {
+                        `Do want to decline this request? This will remove the request.`)) {
                         payment_request_status(paymentRequestId, 'DECLINED')
                         e.target.closest('.request').remove()
                     }
@@ -3059,7 +3090,8 @@ background-color: transparent;
                 compactIDB.deleteDB().then((message) => {
                     delete token_app.master_configurations;
                     onLoadStartUp()
-                    notify('You have logged out successfully.')
+                    notifications.clearAll()
+                    notify('Logged out')
                 }).catch((error) => {
                     console.log(error)
                 })
@@ -3217,7 +3249,7 @@ background-color: transparent;
                         for (var bytes = [], i = 0, imod4 = 0; i < base64.length; imod4 = ++i % 4) {
                             if (imod4 == 0) continue;
                             bytes.push(((base64map.indexOf(base64.charAt(i - 1)) & (Math.pow(2, -2 * imod4 +
-                                    8) - 1)) << (imod4 * 2)) |
+                                8) - 1)) << (imod4 * 2)) |
                                 (base64map.indexOf(base64.charAt(i)) >>> (6 - imod4 * 2)));
                         }
 
@@ -3289,7 +3321,7 @@ background-color: transparent;
                 var digestbytes = util.wordsToBytes(SHA1._sha1(message));
                 return options && options.asBytes ? digestbytes :
                     options && options.asString ? Binary.bytesToString(digestbytes) :
-                    util.bytesToHex(digestbytes);
+                        util.bytesToHex(digestbytes);
             };
 
             // The core
@@ -3330,9 +3362,9 @@ background-color: transparent;
 
                         var t = ((H0 << 5) | (H0 >>> 27)) + H4 + (w[j] >>> 0) + (
                             j < 20 ? (H1 & H2 | ~H1 & H3) + 1518500249 :
-                            j < 40 ? (H1 ^ H2 ^ H3) + 1859775393 :
-                            j < 60 ? (H1 & H2 | H1 & H3 | H2 & H3) - 1894007588 :
-                            (H1 ^ H2 ^ H3) - 899497514);
+                                j < 40 ? (H1 ^ H2 ^ H3) + 1859775393 :
+                                    j < 60 ? (H1 & H2 | H1 & H3 | H2 & H3) - 1894007588 :
+                                        (H1 ^ H2 ^ H3) - 899497514);
 
                         H4 = H3;
                         H3 = H2;
@@ -3406,7 +3438,7 @@ background-color: transparent;
 
                 return options && options.asBytes ? hmacbytes :
                     options && options.asString ? Binary.bytesToString(hmacbytes) :
-                    util.bytesToHex(hmacbytes);
+                        util.bytesToHex(hmacbytes);
 
             };
 
@@ -3479,8 +3511,8 @@ background-color: transparent;
                         for (var b = b.replace(/[^A-Z0-9+\/]/ig, ""), a = [], c = 0, e = 0; c < b.length; e = ++c %
                             4) e != 0 && a.push(("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
                                 .indexOf(b.charAt(c - 1)) & Math.pow(2, -2 * e + 8) - 1) << e * 2 |
-                            "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".indexOf(b.charAt(
-                                c)) >>> 6 - e * 2);
+                                "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".indexOf(b.charAt(
+                                    c)) >>> 6 - e * 2);
                         return a
                     }
                 },
@@ -3547,7 +3579,7 @@ background-color: transparent;
                     for (h = 0; h < 64; h++) {
                         h < 16 ? d[h] = e[h + t] : (l = d[h - 15], j = d[h - 2], d[h] = ((l << 25 | l >>> 7) ^
                             (l << 14 | l >>> 18) ^ l >>> 3) + (d[h - 7] >>> 0) + ((j << 15 | j >>> 17) ^
-                            (j << 13 | j >>> 19) ^ j >>> 10) + (d[h - 16] >>> 0));
+                                (j << 13 | j >>> 19) ^ j >>> 10) + (d[h - 16] >>> 0));
                         j = f & g ^ f & m ^ g & m;
                         var u = (f << 30 | f >>> 2) ^ (f << 19 | f >>> 13) ^ (f << 10 | f >>> 22);
                         l = (s >>> 0) + ((i << 26 | i >>> 6) ^ (i << 21 | i >>> 11) ^ (i << 7 | i >>> 25)) +
@@ -3613,7 +3645,7 @@ background-color: transparent;
         (function () {
 
             // Constructor function of Global SecureRandom object
-            var sr = window.SecureRandom = function () {};
+            var sr = window.SecureRandom = function () { };
 
             // Properties
             sr.state;
@@ -4023,7 +4055,7 @@ background-color: transparent;
                 if (a != null)
                     if ("number" == typeof a) this.fromNumber(a, b, c);
                     else if (b == null && "string" != typeof a) this.fromString(a, 256);
-                else this.fromString(a, b);
+                    else this.fromString(a, b);
             };
 
             // Bits per digit
@@ -5490,7 +5522,7 @@ background-color: transparent;
 
 
             // A "null" reducer
-            var NullExp = window.NullExp = function NullExp() {}
+            var NullExp = window.NullExp = function NullExp() { }
             NullExp.prototype.convert = function (x) {
                 return x;
             };
@@ -5581,7 +5613,7 @@ background-color: transparent;
         (function () {
 
             // Constructor function of Global EllipticCurve object
-            var ec = window.EllipticCurve = function () {};
+            var ec = window.EllipticCurve = function () { };
 
             // ----------------
             // ECFieldElementFp constructor
@@ -5668,7 +5700,7 @@ background-color: transparent;
                         P = new BigInteger(this.q.bitLength(), rand);
                     }
                     while (P.compareTo(this.q) >= 0 || !(P.multiply(P).subtract(fourQ).modPow(legendreExponent,
-                            this.q).equals(qMinusOne)));
+                        this.q).equals(qMinusOne)));
 
                     var result = ec.FieldElementFp.fastLucasSequence(this.q, P, Q, k);
 
@@ -5729,8 +5761,8 @@ background-color: transparent;
 
                 // No-operation padding, used for stream ciphers
                 C_pad.NoPadding = {
-                    pad: function (cipher, message) {},
-                    unpad: function (cipher, message) {}
+                    pad: function (cipher, message) { },
+                    unpad: function (cipher, message) { }
                 };
 
                 // Zero Padding.
@@ -5775,7 +5807,7 @@ background-color: transparent;
                             if (b == 0x80) return;
                             if (b != 0x00) {
                                 throw new Error("ISO-7816 padding byte must be 0, not 0x" + b.toString(
-                                        16) +
+                                    16) +
                                     ". Wrong cipher specification or key used?");
                             }
                         }
@@ -6153,7 +6185,7 @@ background-color: transparent;
 
                     return options && options.asBytes ? derivedKeyBytes :
                         options && options.asString ? Binary.bytesToString(derivedKeyBytes) :
-                        util.bytesToHex(derivedKeyBytes);
+                            util.bytesToHex(derivedKeyBytes);
 
                 };
 
@@ -6621,11 +6653,11 @@ background-color: transparent;
 
                 // Inner state
                 var state = [
-                        [],
-                        [],
-                        [],
-                        []
-                    ],
+                    [],
+                    [],
+                    [],
+                    []
+                ],
                     keylength,
                     nrounds,
                     keyschedule;
@@ -6651,8 +6683,8 @@ background-color: transparent;
                             // Convert to bytes if message is a string
                             m = (
                                 message.constructor == String ?
-                                UTF8.stringToBytes(message) :
-                                message
+                                    UTF8.stringToBytes(message) :
+                                    message
                             ),
 
                             // Generate random IV
@@ -6661,12 +6693,12 @@ background-color: transparent;
                             // Generate key
                             k = (
                                 password.constructor == String ?
-                                // Derive key from pass-phrase
-                                C.PBKDF2(password, iv, 32, {
-                                    asBytes: true
-                                }) :
-                                // else, assume byte array representing cryptographic key
-                                password
+                                    // Derive key from pass-phrase
+                                    C.PBKDF2(password, iv, 32, {
+                                        asBytes: true
+                                    }) :
+                                    // else, assume byte array representing cryptographic key
+                                    password
                             );
 
                         // Encrypt
@@ -6694,8 +6726,8 @@ background-color: transparent;
                             // Convert to bytes if ciphertext is a string
                             c = (
                                 ciphertext.constructor == String ?
-                                util.base64ToBytes(ciphertext) :
-                                ciphertext
+                                    util.base64ToBytes(ciphertext) :
+                                    ciphertext
                             ),
 
                             // Separate IV and message
@@ -6704,12 +6736,12 @@ background-color: transparent;
                             // Generate key
                             k = (
                                 password.constructor == String ?
-                                // Derive key from pass-phrase
-                                C.PBKDF2(password, iv, 32, {
-                                    asBytes: true
-                                }) :
-                                // else, assume byte array representing cryptographic key
-                                password
+                                    // Derive key from pass-phrase
+                                    C.PBKDF2(password, iv, 32, {
+                                        asBytes: true
+                                    }) :
+                                    // else, assume byte array representing cryptographic key
+                                    password
                             );
 
                         // Decrypt
@@ -7200,7 +7232,7 @@ background-color: transparent;
                 var x = this.getX().toBigInteger();
                 var y = this.getY().toBigInteger();
                 var len =
-                32; // integerToBytes will zero pad if integer is less than 32 bytes. 32 bytes length is required by the Bitcoin protocol.
+                    32; // integerToBytes will zero pad if integer is less than 32 bytes. 32 bytes length is required by the Bitcoin protocol.
                 var enc = ec.integerToBytes(x, len);
 
                 // when compressed prepend byte depending if y point is even or odd
@@ -7213,7 +7245,7 @@ background-color: transparent;
                 } else {
                     enc.unshift(0x04);
                     enc = enc.concat(ec.integerToBytes(y,
-                    len)); // uncompressed public key appends the bytes of the y point
+                        len)); // uncompressed public key appends the bytes of the y point
                 }
                 return enc;
             };
@@ -7317,7 +7349,7 @@ background-color: transparent;
 
             ec.PointFp.prototype.toString = function () {
                 return '(' + this.getX().toBigInteger().toString() + ',' + this.getY().toBigInteger()
-                .toString() +
+                    .toString() +
                     ')';
             };
 
@@ -7534,7 +7566,7 @@ background-color: transparent;
         //bitTrx.js
         (function () {
 
-            var bitjs = window.bitjs = function () {};
+            var bitjs = window.bitjs = function () { };
 
             /* public vars */
             bitjs.pub = 0x23; // flochange - changed the prefix to FLO Mainnet PublicKey Prefix 0x23
@@ -7679,7 +7711,7 @@ background-color: transparent;
                 btrx.addflodata = function (txcomments) { // flochange - this whole function needs to be done
                     this.floData = txcomments;
                     return this
-                    .floData; //flochange .. returning the txcomments -- check if the function return will assign
+                        .floData; //flochange .. returning the txcomments -- check if the function return will assign
                 }
 
 
@@ -7993,7 +8025,7 @@ background-color: transparent;
 
 
                     return Crypto.util.bytesToHex(buffer) + floDataCountString +
-                    flohex; // flochange -- Addition of floDataCountString and floData in serialization
+                        flohex; // flochange -- Addition of floDataCountString and floData in serialization
                 }
 
 
@@ -8224,7 +8256,7 @@ background-color: transparent;
         };
 
         Bitcoin.Address.networkVersion =
-        0x23; // (FLO mainnet 0x23, 35D), (Bitcoin Mainnet, 0x00, 0D) // *this has no effect *
+            0x23; // (FLO mainnet 0x23, 35D), (Bitcoin Mainnet, 0x00, 0D) // *this has no effect *
 
         /**
          * Serialize this object as a standard Bitcoin address.
@@ -8557,7 +8589,7 @@ background-color: transparent;
                             if (pubkey.getBitcoinAddress().toString() == address) {
                                 return i;
                             }
-                        } catch (e) {}
+                        } catch (e) { }
                     }
                     throw "Unable to find valid recovery factor";
                 }
@@ -8576,7 +8608,7 @@ background-color: transparent;
                     for (var index in this.keyArray) {
                         var currentItem = this.keyArray[index];
                         if (currentItem != null && currentItem.priv != null && item
-                        .getBitcoinAddress() == currentItem.getBitcoinAddress()) {
+                            .getBitcoinAddress() == currentItem.getBitcoinAddress()) {
                             doAdd = false;
                             break;
                         }
@@ -8663,8 +8695,8 @@ background-color: transparent;
 
                         // This part is edited for FLO. FLO WIF are always compressed WIF. FLO WIF (private key) starts with R for mainnet and c for testnet.
                         if (((floGlobals.blockchain == "FLO") &&
-                                /^R[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{51}$/.test(
-                                    input)) ||
+                            /^R[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{51}$/.test(
+                                input)) ||
                             ((floGlobals.blockchain == "FLO_TEST") &&
                                 /^c[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{51}$/.test(
                                     input))) {
@@ -8844,7 +8876,7 @@ background-color: transparent;
             // Private Key Hex Format
             ECKey.prototype.getBitcoinHexFormat = function () {
                 return Crypto.util.bytesToHex(this.getBitcoinPrivateKeyByteArray()).toString()
-            .toUpperCase();
+                    .toUpperCase();
             };
 
             // Private Key Base64 Format
@@ -9100,7 +9132,7 @@ background-color: transparent;
                 });
             },
             // duck typing method
-            hasMethods: function (obj /*, method list as strings */ ) {
+            hasMethods: function (obj /*, method list as strings */) {
                 var i = 1,
                     methodName;
                 while ((methodName = arguments[i++])) {
@@ -9116,7 +9148,7 @@ background-color: transparent;
         (function (ellipticCurveType) {
 
             //Defining Elliptic Encryption Object  
-            var ellipticEncryption = window.ellipticCurveEncryption = function () {};
+            var ellipticEncryption = window.ellipticCurveEncryption = function () { };
 
             ellipticEncryption.rng = new SecureRandom();
 
@@ -9291,7 +9323,7 @@ background-color: transparent;
 
             function init(bits) {
                 if (bits && (typeof bits !== 'number' || bits % 1 !== 0 || bits < defaults.minBits || bits >
-                        defaults.maxBits)) {
+                    defaults.maxBits)) {
                     throw new Error('Number of bits must be an integer between ' + defaults.minBits + ' and ' +
                         defaults.maxBits + ', inclusive.')
                 }
@@ -9355,7 +9387,7 @@ background-color: transparent;
 
                 // node.js crypto.randomBytes()
                 if (typeof require === 'function' && (crypto = require('crypto')) && (randomBits = crypto[
-                        'randomBytes'])) {
+                    'randomBytes'])) {
                     return function (bits) {
                         var bytes = Math.ceil(bits / 8),
                             str = null;
@@ -9369,7 +9401,7 @@ background-color: transparent;
 
                 // browsers with window.crypto.getRandomValues()
                 if (global['crypto'] && typeof global['crypto']['getRandomValues'] === 'function' && typeof global[
-                        'Uint32Array'] === 'function') {
+                    'Uint32Array'] === 'function') {
                     crypto = global['crypto'];
                     return function (bits) {
                         var elems = Math.ceil(bits / 32),
@@ -9426,8 +9458,8 @@ background-color: transparent;
 
                 // test the RNG (5 times)
                 if (typeof rng !== 'function' || typeof rng(config.bits) !== 'string' || !parseInt(rng(config
-                            .bits),
-                        2) || rng(config.bits).length > config.bits || rng(config.bits).length < config.bits) {
+                    .bits),
+                    2) || rng(config.bits).length > config.bits || rng(config.bits).length < config.bits) {
                     throw new Error(
                         "Random number generator is invalid. Supply an RNG of the form function(bits){} that returns a string containing 'bits' number of random 1's and 0's."
                     )
@@ -9509,7 +9541,7 @@ background-color: transparent;
                 }
 
                 secret = '1' + hex2bin(
-                secret); // append a 1 so that we can preserve the correct number of leading zeros in our secret
+                    secret); // append a 1 so that we can preserve the correct number of leading zeros in our secret
                 secret = split(secret, padLength);
                 var x = new Array(numShares),
                     y = new Array(numShares);
@@ -9586,7 +9618,7 @@ background-color: transparent;
 
                 var bits = parseInt(share[0], 36);
                 if (bits && (typeof bits !== 'number' || bits % 1 !== 0 || bits < defaults.minBits || bits >
-                        defaults.maxBits)) {
+                    defaults.maxBits)) {
                     throw new Error('Number of bits must be an integer between ' + defaults.minBits + ' and ' +
                         defaults.maxBits + ', inclusive.')
                 }
@@ -9706,16 +9738,16 @@ background-color: transparent;
                         if (at === x[
                             j]) { // happens when computing a share that is in the list of shares used to compute it
                             product = -
-                            1; // fix for a zero product term, after which the sum should be sum^0 = sum, not sum^1
+                                1; // fix for a zero product term, after which the sum should be sum^0 = sum, not sum^1
                             break;
                         }
                         product = (product + config.logs[at ^ x[j]] - config.logs[x[i] ^ x[j]] + config
-                                .max /* to make sure it's not negative */ ) %
+                            .max /* to make sure it's not negative */) %
                             config.max;
                     }
 
                     sum = product === -1 ? sum : sum ^ config.exps[
-                    product]; // though exps[-1]= undefined and undefined ^ anything = anything in chrome, this behavior may not hold everywhere, so do the check
+                        product]; // though exps[-1]= undefined and undefined ^ anything = anything in chrome, this behavior may not hold everywhere, so do the check
                 }
                 return sum;
             };
@@ -9878,7 +9910,7 @@ background-color: transparent;
                                 if (diff[key].hasOwnProperty(index)) {
                                     acc2[index] = preserve(diff[key][index], leftArray[index],
                                         rightArray[index]
-                                        ); // diff recurse and check for nested arrays
+                                    ); // diff recurse and check for nested arrays
                                     return acc2;
                                 }
 
@@ -9916,7 +9948,7 @@ background-color: transparent;
                         const difference = updatedDiff(l[key], r[key]);
 
                         if (isObject(difference) && isEmpty(difference) && !isDate(difference))
-                        return acc;
+                            return acc;
 
                         return {
                             ...acc,
@@ -9958,7 +9990,7 @@ background-color: transparent;
                     const difference = diff(l[key], r[key]);
 
                     if (isObject(difference) && isEmpty(difference) && !isDate(difference))
-                return acc; // return no diff
+                        return acc; // return no diff
 
                     return {
                         ...acc,
@@ -10033,7 +10065,7 @@ background-color: transparent;
                         }
 
                         return acc.slice(0, index).concat(rightItem).concat(acc.slice(index +
-                        1)); // return updated key
+                            1)); // return updated key
                     }, deletedValues);
                 }
 
@@ -10046,7 +10078,7 @@ background-color: transparent;
                     const difference = diff(l[key], r[key]);
 
                     if (isObject(difference) && isEmpty(difference) && !isDate(difference))
-                return acc; // return no diff
+                        return acc; // return no diff
 
                     return {
                         ...acc,
@@ -10221,7 +10253,7 @@ background-color: transparent;
                 deriveSharedKeySender: function (receiverCompressedPublicKey, senderPrivateKey) {
                     try {
                         let receiverPublicKeyString = this.getUncompressedPublicKey(
-                        receiverCompressedPublicKey);
+                            receiverCompressedPublicKey);
                         var senderDerivedKey = ellipticCurveEncryption.senderSharedKeyDerivation(
                             receiverPublicKeyString.x, receiverPublicKeyString.y, senderPrivateKey);
                         return senderDerivedKey;
@@ -10292,7 +10324,7 @@ background-color: transparent;
                 var senderECKeyData = this.util.getSenderPublicKeyString();
                 var senderDerivedKey = this.util.deriveSharedKeySender(receiverCompressedPublicKey,
                     senderECKeyData
-                    .privateKey);
+                        .privateKey);
                 let senderKey = senderDerivedKey.XValue + senderDerivedKey.YValue;
                 let secret = Crypto.AES.encrypt(data, senderKey);
                 return {
@@ -10313,7 +10345,7 @@ background-color: transparent;
 
                 var receiverDerivedKey = this.util.deriveReceiverSharedKey(data.senderPublicKeyString,
                     receiverECKeyData
-                    .privateKey);
+                        .privateKey);
 
                 let receiverKey = receiverDerivedKey.XValue + receiverDerivedKey.YValue;
                 let decryptMsg = Crypto.AES.decrypt(data.secret, receiverKey);
@@ -10674,7 +10706,7 @@ background-color: transparent;
                                         invalids.InvalidSenderPrivKeys.push(key);
                                     else {
                                         if (typeof senderPrivKeys[key] !== 'number' || senderPrivKeys[
-                                                key] <= 0)
+                                            key] <= 0)
                                             invalids.InvalidSenderAmountFor.push(key)
                                         else
                                             inputVal += senderPrivKeys[key];
@@ -10710,7 +10742,7 @@ background-color: transparent;
                         if (!preserveRatio && inputVal != outputVal)
                             return reject(
                                 `Input Amount (${inputVal}) not equal to Output Amount (${outputVal})`
-                                )
+                            )
                     } catch (error) {
                         return reject(error)
                     }
@@ -10730,7 +10762,7 @@ background-color: transparent;
                         for (let floID in senders) {
                             balance[floID] = parseFloat(results.shift());
                             if (isNaN(balance[floID]) || (preserveRatio && balance[floID] <=
-                                    totalFee) || (!preserveRatio && balance[floID] < senders[
+                                totalFee) || (!preserveRatio && balance[floID] < senders[
                                     floID].coins + dividedFee))
                                 insufficient.push(floID)
                             totalBalance += balance[floID];
@@ -10767,7 +10799,7 @@ background-color: transparent;
                                     if (utxos[i].confirmations) {
                                         trx.addinput(utxos[i].txid, utxos[i].vout,
                                             utxos[i]
-                                            .scriptPubKey)
+                                                .scriptPubKey)
                                         wifSeq.push(wif);
                                         utxoAmt += utxos[i].amount;
                                     }
@@ -10831,7 +10863,7 @@ background-color: transparent;
                 return new Promise((resolve, reject) => {
                     this.promisedAPI(`api/addrs/${addr}/txs?from=0&to=1`).then(response => {
                         this.promisedAPI(
-                                `api/addrs/${addr}/txs?from=0&to=${response.totalItems}0`)
+                            `api/addrs/${addr}/txs?from=0&to=${response.totalItems}0`)
                             .then(response => resolve(response.items))
                             .catch(error => reject(error));
                     }).catch(error => reject(error))
@@ -10868,14 +10900,14 @@ background-color: transparent;
                                         if (options.pattern && !response.items[i].floData
                                             .startsWith(options.pattern, 0) && !response.items[
                                                 i]
-                                            .floData.startsWith(options.pattern, 2))
+                                                .floData.startsWith(options.pattern, 2))
                                             continue;
                                         if (options.contains && !response.items[i].floData
                                             .includes(
                                                 options.contains))
                                             continue;
                                         if (options.filter && !options.filter(response.items[i]
-                                                .floData))
+                                            .floData))
                                             continue;
                                         filteredData.push(response.items[i].floData);
                                     }
@@ -10884,8 +10916,8 @@ background-color: transparent;
                                         data: filteredData
                                     });
                                 }).catch(error => {
-                                reject(error);
-                            });
+                                    reject(error);
+                                });
                     }).catch(error => {
                         reject(error);
                     });
@@ -11557,7 +11589,7 @@ background-color: transparent;
                         var db = event.target.result;
                         for (let obs in objectStores) {
                             var objectStore = db.createObjectStore(obs, objectStores[obs].options ||
-                            {});
+                                {});
                             if (objectStores[obs].indexes && typeof objectStores[obs].indexes ===
                                 'object')
                                 for (let i in objectStores[obs].indexes)
@@ -11738,7 +11770,7 @@ background-color: transparent;
                                 floGlobals.vectorClock[message.object] = vc
                                 compactIDB.writeData("appObjects", floGlobals.appObjects[message.object],
                                     message
-                                    .object)
+                                        .object)
                                 compactIDB.writeData("vectorClock", vc, message.object)
                             }
                         }
@@ -11758,7 +11790,7 @@ background-color: transparent;
                                     message.object], message.diff)
                                 compactIDB.writeData("appObjects", floGlobals.appObjects[message.object],
                                     message
-                                    .object)
+                                        .object)
                             }
                             floGlobals.vectorClock[message.object] = vc
                             compactIDB.writeData("vectorClock", vc, message.object)
@@ -11848,7 +11880,7 @@ background-color: transparent;
                     })
                     options.type = type
                     options.lowerVectorClock = options.lowerVectorClock || floGlobals.generalVC[
-                            filterStr] +
+                        filterStr] +
                         1
                     this.requestApplicationData(options).then(dataSet => {
                         this.util.storeGeneralData(filterStr, dataSet)
@@ -11914,7 +11946,7 @@ background-color: transparent;
                         vectorClock: floGlobals.vectorClock[objectName],
                         diff: findDifference(JSON.parse(this.util.lastCommit[objectName]),
                             floGlobals
-                            .appObjects[objectName])
+                                .appObjects[objectName])
                     }
                     this.sendApplicationData(message, `${objectName}@Update`, options).then(result => {
                         this.util.lastCommit[objectName] = JSON.stringify(floGlobals.appObjects[
@@ -11989,16 +12021,16 @@ background-color: transparent;
                                     compactIDB.writeData("lastTx", result.totalTxs,
                                         floGlobals.SNStorageID);
                                     compactIDB.readAllData("supernodes").then(
-                                    result => {
-                                        floGlobals.supernodes = result;
+                                        result => {
+                                            floGlobals.supernodes = result;
 
-                                        floSupernode.kBucket.launch(Object.keys(
-                                                    floGlobals.supernodes),
+                                            floSupernode.kBucket.launch(Object.keys(
+                                                floGlobals.supernodes),
                                                 floGlobals.SNStorageID)
-                                            .then(result => resolve(
-                                                "Loaded Supernode list\n" +
-                                                result))
-                                    })
+                                                .then(result => resolve(
+                                                    "Loaded Supernode list\n" +
+                                                    result))
+                                        })
                                 })
                             }).catch(error => reject(error))
                         })
@@ -12015,13 +12047,13 @@ background-color: transparent;
                                     for (var i = result.data.length - 1; i >= 0; i--) {
                                         var content = JSON.parse(result.data[i])[
                                             floGlobals
-                                            .application];
+                                                .application];
                                         if (Array.isArray(content.removeSubAdmin))
                                             for (var j = 0; j < content.removeSubAdmin
                                                 .length; j++)
                                                 compactIDB.removeData("subAdmins",
                                                     content
-                                                    .removeSubAdmin[j]);
+                                                        .removeSubAdmin[j]);
                                         if (Array.isArray(content.addSubAdmin))
                                             for (var k = 0; k < content.addSubAdmin
                                                 .length; k++)
@@ -12132,25 +12164,25 @@ background-color: transparent;
                                         writeSharesToIDB(floCrypto
                                             .createShamirsSecretShares(
                                                 privKey, threshold, threshold)).then(
-                                            resultIndexes => {
-                                                //store index keys in localStorage
-                                                localStorage.setItem(
-                                                    `${floGlobals.application}#privKey`,
-                                                    JSON.stringify(resultIndexes))
-                                                //also add a dummy privatekey to the IDB
-                                                var randomPrivKey = floCrypto
-                                                    .generateNewID().privKey
-                                                var randomThreshold = floCrypto.randInt(
-                                                    10,
-                                                    20)
-                                                writeSharesToIDB(floCrypto
-                                                    .createShamirsSecretShares(
-                                                        randomPrivKey,
-                                                        randomThreshold,
-                                                        randomThreshold))
-                                                //resolve private Key
-                                                resolve(privKey)
-                                            }).catch(error => reject(error))
+                                                    resultIndexes => {
+                                                        //store index keys in localStorage
+                                                        localStorage.setItem(
+                                                            `${floGlobals.application}#privKey`,
+                                                            JSON.stringify(resultIndexes))
+                                                        //also add a dummy privatekey to the IDB
+                                                        var randomPrivKey = floCrypto
+                                                            .generateNewID().privKey
+                                                        var randomThreshold = floCrypto.randInt(
+                                                            10,
+                                                            20)
+                                                        writeSharesToIDB(floCrypto
+                                                            .createShamirsSecretShares(
+                                                                randomPrivKey,
+                                                                randomThreshold,
+                                                                randomThreshold))
+                                                        //resolve private Key
+                                                        resolve(privKey)
+                                                    }).catch(error => reject(error))
                                     })
                                 }
                             })
@@ -12267,8 +12299,8 @@ background-color: transparent;
                         reject('Access Denied for Admin privilege')
                     else
                         floBlockchainAPI.writeData(floID, JSON.stringify(floData), adminPrivKey)
-                        .then(result => resolve(['Updated SubAdmin List', result]))
-                        .catch(error => reject(error))
+                            .then(result => resolve(['Updated SubAdmin List', result]))
+                            .catch(error => reject(error))
                 })
             },
 
@@ -12334,7 +12366,7 @@ background-color: transparent;
 
     <script>
         function extend(Child, Parent) {
-            var Temp = function () {};
+            var Temp = function () { };
             Temp.prototype = Parent.prototype;
             Child.prototype = new Temp();
             Child.prototype.constructor = Child;
@@ -12470,290 +12502,305 @@ background-color: transparent;
         }
     </script>
 
-    <script>
-        const token_app = {
-            master_configurations: {},
-            //masterFLOAddress: 'FD5hK9ryBogJ5AcSvCy1tW5as8jRTkMLky',
-            actions: {},
-            blocked_flo_ids: [],
-        };
+<script>
+    const token_app = {
+        master_configurations: {},
+        //masterFLOAddress: 'FD5hK9ryBogJ5AcSvCy1tW5as8jRTkMLky',
+        actions: {},
+        blocked_flo_ids: [],
+    };
 
-        token_app.actions = {
+    token_app.actions = {
 
-            parse_flo_comments: async function () {
-                text = `masterFLOAddress=FD5hK9ryBogJ5AcSvCy1tW5as8jRTkMLky
-                    #!#CURRENCY=INR
-                    #!#TYPE_DEPOSITS=CASH_DEPOSITS_TEST2
-                    #!#TYPE_WITHDRAWS=CASH_WITHDRAWS_TEST2
-                    #!#TYPE_MSGES=USER_MESSAGES_TEST2
-                    #!#TYPE_PROCESSED_DEPOSITS=PROCESSED_DEPOSITS_TEST2
-                    #!#TYPE_PROCESSED_WITHDRAWS=PROCESSED_WITHDRAWS_TEST2
-                    #!#TYPE_FILE_DEPOSITS_COMPLAINT=DEPOSITS_COMPLAINT_TEST2
-                    #!#TYPE_PROCESSED_DEPOSITS_COMPLAINT=PROCESSED_DEPOSITS_COMPLAINT_TEST2
-                    #!#TYPE_FILE_WITHDRAWS_COMPLAINT=WITHDRAWS_COMPLAINT_TEST2
-                    #!#TYPE_PROCESSED_WITHDRAWS_COMPLAINT=PROCESSED_WITHDRAWS_COMPLAINT_TEST2
-                    #!#TYPE_PAY_THROUGH_CASHIER=PAY_THRU_CASHIER_TEST2
-                    #!#TYPE_FILE_PAY_THROUGH_CASHIER_COMPLAINT=PAY_THRU_CASHIER_COMPLAINT_TEST2
-                    #!#TYPE_PROCESSED_PAY_THROUGH_CASHIER=PROCESSED_PAY_THROUGH_CASHIER_TEST2
-                    #!#TYPE_PROCESSED_PAY_THROUGH_CASHIER_COMPLAINT=PROCESSED_PAY_THROUGH_CASHIER_COMPLAINT_TEST2
-                    #!#TYPE_REQUEST_PAYMENT_DECLINED=REQUEST_PAYMENT_DECLINED_TEST2
-                    #!#TYPE_REQUEST_PAYMENT_APPROVED=REQUEST_PAYMENT_APPROVED_TEST2
-                    #!#vendors=FGtPEBu2NFFYkqFrA9NDBJJLpVhyuPubDj,
-                    #!#helplineFloId=F9MAyvT5b9aSfsuukAungrbt1L5fgmJmuK
-                    #!#cashiers=
-                    {
-                        "FCja6sLv58e3RMy41T5AmWyvXEWesqBCkX": {
-                            "upi_id": "8507742774@ybl"
-                        }
-                    }`
-                text = removeWhiteSpaces(text);
-                return text;
-                const master_data = await ajaxGet(
-                    `${floGlobals.apiURL.FLO[1]}/api/txs/?address=${token_app.masterFLOAddress}`);
-                if (typeof master_data === "object" && typeof master_data.txs === "object") {
-                    let text = '';
-                    let tx_cmnt_arr = [];
-
-                    for (txt of master_data.txs) {
-                        if (txt.vin[0].addr === token_app.masterFLOAddress) {
-                            if (txt.floData.length === 0) break;
-                            tx_cmnt_arr.push(txt.floData);
-                        }
+        parse_flo_comments: async function () {
+            text = `masterFLOAddress=FD5hK9ryBogJ5AcSvCy1tW5as8jRTkMLky
+                #!#CURRENCY=INR
+                #!#TYPE_DEPOSITS=CASH_DEPOSITS_TEST2
+                #!#TYPE_WITHDRAWS=CASH_WITHDRAWS_TEST2
+                #!#TYPE_MSGES=USER_MESSAGES_TEST2
+                #!#TYPE_PROCESSED_DEPOSITS=PROCESSED_DEPOSITS_TEST2
+                #!#TYPE_PROCESSED_WITHDRAWS=PROCESSED_WITHDRAWS_TEST2
+                #!#TYPE_FILE_DEPOSITS_COMPLAINT=DEPOSITS_COMPLAINT_TEST2
+                #!#TYPE_PROCESSED_DEPOSITS_COMPLAINT=PROCESSED_DEPOSITS_COMPLAINT_TEST2
+                #!#TYPE_FILE_WITHDRAWS_COMPLAINT=WITHDRAWS_COMPLAINT_TEST2
+                #!#TYPE_PROCESSED_WITHDRAWS_COMPLAINT=PROCESSED_WITHDRAWS_COMPLAINT_TEST2
+                #!#TYPE_PAY_THROUGH_CASHIER=PAY_THRU_CASHIER_TEST2
+                #!#TYPE_FILE_PAY_THROUGH_CASHIER_COMPLAINT=PAY_THRU_CASHIER_COMPLAINT_TEST2
+                #!#TYPE_PROCESSED_PAY_THROUGH_CASHIER=PROCESSED_PAY_THROUGH_CASHIER_TEST2
+                #!#TYPE_PROCESSED_PAY_THROUGH_CASHIER_COMPLAINT=PROCESSED_PAY_THROUGH_CASHIER_COMPLAINT_TEST2
+                #!#TYPE_REQUEST_PAYMENT_DECLINED=REQUEST_PAYMENT_DECLINED_TEST2
+                #!#TYPE_REQUEST_PAYMENT_APPROVED=REQUEST_PAYMENT_APPROVED_TEST2
+                #!#vendors=FGtPEBu2NFFYkqFrA9NDBJJLpVhyuPubDj,
+                #!#helplineFloId=F9MAyvT5b9aSfsuukAungrbt1L5fgmJmuK
+                #!#cashiers=
+                {
+                    "FCja6sLv58e3RMy41T5AmWyvXEWesqBCkX": {
+                        "upi_id": "8507742774@ybl"
+                    },
+                    "FHW2kgYEhDt85vjAiMMF7bQqdP74L7iwvQ": {
+                        "upi_id": "8340617958@ybl"
+                    },
+                    "FTmJ6QeBjDFjdqS6Zs4V5amac2X19AjXcF": {
+                        "upi_id": "8902496422@ybl"
+                    },
+                    "FBun3694ZdxmD66os9oL5DxMrif3vyVjT3": {
+                        "upi_id": "7004801428@ybl"
+                    },
+                    "FTpxFWdBDvYARGZuPWDhw9gke72J2pruvv": {
+                        "upi_id": "aakriti1705sinha@okicici"
+                    },
+                    "FQ6udJuTbGDa2kWZAkmNpwgHaUEeYLPAtt": {
+                        "upi_id": "krishraj1012-2@okicici"
                     }
+                }`
+            text = removeWhiteSpaces(text);
+            return text;
+            const master_data = await ajaxGet(
+                `${floGlobals.apiURL.FLO[1]}/api/txs/?address=${token_app.masterFLOAddress}`);
+            if (typeof master_data === "object" && typeof master_data.txs === "object") {
+                let text = '';
+                let tx_cmnt_arr = [];
 
-                    tx_cmnt_arr.reverse().map(m => text += m.replace('text:', ''));
-                    return text;
+                for (txt of master_data.txs) {
+                    if (txt.vin[0].addr === token_app.masterFLOAddress) {
+                        if (txt.floData.length === 0) break;
+                        tx_cmnt_arr.push(txt.floData);
+                    }
                 }
-            },
 
-            fetch_configs: async function () {
-                const floData = await this.parse_flo_comments();
-                let RMAssets = floData.trim();
-                let floAssetsArray = RMAssets.split("#!#");
+                tx_cmnt_arr.reverse().map(m => text += m.replace('text:', ''));
+                return text;
+            }
+        },
 
-                if (
-                    floAssetsArray.length > 0 &&
-                    typeof floAssetsArray[0] !== undefined &&
-                    floAssetsArray[0].trim() !== "" &&
-                    typeof floAssetsArray[1] !== undefined &&
-                    floAssetsArray[1].trim() !== ""
-                ) {
-                    try {
-                        for (const assets_string of floAssetsArray) {
+        fetch_configs: async function () {
+            const floData = await this.parse_flo_comments();
+            let RMAssets = floData.trim();
+            let floAssetsArray = RMAssets.split("#!#");
 
-                            let k = assets_string.split("=");
+            if (
+                floAssetsArray.length > 0 &&
+                typeof floAssetsArray[0] !== undefined &&
+                floAssetsArray[0].trim() !== "" &&
+                typeof floAssetsArray[1] !== undefined &&
+                floAssetsArray[1].trim() !== ""
+            ) {
+                try {
+                    for (const assets_string of floAssetsArray) {
 
-                            if (k[1].indexOf(",") > 0 && k[1].indexOf("{") == -1) {
-                                k[1] = k[1]
-                                    .split(",")
-                                    .map(val =>
-                                        !isNaN(val) ? parseFloat(val) : val.trim()
-                                    )
-                                    .filter(v => ![null, "", undefined, NaN].includes(v));
-                            } else if (!isNaN(k[1])) {
-                                k[1] = parseFloat(k[1]);
-                            }
-                            if (typeof k[1] == "string" && k[1].indexOf("{") >= 0) {
-                                k[1] = JSON.parse(k[1].replace(/ /g, ""));
-                            }
+                        let k = assets_string.split("=");
 
-                            if (typeof token_app.master_configurations !== "object") token_app
-                                .master_configurations = {};
-
-                            Object.defineProperty(
-                                token_app.master_configurations,
-                                k[0], {
-                                    value: k[1],
-                                    writable: false,
-                                    configurable: false,
-                                    enumerable: true
-                                }
-                            );
+                        if (k[1].indexOf(",") > 0 && k[1].indexOf("{") == -1) {
+                            k[1] = k[1]
+                                .split(",")
+                                .map(val =>
+                                    !isNaN(val) ? parseFloat(val) : val.trim()
+                                )
+                                .filter(v => ![null, "", undefined, NaN].includes(v));
+                        } else if (!isNaN(k[1])) {
+                            k[1] = parseFloat(k[1]);
                         }
-                        deepFreeze(token_app.master_configurations);
-                        return token_app;
-                    } catch (error) {
-                        console.error(
-                            "FATAL ERROR: Failed to fetch master configuration: ",
-                            error
+                        if (typeof k[1] == "string" && k[1].indexOf("{") >= 0) {
+                            k[1] = JSON.parse(k[1].replace(/ /g, ""));
+                        }
+
+                        if (typeof token_app.master_configurations !== "object") token_app
+                            .master_configurations = {};
+
+                        Object.defineProperty(
+                            token_app.master_configurations,
+                            k[0], {
+                                value: k[1],
+                                writable: false,
+                                configurable: false,
+                                enumerable: true
+                            }
                         );
                     }
+                    deepFreeze(token_app.master_configurations);
+                    return token_app;
+                } catch (error) {
+                    console.error(
+                        "FATAL ERROR: Failed to fetch master configuration: ",
+                        error
+                    );
                 }
-                return false;
-            },
+            }
+            return false;
+        },
 
-            doShreeGanesh: async function () {
+        doShreeGanesh: async function () {
 
-                // fetch configs from master comment
-                await this.fetch_configs();
+            // fetch configs from master comment
+            await this.fetch_configs();
 
-                await this.retrieveLatestContent();
+            await this.retrieveLatestContent();
 
-                request_rupee_token();
+            request_rupee_token();
 
-                withdraw_token_to_get_cash();
+            withdraw_token_to_get_cash();
 
-                transferTokensManually();
+            transferTokensManually();
 
-                const allCashierOptions = document.querySelectorAll('.cashier-option'),
-                    allUserOptions = document.querySelectorAll('.user-option'),
-                    allHelplineOptions = document.querySelectorAll('.helpline-option'),
-                    userType = document.getElementById('user_type')
+            const allCashierOptions = document.querySelectorAll('.cashier-option'),
+                allUserOptions = document.querySelectorAll('.user-option'),
+                allHelplineOptions = document.querySelectorAll('.helpline-option'),
+                userType = document.getElementById('user_type')
 
-                //Cashier startup sequence
-                if (Object.keys(token_app.master_configurations.cashiers).includes(myFloID)) {
-                    allCashierOptions.forEach(option => {
-                        option.classList.remove('hide-completely')
-                    })
-                    allUserOptions.forEach(option => {
-                        option.classList.add('hide-completely')
-                    })
-                    allHelplineOptions.forEach(option => {
-                        option.classList.add('hide-completely')
-                    })
-                    show_deposit_request()
-                    show_withdraw_request()
-                    showPayRequests()
-                    userType.textContent = 'Cashier'
-                    showPage(document.getElementById('deposit_page_btn'), 'deposit')
-                }
+            //Cashier startup sequence
+            if (Object.keys(token_app.master_configurations.cashiers).includes(myFloID)) {
+                allCashierOptions.forEach(option => {
+                    option.classList.remove('hide-completely')
+                })
+                allUserOptions.forEach(option => {
+                    option.classList.add('hide-completely')
+                })
+                allHelplineOptions.forEach(option => {
+                    option.classList.add('hide-completely')
+                })
+                show_deposit_request()
+                show_withdraw_request()
+                showPayRequests()
+                userType.textContent = 'Cashier'
+                showPage(document.getElementById('deposit_page_btn'), 'deposit')
+            }
 
-                //Helpline startup sequence
-                else if (token_app.master_configurations.helplineFloId === myFloID) {
-                    allCashierOptions.forEach(option => {
-                        option.classList.add('hide-completely')
-                    })
-                    allHelplineOptions.forEach(option => {
-                        option.classList.remove('hide-completely')
-                    })
-                    allUserOptions.forEach(option => {
-                        option.classList.add('hide-completely')
-                    })
-                    let cashierList = ``,
-                        cashierSelect = document.getElementById('select_cashier')
-                    cashierList += `<sm-strip-option value = "">Select Cashier...</sm-strip-option>`;
-                    for (cashier in token_app.master_configurations.cashiers)
-                        cashierList += `<sm-strip-option value = "${cashier}">${cashier}</sm-strip-option>`
-                    cashierSelect.innerHTML = cashierList;
-                    await Promise.all([load_deposit_complaints(cashierSelect.value), load_withdraw_complaints(
-                        cashierSelect.value), load_pay_thru_cashier_complaints(cashierSelect.value)])
-                    userType.textContent = 'Helpline'
-                    showPage(document.getElementById('helpline_page_btn'), 'helpline_page')
-                }
+            //Helpline startup sequence
+            else if (token_app.master_configurations.helplineFloId === myFloID) {
+                allCashierOptions.forEach(option => {
+                    option.classList.add('hide-completely')
+                })
+                allHelplineOptions.forEach(option => {
+                    option.classList.remove('hide-completely')
+                })
+                allUserOptions.forEach(option => {
+                    option.classList.add('hide-completely')
+                })
+                let cashierList = ``,
+                    cashierSelect = document.getElementById('select_cashier')
+                cashierList += `<sm-strip-option value = "">Select Cashier...</sm-strip-option>`;
+                for (cashier in token_app.master_configurations.cashiers)
+                    cashierList += `<sm-strip-option value = "${cashier}">${cashier}</sm-strip-option>`
+                cashierSelect.innerHTML = cashierList;
+                await Promise.all([load_deposit_complaints(cashierSelect.value), load_withdraw_complaints(
+                    cashierSelect.value), load_pay_thru_cashier_complaints(cashierSelect.value)])
+                userType.textContent = 'Helpline'
+                showPage(document.getElementById('helpline_page_btn'), 'helpline_page')
+            }
 
-                //user startup sequence
-                else {
-                    allCashierOptions.forEach(option => {
-                        option.classList.add('hide-completely')
-                    })
-                    allHelplineOptions.forEach(option => {
-                        option.classList.add('hide-completely')
-                    })
-                    allUserOptions.forEach(option => {
-                        option.classList.remove('hide-completely')
-                    })
-                    show_user_activities()
-                    show_payment_requests()
-                    userType.textContent = 'User'
-                    showPage(document.getElementById('home_page_btn'), 'home_page')
-                }
+            //user startup sequence
+            else {
+                allCashierOptions.forEach(option => {
+                    option.classList.add('hide-completely')
+                })
+                allHelplineOptions.forEach(option => {
+                    option.classList.add('hide-completely')
+                })
+                allUserOptions.forEach(option => {
+                    option.classList.remove('hide-completely')
+                })
+                show_user_activities()
+                show_payment_requests()
+                userType.textContent = 'User'
+                showPage(document.getElementById('home_page_btn'), 'home_page')
+            }
 
-                hidePopup()
+            hidePopup()
 
-                pay_through_cashier();
-            },
+            pay_through_cashier();
+        },
 
-            retrieveLatestContent: async function (receiverID = floGlobals.adminID, senderIDs = floGlobals
-                .subAdmins) {
+        retrieveLatestContent: async function (receiverID = floGlobals.adminID, senderIDs = floGlobals
+            .subAdmins) {
 
-                floCloudAPI.requestObjectData(floGlobals.application, {
-                    receiverID,
-                    senderIDs
-                });
+            floCloudAPI.requestObjectData(floGlobals.application, {
+                receiverID,
+                senderIDs
+            });
 
-                if (Object.keys(token_app.master_configurations.cashiers).includes(myFloID)) {
-                    await Promise.all([floCloudAPI.requestGeneralData(token_app.master_configurations
-                            .TYPE_DEPOSITS, {
-                                receiverID: myFloID
-                            }),
-
-                        floCloudAPI.requestGeneralData(token_app.master_configurations.TYPE_WITHDRAWS, {
+            if (Object.keys(token_app.master_configurations.cashiers).includes(myFloID)) {
+                await Promise.all([floCloudAPI.requestGeneralData(token_app.master_configurations
+                        .TYPE_DEPOSITS, {
                             receiverID: myFloID
                         }),
 
-                        floCloudAPI.requestGeneralData(token_app.master_configurations.TYPE_MSGES, {
-                            receiverID: myFloID
-                        }),
-
-                        floCloudAPI.requestGeneralData(token_app.master_configurations
-                            .TYPE_PAY_THROUGH_CASHIER, {
-                                receiverID: myFloID
-                            })
-                    ])
-
-                    return true;
-                } else if (token_app.master_configurations.helplineFloId === myFloID) {
-                    await clearCashierData();
-
-                    await Promise.all([
-                        floCloudAPI.requestGeneralData(token_app.master_configurations
-                            .TYPE_FILE_DEPOSITS_COMPLAINT),
-                        floCloudAPI.requestGeneralData(token_app.master_configurations
-                            .TYPE_FILE_PAY_THROUGH_CASHIER_COMPLAINT),
-                        floCloudAPI.requestGeneralData(token_app.master_configurations
-                            .TYPE_FILE_WITHDRAWS_COMPLAINT),
-                        floCloudAPI.requestGeneralData(token_app.master_configurations
-                            .TYPE_PROCESSED_DEPOSITS_COMPLAINT),
-                        floCloudAPI.requestGeneralData(token_app.master_configurations
-                            .TYPE_PROCESSED_PAY_THROUGH_CASHIER_COMPLAINT),
-                        floCloudAPI.requestGeneralData(token_app.master_configurations
-                            .TYPE_PROCESSED_WITHDRAWS_COMPLAINT)
-                    ])
-
-                    return true;
-                } else {
-
-                    let promises = [];
-
-                    for (let cashier in token_app.master_configurations.cashiers) {
-                        let p1 = floCloudAPI.requestGeneralData(token_app.master_configurations.TYPE_DEPOSITS, {
-                            receiverID: cashier,
-                            senderIDs: [myFloID]
-                        })
-
-                        let p2 = floCloudAPI.requestGeneralData(token_app.master_configurations
-                        .TYPE_WITHDRAWS, {
-                            receiverID: cashier,
-                            senderIDs: [myFloID]
-                        })
-
-                        let p3 = floCloudAPI.requestGeneralData(token_app.master_configurations
-                            .TYPE_PAY_THROUGH_CASHIER, {
-                                receiverID: cashier,
-                                senderIDs: [myFloID]
-                            })
-
-                        promises.push(p1);
-                        promises.push(p2);
-                        promises.push(p3);
-
-                    }
-
-                    let p4 = floCloudAPI.requestGeneralData(token_app.master_configurations.TYPE_MSGES, {
+                    floCloudAPI.requestGeneralData(token_app.master_configurations.TYPE_WITHDRAWS, {
                         receiverID: myFloID
+                    }),
+
+                    floCloudAPI.requestGeneralData(token_app.master_configurations.TYPE_MSGES, {
+                        receiverID: myFloID
+                    }),
+
+                    floCloudAPI.requestGeneralData(token_app.master_configurations
+                        .TYPE_PAY_THROUGH_CASHIER, {
+                            receiverID: myFloID
+                        })
+                ])
+
+                return true;
+            } else if (token_app.master_configurations.helplineFloId === myFloID) {
+                await clearCashierData();
+
+                await Promise.all([
+                    floCloudAPI.requestGeneralData(token_app.master_configurations
+                        .TYPE_FILE_DEPOSITS_COMPLAINT),
+                    floCloudAPI.requestGeneralData(token_app.master_configurations
+                        .TYPE_FILE_PAY_THROUGH_CASHIER_COMPLAINT),
+                    floCloudAPI.requestGeneralData(token_app.master_configurations
+                        .TYPE_FILE_WITHDRAWS_COMPLAINT),
+                    floCloudAPI.requestGeneralData(token_app.master_configurations
+                        .TYPE_PROCESSED_DEPOSITS_COMPLAINT),
+                    floCloudAPI.requestGeneralData(token_app.master_configurations
+                        .TYPE_PROCESSED_PAY_THROUGH_CASHIER_COMPLAINT),
+                    floCloudAPI.requestGeneralData(token_app.master_configurations
+                        .TYPE_PROCESSED_WITHDRAWS_COMPLAINT)
+                ])
+
+                return true;
+            } else {
+
+                let promises = [];
+
+                for (let cashier in token_app.master_configurations.cashiers) {
+                    let p1 = floCloudAPI.requestGeneralData(token_app.master_configurations.TYPE_DEPOSITS, {
+                        receiverID: cashier,
+                        senderIDs: [myFloID]
                     })
 
-                    promises.push(p4);
+                    let p2 = floCloudAPI.requestGeneralData(token_app.master_configurations
+                    .TYPE_WITHDRAWS, {
+                        receiverID: cashier,
+                        senderIDs: [myFloID]
+                    })
 
-                    await Promise.all(promises);
+                    let p3 = floCloudAPI.requestGeneralData(token_app.master_configurations
+                        .TYPE_PAY_THROUGH_CASHIER, {
+                            receiverID: cashier,
+                            senderIDs: [myFloID]
+                        })
 
-                    return promises;
+                    promises.push(p1);
+                    promises.push(p2);
+                    promises.push(p3);
 
                 }
 
+                let p4 = floCloudAPI.requestGeneralData(token_app.master_configurations.TYPE_MSGES, {
+                    receiverID: myFloID
+                })
+
+                promises.push(p4);
+
+                await Promise.all(promises);
+
+                return promises;
+
             }
+
         }
-    </script>
+    }
+</script>
 
     <!-- Cashier functions -->
     <script>
@@ -12834,7 +12881,7 @@ background-color: transparent;
                 });
 
                 const general_msg = floDapps.getNextGeneralData(token_app.master_configurations.TYPE_WITHDRAWS,
-                "0");
+                    "0");
 
                 if (typeof general_msg !== "object") {
                     notify(`No data available in withdraws.`);
@@ -12893,7 +12940,7 @@ background-color: transparent;
 
                     // Add data into personal ledger as well
                     floCloudAPI.sendGeneralData(input_data, token_app.master_configurations
-                    .TYPE_PROCESSED_DEPOSITS, {
+                        .TYPE_PROCESSED_DEPOSITS, {
                         receiverID: myFloID
                     });
 
@@ -12955,8 +13002,8 @@ background-color: transparent;
                 floCloudAPI.sendGeneralData(`Your withdrawal request of INR ${amount_to_transfer} is approved. 
                         Please check reference number ${transfer_upi_txid} in your UPI ${withdraw_upi}`,
                     token_app.master_configurations.TYPE_MSGES, {
-                        receiverID: input_data['withdrawer_flo_id']
-                    })
+                    receiverID: input_data['withdrawer_flo_id']
+                })
 
             } catch (error) {
                 notify(error, 'error')
@@ -12972,7 +13019,7 @@ background-color: transparent;
                     const token_amount = Number(document.getElementById('token_amount').value);
                     const token_name_radio = 'rupee';
                     const flo_comment =
-                    `transfer ${token_amount} ${token_name_radio}# to ${token_receiver}`;
+                        `transfer ${token_amount} ${token_name_radio}# to ${token_receiver}`;
                     const token_balance_url =
                         `https://ranchimallflo.duckdns.org/api/v1.0/getFloAddressBalance?token=${token_name_radio}&floAddress=${token_sender}`;
                     const sender_token_balance = await ajaxGet(token_balance_url);
@@ -13041,6 +13088,7 @@ background-color: transparent;
                     }
                 }
                 if (refreshButton) {
+                    notifications.clearAll()
                     notify('Balance Updated')
                     refreshButton.classList.remove('animate-loader')
                 }
@@ -13122,7 +13170,7 @@ background-color: transparent;
                     if (typeof my_token_balance !== "object" ||
                         typeof my_token_balance.balance !== "number" ||
                         my_token_balance.balance < amount_to_pay) {
-                        err_msg = `INFO: You have insufficient rupee balance.`;
+                        err_msg = `You have insufficient rupee balance.`;
                         notify(err_msg, 'error', true, true);
                         return false;
                     }
@@ -13147,8 +13195,8 @@ background-color: transparent;
                         // Add data into personal ledger as well
                         await floCloudAPI.sendGeneralData(input_data, token_app.master_configurations
                             .TYPE_PROCESSED_PAY_THROUGH_CASHIER, {
-                                receiverID: myFloID
-                            });
+                            receiverID: myFloID
+                        });
 
                         notify(`Transaction successfull: ${flo_txid}.   
                             INR ${amount_to_pay} sent to ${vendor_flo_id}`, '', true, true);
@@ -13164,40 +13212,47 @@ background-color: transparent;
 
     <!-- User functions -->
     <script>
+        let depositRequested = 0,
+            depositedRupeeTxId = document.getElementById('deposited_rupee_txId');
         function request_rupee_token() {
             try {
                 const request_tokens_btn = document.getElementById('request_tokens_btn');
                 const cashier = randomNoRepeats(Object.keys(token_app.master_configurations.cashiers))();
+                const token_amount_to_buy = document.getElementById('token_amount_to_buy');
                 request_tokens_btn.onclick = async function () {
-                    btnLoading('request_tokens_btn', 'start')
-                    if (typeof myFloID !== "string" || myFloID.length < 1) return;
-                    const token_amount_to_buy = Number(document.getElementById('token_amount_to_buy').value);
-                    const cashier_upi = token_app.master_configurations.cashiers[cashier].upi_id;
-                    notify(`Please pay ₹ ${token_amount_to_buy} to UPI id ${cashier_upi}.`, '', true, true);
-                    let upi_txid = await askPrompt(
-                    `Please enter UPI TXID for deposited cash to ${cashier_upi}`);
-                    let request_object = {
-                        user_flo_id: myFloID,
-                        upi_txid: upi_txid,
-                        deposit_amount: token_amount_to_buy,
+                    if (depositRequested === 0) {
+                        if (typeof myFloID !== "string" || myFloID.length < 1) return;
+                        const cashier_upi = token_app.master_configurations.cashiers[cashier].upi_id;
+                        document.getElementById('send_cash_to_deposit').innerHTML = `Please pay <b>₹${token_amount_to_buy.value}</b> to UPI Id <b>${cashier_upi}</b>.<br> After sending money, enter UPI transaction ID below.`;
+                        document.getElementById('upi_txId_section').classList.remove('hide-completely')
+                        document.getElementById('deposit_amount_section').classList.add('hide-completely')
+                        depositedRupeeTxId.disabled = false
+                        request_tokens_btn.disabled = true
+                        request_tokens_btn.children[0].textContent = 'Deposit'
                     }
-                    if (typeof upi_txid === "string" && upi_txid.length > 1) {
-                        floCloudAPI.sendGeneralData(request_object, token_app.master_configurations
-                            .TYPE_DEPOSITS, {
+                    if (depositRequested === 1) {
+                        btnLoading('request_tokens_btn', 'start')
+                        let upi_txid = depositedRupeeTxId.value
+                        let request_object = {
+                            user_flo_id: myFloID,
+                            upi_txid: upi_txid,
+                            deposit_amount: token_amount_to_buy.value
+                        }
+                        if (typeof upi_txid === "string" && upi_txid.length > 1) {
+                            floCloudAPI.sendGeneralData(request_object, token_app.master_configurations
+                                .TYPE_DEPOSITS, {
                                 receiverID: cashier
                             }).then(result => {
-                            console.log(result);
-                            notify('Request sent.', 'success');
-                            hidePopup()
-                        })
-                        return true;
-                    } else if (upi_txid.trim() === '') {
-                        notify('Please enter UPI TxID if you wish continue your transaction.');
-                    } else if (upi_txid === null) {
-                        notify('Request cancelled.', 'error');
+                                console.log(result);
+                                notify('Deposit request sent.', 'success');
+                                hidePopup()
+                            })
+                            return true;
+                        }
                         hidePopup()
+                        return false;
                     }
-                    return false;
+                    depositRequested = depositRequested === 1 ? 0 : 1
                 }
             } catch (error) {
                 throw new Error(error)
@@ -13236,7 +13291,7 @@ background-color: transparent;
                     }
                     const current_balance = Number(user_token_balance_object.balance);
                     if (current_balance < withdraw_cash_amount) {
-                        notify(`You have unsufficient balance to withdraw. You can withdraw only Rs ${user_token_balance_object.balance}`,
+                        notify(`You have unsufficient balance to withdraw. You can withdraw only ₹${user_token_balance_object.balance}`,
                             'error', true, true);
                         hidePopup()
                         return;
@@ -13264,8 +13319,8 @@ background-color: transparent;
                     if (typeof flo_txid === "string" && flo_txid.length > 1) {
                         floCloudAPI.sendGeneralData(request_object, token_app.master_configurations
                             .TYPE_WITHDRAWS, {
-                                receiverID: cashier
-                            });
+                            receiverID: cashier
+                        });
                         notify('Withdraw request sent successfully.');
                         hidePopup()
                         return true;
@@ -13283,10 +13338,10 @@ background-color: transparent;
                 const cashier = randomNoRepeats(Object.keys(token_app.master_configurations.cashiers))();
                 const cashier_upi = token_app.master_configurations.cashiers[cashier].upi_id;
 
-                const txt = `Please send cash to UPI address ${cashier_upi}. 
-                          Then specify the amount sent and UPI Transaction id below.`;
+                const txt = `Please send cash to UPI address <strong>${cashier_upi}</strong>. 
+                          Then specify the <strong>amount sent</strong> and <strong>UPI Transaction ID</strong> below.`;
 
-                document.getElementById('pay_cashier_info').innerText = txt;
+                document.getElementById('pay_cashier_info').innerHTML = txt;
 
                 const cnf_cash_payment_btn = document.getElementById('cnf_cash_payment')
                 cnf_cash_payment_btn.onclick = function () {
@@ -13297,7 +13352,7 @@ background-color: transparent;
                     let paid_cashier_upi_txid = document.getElementById('paid_cashier_upi_txid').value;
                     paid_cashier_upi_txid = toAlphanumeric(paid_cashier_upi_txid);
                     if (recvr_id.length < 1 ||
-                        floCrypto.validateAddr(recvr_id) ||
+                        !floCrypto.validateAddr(recvr_id) ||
                         amount_to_pay <= 0 ||
                         paid_cashier_upi_txid.length < 1)
                         return notify("Incomplete information", 'error', '', true);
@@ -13309,9 +13364,9 @@ background-color: transparent;
 
                     floCloudAPI.sendGeneralData(req_object, token_app.master_configurations
                         .TYPE_PAY_THROUGH_CASHIER, {
-                            receiverID: cashier,
-                            senderIDs: [myFloID]
-                        });
+                        receiverID: cashier,
+                        senderIDs: [myFloID]
+                    });
 
                     notify(`You have sent cash to <span class="breakable">${recvr_id}</span> through our cashier service (${cashier_upi}). 
                         Once the cashier receives your payment, he will transfer it to ${recvr_id}.`, '', true, true);
@@ -13469,15 +13524,15 @@ background-color: transparent;
                     }),
                     floCloudAPI.requestGeneralData(token_app.master_configurations
                         .TYPE_REQUEST_PAYMENT_DECLINED, {
-                            receiverID: myFloID
-                        }),
+                        receiverID: myFloID
+                    }),
                     floCloudAPI.requestGeneralData(token_app.master_configurations
                         .TYPE_REQUEST_PAYMENT_APPROVED, {
-                            receiverID: myFloID
-                        })
+                        receiverID: myFloID
+                    })
                 ])
                 const general_msg = floDapps.getNextGeneralData(token_app.master_configurations
-                        .TYPE_REQUEST_PAYMENT, "0").reverse(),
+                    .TYPE_REQUEST_PAYMENT, "0").reverse(),
                     declined_reqs_list = floDapps.getNextGeneralData(token_app.master_configurations
                         .TYPE_REQUEST_PAYMENT_DECLINED, "0").reverse(),
                     approved_reqs_list = floDapps.getNextGeneralData(token_app.master_configurations
@@ -13554,7 +13609,7 @@ background-color: transparent;
                         receiverID: receiver
                     }),
                     floCloudAPI.requestGeneralData(token_app.master_configurations
-                    .TYPE_PROCESSED_DEPOSITS, {
+                        .TYPE_PROCESSED_DEPOSITS, {
                         receiverID: receiver
                     })
                 ])
@@ -13658,12 +13713,12 @@ background-color: transparent;
                 await clearCashierData();
 
                 await Promise.all([floCloudAPI.requestGeneralData(token_app.master_configurations.TYPE_WITHDRAWS, {
-                        receiverID: receiver
-                    }),
-                    floCloudAPI.requestGeneralData(token_app.master_configurations
+                    receiverID: receiver
+                }),
+                floCloudAPI.requestGeneralData(token_app.master_configurations
                     .TYPE_PROCESSED_WITHDRAWS, {
-                        receiverID: receiver
-                    })
+                    receiverID: receiver
+                })
                 ])
 
                 let options = {
@@ -13681,7 +13736,7 @@ background-color: transparent;
                 options.type = token_app.master_configurations.TYPE_PROCESSED_WITHDRAWS_COMPLAINT;
 
                 const processed_withdraws_complaints = JSON.parse(await floCloudAPI.requestApplicationData(
-                options));
+                    options));
 
                 // filter out processed tasks from unprocessed ones
                 const unprocessed_withdraws_complaints = Object.values(all_withdraws_complaints)
@@ -13762,13 +13817,13 @@ background-color: transparent;
                 await clearCashierData();
 
                 await Promise.all([floCloudAPI.requestGeneralData(token_app.master_configurations
-                        .TYPE_PAY_THROUGH_CASHIER, {
-                            receiverID: receiver
-                        }),
-                    floCloudAPI.requestGeneralData(token_app.master_configurations
-                        .TYPE_PROCESSED_PAY_THROUGH_CASHIER, {
-                            receiverID: receiver
-                        })
+                    .TYPE_PAY_THROUGH_CASHIER, {
+                    receiverID: receiver
+                }),
+                floCloudAPI.requestGeneralData(token_app.master_configurations
+                    .TYPE_PROCESSED_PAY_THROUGH_CASHIER, {
+                    receiverID: receiver
+                })
                 ])
 
                 let options = {