diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 227f732..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Examples from NEAR, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/copy-dev-account.js b/copy-dev-account.js
index 08f7ca3..343dc27 100644
--- a/copy-dev-account.js
+++ b/copy-dev-account.js
@@ -2,6 +2,6 @@ let fs=require('fs')
 // copy created contract name for vue-cli-service at ./.env
 const contractNameFilePath = './neardev/dev-account';
 const existingContractName = fs.readFileSync(contractNameFilePath, { encoding: "utf8" }).trim()
-const vueEnvFile = "./.env.development.local"
+const vueEnvFile = "./.env"
 fs.writeFileSync(vueEnvFile , "VUE_APP_CONTRACT_NAME=" + existingContractName)
 console.log(`copied ${contractNameFilePath} to ${vueEnvFile}`)
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index 186bf2d..127d58e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,6 +9,7 @@
 <script>
 import NavBar from './components/NavBar/NavBar.vue'
 import getConfig from "./nearNets"
+import { mapActions } from "vuex"
 
 const nearConfig = getConfig(process.env.NODE_ENV || "development")
 console.log(
@@ -26,16 +27,26 @@ export default {
     document.title = "nft-example.near_testing.testnet"
 
     if (this.isSignedIn) {
-      this.$store.dispatch('setCurrentContract', window.contract)
-      this.$store.dispatch('setAccountId', window.accountId)
+      this.setCurrentContract(window.contract)
+      this.setAccountId(window.accountId)
 
       // getting all NFTs of currently signed user
-      this.$store.dispatch('getListOfNFT')
+      this.getListOfNFT()
     }
   },
 
   async beforeMount() {
-    await this.$store.dispatch('setIpfs')
+    await this.setIpfs()
+  },
+
+  methods: {
+    ...mapActions([
+      'setCurrentContract',
+      'setAccountId',
+      'getListOfNFT',
+      'setIpfs',
+      'setStatus',
+    ]),
   },
 
   computed: {
diff --git a/src/components/Spinner/SpinnerDots.vue b/src/components/Spinner/SpinnerDots.vue
index fbefb73..820847f 100644
--- a/src/components/Spinner/SpinnerDots.vue
+++ b/src/components/Spinner/SpinnerDots.vue
@@ -35,7 +35,6 @@ $target-scale: .55;
 $min-scale: .37;
 
 $animationDuration: 1s;
-
 .spinner-dots {
   font-size: 0;
   text-align: center;
diff --git a/src/global.css b/src/global.css
index 7e30cdc..4c5b777 100644
--- a/src/global.css
+++ b/src/global.css
@@ -26,6 +26,13 @@ html {
   opacity: 0;
 }
 
+.loading-container {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+}
+
 body {
   margin: 0;
   padding: 0;
diff --git a/src/nearConfig.js b/src/nearConfig.js
index adbabdb..dca77ef 100644
--- a/src/nearConfig.js
+++ b/src/nearConfig.js
@@ -1,4 +1,4 @@
-import { connect, Contract, keyStores, WalletConnection } from 'near-api-js'
+import { connect, Contract, keyStores, WalletConnection, utils } from 'near-api-js'
 import getConfig from './nearNets'
 
 const nearConfig = getConfig(process.env.NODE_ENV || 'development')
@@ -16,6 +16,10 @@ export async function initContract() {
 
   // Getting the Account ID. If still unauthorized, it's just empty string
   window.accountId = window.walletConnection.getAccountId()
+  const acc = await near.account("near_testing.testnet")
+  const balance = await acc.getAccountBalance()
+  const amountInNEAR = utils.format.formatNearAmount(balance.total)
+  window.balance = amountInNEAR
 
   // Initializing our contract APIs by contract name and configuration
   window.contract = await new Contract(window.walletConnection.account(), nearConfig.contractName, {
diff --git a/src/router/index.js b/src/router/index.js
index 7fe78ac..3c6b9ba 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -7,6 +7,13 @@ import SendNFT from "../views/SendNFT"
 // import Minting from "../views/Minting"
 // import WrapNFTS from "../views/WrapNFTS"
 // import Unwrap from "../views/Unwrap"
+const { providers } = require("near-api-js")
+import store, { Status } from "../store"
+
+const provider = new providers.JsonRpcProvider(
+  "https://rpc.testnet.near.org"
+)
+
 
 Vue.use(Router)
 
@@ -75,12 +82,30 @@ router.afterEach((to, from) => {
   })
 })
 
+async function passResult(txHash, accountId, type) {
+  const result = await provider.txStatus(txHash, accountId)
+
+  if (result.status && 'SuccessValue' in result.status && type === 'send_nft') {
+    console.log("Result: 2 ", result)
+    // store.dispatch.setStatus(Status.Approved)
+    console.log(router, 'ROUTE')
+    console.log(Status)
+    store.dispatch('setStatus', Status.Approved)
+  }
 
+  if (result.status && 'SuccessValue' in result.status && type === 'choose_nft') {
+    console.log("Result: 2 ", result)
+    // store.dispatch.setStatus(Status.Approved)
+    console.log(router, 'ROUTE')
+    console.log(Status)
+    store.dispatch('setStatus', Status.Minted)
+  }
+}
 
 router.beforeEach((to, _from, next) => {
   const requiresAuth = to.matched.some((record) => record.meta.requiresAuth)
   const user = window.walletConnection.isSignedIn()
-  console.log(user, 'user')
+
   if (requiresAuth && !user) {
     next('/')
     Vue.notify({
@@ -91,6 +116,24 @@ router.beforeEach((to, _from, next) => {
   } else {
     next()
   }
+
+  // handling transaction hashes, for displayng response to user
+
+  const account_id = window.accountId
+  const url = new URL(document.location)
+  console.log(url, 'url')
+  console.log(window.location.href, 'document.location')
+  const tx_hash = url.searchParams.get('transactionHashes')
+
+  if (tx_hash && to.name === 'SendNFT') {
+    router.push({ name: 'SendNFT' })
+    passResult(tx_hash, account_id, 'send_nft')
+  }
+  if (tx_hash && to.name === 'ChooseNFT') {
+    console.log(tx_hash, 'tx_hash')
+    router.push({ name: 'ChooseNFT' })
+    passResult(tx_hash, account_id, 'choose_nft')
+  }
 })
 
 export default router
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index 7fa6610..bdac5d6 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -27,7 +27,8 @@ export const Status = Object.freeze({
   DeployingToIPFS: 2,
   DeployedToIPFS: 3,
   Minting: 4,
-  Minted: 5
+  Minted: 5,
+  Approved: 6,
 })
 
 const store = new Vuex.Store({
@@ -135,17 +136,21 @@ const store = new Vuex.Store({
       commit('setNFT', result[2].metadata)
       commit('passAllNFTs', result)
     },
-    createNewRandomNFT ({getters},  { token_id, metadata }) {
+    createNewRandomNFT ({getters, dispatch},  { token_id, metadata }) {
+      dispatch('setStatus', Status.Minting)
       createRandomNft(token_id, metadata, getters.getAccountId, getters.getContract)
     },
-    createNewUsualNFT ({getters},  { token_id, metadata }) {
+    createNewUsualNFT ({getters, dispatch},  { token_id, metadata }) {
       console.log(token_id, metadata, 'result createNewUsualNFT')
+      dispatch('setStatus', Status.Minting)
       createUsualNFT(token_id, metadata, getters.getAccountId, getters.getContract)
     },
-    setNFTApproveId ({getters}, token_id) {
+    setNFTApproveId ({getters, dispatch}, token_id) {
+      dispatch('setStatus', Status.Approving)
       approveNFT(getters.getAccountId, token_id, getters.getContract)
     },
-    sendNFTByToken ({getters}, { receiver, token_id }) {
+    sendNFTByToken ({getters, dispatch}, { receiver, token_id }) {
+      dispatch('setStatus', Status.Approving)
       sendNFT(receiver, token_id, getters.getContract)
     },
   },
@@ -162,9 +167,7 @@ const store = new Vuex.Store({
     getAccountId: state => state.account_id,
     getContract: state => state.contract,
     getAllNFTs: state => state.allNFTs,
-    getNFTforModification: (state) => {
-      return state.NFT
-    }
+    getNFTforModification: (state) => state.NFT
   }
 })
 
diff --git a/src/views/ChooseNFT.vue b/src/views/ChooseNFT.vue
index 2e455aa..5ec662f 100644
--- a/src/views/ChooseNFT.vue
+++ b/src/views/ChooseNFT.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="page">
-    <div v-if="getNftsAreLoading" class="loading-container">
+    <!-- if minting, applying and deploying to ipfs show prelaoder -->
+    <div v-if="getNftsAreLoading || [0, 2, 3, 4].includes(getStatus)" class="loading-container">
       <spinner :size="92" color="#000" />
+      <h1 class="h1--no-logo">{{ statusText }}</h1>
     </div>
     <main v-else>
       <h1>Create new NFT</h1>
@@ -24,7 +26,10 @@
           class="input form-nft__input"
           v-model="nftObj.metadata.media"
         >
-        <button class="btn-main" type="submit">Submit</button>
+        <button
+          class="btn-main"
+          type="submit"
+        >Submit</button>
       </form>
       <h1 class="h1--no-logo">Choose NFT and apply effect</h1>
       <div class="nft-cards">
@@ -40,7 +45,10 @@
       </div>
       <h1 class="h1--no-logo">NFT effects</h1>
 
-      <div class="effect-cards">
+      <div
+        class="effect-cards"
+        v-if="getEffects && getEffects.length"
+      >
         <effect-cards
           @cardClicked="chooseEffect"
           content-type="video"
@@ -50,6 +58,10 @@
         ></effect-cards>
         <button class="btn-main" @click="handleMint">Submit</button>
       </div>
+      <div v-else class="loading-container">
+        <spinner :size="92" color="#000" />
+        <h1 class="h1--no-logo">{{ statusText }}</h1>
+      </div>
     </main>
   </div>
 </template>
@@ -57,7 +69,8 @@
 <script>
 import EffectCards from "../components/EffectCards/EffectCards.vue"
 import Spinner from "../components/Spinner"
-import { mapGetters } from "vuex"
+import { mapGetters, mapActions } from "vuex"
+import { Status } from "../store"
 
 
 export default {
@@ -74,6 +87,7 @@ export default {
 
   data() {
     return {
+      Status,
       nftObj: {
         metadata: {
           title: 'NFT token 2 title',
@@ -96,7 +110,8 @@ export default {
       'getEffects',
       'getDeployedPictureMeta',
       'getAllNFTs',
-      'getNftsAreLoading'
+      'getNftsAreLoading',
+      'getStatus',
     ]),
     accountId() {
       return window.accountId
@@ -104,9 +119,48 @@ export default {
     cardClass() {
       return (idx) => this.nftObj.token_id.indexOf(idx) !== -1
     },
+    statusText() {
+      switch (this.getStatus) {
+      case this.Status.Approving:
+        return "Redirecting to Approve NFT"
+      case this.Status.Applying:
+        return "Applying the chosen effect..."
+      case this.Status.DeployingToIPFS:
+        return "Uploading the result to IPFS..."
+      case this.Status.Minting:
+        return "NFT Minting..."
+      case this.Status.Minted:
+        return "NFT successfully Minted!"
+      default:
+        return ""
+      }
+    },
+  },
+
+  watch: {
+    getStatus: {
+      handler(value) {
+        this.$notify({
+          group: 'foo',
+          type: value < 5 ? 'info' : 'success',
+          title: 'Status:',
+          text: this.statusText,
+          duration: 5000,
+        })
+      },
+    },
   },
 
   methods: {
+    ...mapActions([
+      'setResult',
+      'passNFT',
+      'setDeployedPictureMeta',
+      'setEffectChoice',
+      'createNewRandomNFT',
+      'createNewUsualNFT',
+    ]),
+    // choosing NFT for applying effects
     chooseNFT(item) {
       console.log(item, 'item')
       const index = this.nftObj.token_id.findIndex((_) => _ === item.token_id)
@@ -123,7 +177,7 @@ export default {
         this.nftObj.token_id.push(item.token_id)
       }
       
-      this.$store.dispatch('passNFT', item.metadata)
+      this.passNFT(item.metadata)
 
       // Currently approving multiple NFTs is problem, for this need smart contract, bundle approve + bundle sending
 
@@ -133,10 +187,11 @@ export default {
       //   this.nftObj.token_id.push(tokenId)
       // }
     },
+    // minting NFT with NEW effects
     async handleMint() {
       // this.$router.push({'name': 'Minting'})
-      await this.$store.dispatch('setResult')
-      await this.$store.dispatch('setDeployedPictureMeta')
+      await this.setResult()
+      await this.setDeployedPictureMeta()
       const obj = {
         token_id: `token-${Date.now()}`,
         metadata: {
@@ -154,22 +209,22 @@ export default {
     },
     async chooseEffect(id) {
       if (this.getEffectChoice && id === this.getEffectChoice) {
-        this.$store.dispatch('setEffectChoice', null)
+        this.setEffectChoice(null)
       } else {
-        this.$store.dispatch('setEffectChoice', id)
+        this.setEffectChoice(id)
       }
       await this.sleep(5)
     },
     createNFTWithEffect(obj) {
       console.log(obj, 'createNft')
-      this.$store.dispatch('createNewRandomNFT', {
+      this.createNewRandomNFT({
         token_id: obj.token_id,
         metadata: obj.metadata,
       })
     },
     createNewNFT() {
       console.log('createNft')
-      this.$store.dispatch('createNewUsualNFT', {
+      this.createNewUsualNFT({
         token_id: `token-${Date.now()}`,
         metadata: this.nftObj.metadata,
       })
diff --git a/src/views/SendNFT.vue b/src/views/SendNFT.vue
index 95ccf63..36de8d9 100644
--- a/src/views/SendNFT.vue
+++ b/src/views/SendNFT.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="page">
-    <div v-if="getNftsAreLoading" class="loading-container">
+    <div v-if="getNftsAreLoading || getStatus === 1" class="loading-container">
       <spinner :size="92" color="#000" />
+      <h1 class="h1--no-logo">{{ statusText }}</h1>
     </div>
     <main v-else>
       <transition name="fade">
@@ -17,7 +18,11 @@
               v-model="nftObj.receiver_id"
             >
             <div class="form-nft__bottom">
-              <button class="btn-main" @click="approveNFTHandler">Approve</button>
+              <button
+                class="btn-main"
+                @click="approveNFTHandler"
+                :disabled="!isNFTApproved"
+              >Approve</button>
               <button
                 class="btn-main"
                 type="submit"
@@ -46,7 +51,8 @@
 
 <script>
 import Spinner from "../components/Spinner"
-import { mapGetters } from "vuex"
+import { mapGetters, mapActions } from "vuex"
+import { Status } from "../store"
 
 export default {
   name: "SendNFT",
@@ -57,6 +63,7 @@ export default {
 
   data() {
     return {
+      Status,
       nftObj: {
         receiver_id: 'near_testing2.testnet',
         token_id: [],
@@ -67,7 +74,8 @@ export default {
   computed: {
     ...mapGetters([
       'getAllNFTs',
-      'getNftsAreLoading'
+      'getNftsAreLoading',
+      'getStatus',
     ]),
     cardClass() {
       return (idx) => this.nftObj.token_id.indexOf(idx) !== -1
@@ -79,9 +87,42 @@ export default {
         return getKeyLength === 0
       })
     },
+    statusText() {
+      switch (this.getStatus) {
+      case this.Status.Approving:
+        return "Redirecting to Approve NFT Transaction"
+      case this.Status.Applying:
+        return "Applying the chosen effect..."
+      case this.Status.DeployingToIPFS:
+        return "Uploading the result to IPFS..."
+      case this.Status.Minting:
+        return "Minting..."
+      case this.Status.Minted:
+        return "Minted!"
+      case this.Status.Approved:
+        return "NFT transaction Succeded"
+      default:
+        return ""
+      }
+    },
+  },
+
+  watch: {
+    getStatus: {
+      handler(value) {
+        this.$notify({
+          group: 'foo',
+          type: value < 5 ? 'info' : 'success',
+          title: 'Status:',
+          text: `${this.statusText}`,
+          duration: 5000,
+        })
+      },
+    },
   },
 
   methods: {
+    ...mapActions(['setNFTApproveId', 'sendNFTByToken']),
     chooseNFT(tokenId) {
       const index = this.nftObj.token_id.findIndex((_) => _ === tokenId)
 
@@ -104,10 +145,10 @@ export default {
     },
     approveNFTHandler() {
       console.log('approve')
-      this.$store.dispatch('setNFTApproveId', this.nftObj.token_id[0])
+      this.setNFTApproveId(this.nftObj.token_id[0])
     },
     sendNFTHandler() {
-      this.$store.dispatch('sendNFTByToken', { receiver: this.nftObj.receiver_id , token_id: this.nftObj.token_id[0]})
+      this.sendNFTByToken({ receiver: this.nftObj.receiver_id , token_id: this.nftObj.token_id[0]})
     }
   },
 }