diff --git a/package-lock.json b/package-lock.json
index 00ec2acae..6a463f0a5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -977,7 +977,6 @@
       "version": "7.8.4",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz",
       "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==",
-      "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.2"
       }
@@ -4238,11 +4237,199 @@
       "integrity": "sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==",
       "dev": true
     },
+    "aeproject-config": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/aeproject-config/-/aeproject-config-2.2.0.tgz",
+      "integrity": "sha512-3ZPe714tNZCvGn8//pjecbnamegnyT0ANkRLhgidseE9wDMmL07Ln6wS9E17sERF3R6tSVXgcUXhVx/7zU4vLQ=="
+    },
+    "aeproject-lib": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/aeproject-lib/-/aeproject-lib-2.2.0.tgz",
+      "integrity": "sha512-M4Dfh7ypiw7904c331BYR+6/YqfZwNI3RUk7mvZZcsq8Erde1pbwJsRQwpz84qiWzg1/xRInzcFpWeOGlC/Z0A==",
+      "requires": {
+        "typescript": "^3.5.2"
+      }
+    },
+    "aeproject-logger": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/aeproject-logger/-/aeproject-logger-2.2.0.tgz",
+      "integrity": "sha512-JcETDIHRUCSThxDzZuDCNYkdbVFQx4W9V6xfBaRLduG8Nb4ykQQ2kzJlSnx3dcXMDbyFH4ra0KAwyuPSjGQFiw==",
+      "requires": {
+        "chai-as-promised": "^7.1.1",
+        "fs-extra": "^7.0.1"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        }
+      }
+    },
+    "aeproject-utils": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/aeproject-utils/-/aeproject-utils-2.2.0.tgz",
+      "integrity": "sha512-E9OfvWGeT5z0IhzjgBv1XkZjiGwzBR1i53I3uyImESn5WvbTiPeNFbAdcSupYmwj2GPVga8uneV+QLjpE/jO2A==",
+      "requires": {
+        "@aeternity/aepp-sdk": "7.0.0",
+        "aeproject-config": "^2.2.0",
+        "axios": "^0.19.0",
+        "chalk": "^2.4.1",
+        "cli-table": "^0.3.1",
+        "esm": "^3.0.77",
+        "fs-extra": "^7.0.1",
+        "moment": "^2.23.0",
+        "node-dir": "^0.1.17",
+        "path": "^0.12.7",
+        "promisify-child-process": "^2.1.2"
+      },
+      "dependencies": {
+        "@aeternity/aepp-sdk": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/@aeternity/aepp-sdk/-/aepp-sdk-7.0.0.tgz",
+          "integrity": "sha512-4b/guVWk190nWu5ISKKjfdqRQ67vSqLMV0Ss3RxKQtGqJj5pqGXik9EJyWhBurhpuFX4ZcyLSb+FwVgptXWS5w==",
+          "requires": {
+            "@aeternity/bip39": "^0.1.0",
+            "@stamp/it": "^1.0.3",
+            "@stamp/required": "^1.0.1",
+            "aes-js": "^3.1.1",
+            "axios": "^0.19.0",
+            "bignumber.js": "^9.0.0",
+            "bip32-path": "^0.4.2",
+            "blakejs": "^1.1.0",
+            "bs58check": "^2.1.1",
+            "ed2curve": "^0.3.0",
+            "joi-browser": "^13.4.0",
+            "libsodium-wrappers-sumo": "0.7.6",
+            "ramda": "^0.26.1",
+            "rlp": "2.2.4",
+            "serialize-javascript": "^2.1.2",
+            "sha.js": "^2.4.11",
+            "tweetnacl": "^1.0.0",
+            "tweetnacl-auth": "^1.0.1",
+            "uuid": "^3.3.2",
+            "websocket": "^1.0.26"
+          }
+        },
+        "fs-extra": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "ramda": {
+          "version": "0.26.1",
+          "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz",
+          "integrity": "sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ=="
+        },
+        "rlp": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.2.4.tgz",
+          "integrity": "sha512-fdq2yYCWpAQBhwkZv+Z8o/Z4sPmYm1CUq6P7n6lVTOdb949CnqA0sndXal5C1NleSVSZm6q5F3iEbauyVln/iw==",
+          "requires": {
+            "bn.js": "^4.11.1"
+          }
+        }
+      }
+    },
     "aes-js": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.1.2.tgz",
       "integrity": "sha512-e5pEa2kBnBOgR4Y/p20pskXI74UEz7de8ZGVo58asOtvSVG5YAbJeELPZxOmt+Bnz3rX753YKhfIn4X4l1PPRQ=="
     },
+    "aeternity-fungible-token": {
+      "version": "github:mradkov/aeternity-fungible-token#f0632e890bbd2683f1fd757a979fe167d6d5654d",
+      "from": "github:mradkov/aeternity-fungible-token",
+      "requires": {
+        "@aeternity/aepp-sdk": "6.1.3",
+        "aeproject-lib": "2.1.0",
+        "blake2b": "^2.1.3"
+      },
+      "dependencies": {
+        "@aeternity/aepp-sdk": {
+          "version": "6.1.3",
+          "resolved": "https://registry.npmjs.org/@aeternity/aepp-sdk/-/aepp-sdk-6.1.3.tgz",
+          "integrity": "sha512-I8rJEMaHEvkcWEvMWJp4qGpqTlhSUjdPWiN/6vfuDN+qwpZndLNW74vwnfDKHm7LTxDhTLVq7/Y4xcPTSo8h1A==",
+          "requires": {
+            "@aeternity/bip39": "^0.1.0",
+            "@babel/runtime": "^7.7.2",
+            "@stamp/it": "^1.0.3",
+            "@stamp/required": "^1.0.1",
+            "aes-js": "^3.1.1",
+            "axios": "^0.19.0",
+            "bignumber.js": "^9.0.0",
+            "bip32-path": "^0.4.2",
+            "blakejs": "^1.1.0",
+            "bs58check": "^2.1.1",
+            "commander": "^4.0.0",
+            "ed2curve": "^0.2.1",
+            "joi-browser": "^13.4.0",
+            "libsodium-wrappers-sumo": "0.7.6",
+            "ramda": "^0.26.1",
+            "rlp": "2.2.4",
+            "serialize-javascript": "^2.1.2",
+            "sha.js": "^2.4.11",
+            "tweetnacl": "^1.0.0",
+            "tweetnacl-auth": "^1.0.1",
+            "uuid": "^3.3.2",
+            "websocket": "^1.0.26"
+          }
+        },
+        "aeproject-lib": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/aeproject-lib/-/aeproject-lib-2.1.0.tgz",
+          "integrity": "sha512-9JfAEpxMVn+XiFtL7ftXXjSR6RxzE+IUm0QmtwI8PLMaUva+ZBu6yxiVbm3rMXI5dfj3+vBY7jcwrVgOyj4/tA==",
+          "requires": {
+            "aeproject-config": "^2.1.0",
+            "aeproject-logger": "^2.1.0",
+            "aeproject-utils": "^2.1.0",
+            "typescript": "^3.5.2"
+          }
+        },
+        "commander": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+          "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="
+        },
+        "ed2curve": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/ed2curve/-/ed2curve-0.2.1.tgz",
+          "integrity": "sha1-Iuaqo1aePE2/Tu+ilhLsMp5YGQw=",
+          "requires": {
+            "tweetnacl": "0.x.x"
+          },
+          "dependencies": {
+            "tweetnacl": {
+              "version": "0.14.5",
+              "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+              "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+            }
+          }
+        },
+        "ramda": {
+          "version": "0.26.1",
+          "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz",
+          "integrity": "sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ=="
+        },
+        "rlp": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.2.4.tgz",
+          "integrity": "sha512-fdq2yYCWpAQBhwkZv+Z8o/Z4sPmYm1CUq6P7n6lVTOdb949CnqA0sndXal5C1NleSVSZm6q5F3iEbauyVln/iw==",
+          "requires": {
+            "bn.js": "^4.11.1"
+          }
+        }
+      }
+    },
     "ajv": {
       "version": "6.11.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz",
@@ -4307,7 +4494,6 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
       "requires": {
         "color-convert": "^1.9.0"
       }
@@ -4519,6 +4705,11 @@
       "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
       "dev": true
     },
+    "assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw=="
+    },
     "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -4959,8 +5150,7 @@
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
     "base": {
       "version": "0.11.2",
@@ -5130,6 +5320,23 @@
         }
       }
     },
+    "blake2b": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/blake2b/-/blake2b-2.1.3.tgz",
+      "integrity": "sha512-pkDss4xFVbMb4270aCyGD3qLv92314Et+FsKzilCLxDz5DuZ2/1g3w4nmBbu6nKApPspnjG7JcwTjGZnduB1yg==",
+      "requires": {
+        "blake2b-wasm": "^1.1.0",
+        "nanoassert": "^1.0.0"
+      }
+    },
+    "blake2b-wasm": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/blake2b-wasm/-/blake2b-wasm-1.1.7.tgz",
+      "integrity": "sha512-oFIHvXhlz/DUgF0kq5B1CqxIDjIJwh9iDeUUGQUcvgiGz7Wdw03McEO7CfLBy7QKGdsydcMCgO9jFNBAFCtFcA==",
+      "requires": {
+        "nanoassert": "^1.0.0"
+      }
+    },
     "blakejs": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.1.0.tgz",
@@ -5233,7 +5440,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -5760,11 +5966,31 @@
       "integrity": "sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw==",
       "dev": true
     },
+    "chai": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
+      "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
+      "requires": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.2",
+        "deep-eql": "^3.0.1",
+        "get-func-name": "^2.0.0",
+        "pathval": "^1.1.0",
+        "type-detect": "^4.0.5"
+      }
+    },
+    "chai-as-promised": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz",
+      "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==",
+      "requires": {
+        "check-error": "^1.0.2"
+      }
+    },
     "chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
       "requires": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -5801,6 +6027,11 @@
       "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
       "dev": true
     },
+    "check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII="
+    },
     "check-more-types": {
       "version": "2.24.0",
       "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz",
@@ -6119,6 +6350,21 @@
       "integrity": "sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw=",
       "dev": true
     },
+    "cli-table": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
+      "integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=",
+      "requires": {
+        "colors": "1.0.3"
+      },
+      "dependencies": {
+        "colors": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+          "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs="
+        }
+      }
+    },
     "cli-truncate": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz",
@@ -6291,7 +6537,6 @@
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
       "requires": {
         "color-name": "1.1.3"
       }
@@ -6299,8 +6544,7 @@
     "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
     "color-string": {
       "version": "1.5.3",
@@ -6401,8 +6645,7 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "concat-stream": {
       "version": "1.6.2",
@@ -7196,6 +7439,14 @@
         "mimic-response": "^2.0.0"
       }
     },
+    "deep-eql": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
+      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+      "requires": {
+        "type-detect": "^4.0.0"
+      }
+    },
     "deep-equal": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
@@ -7844,8 +8095,7 @@
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
       "version": "1.14.1",
@@ -8631,6 +8881,11 @@
       "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
       "dev": true
     },
+    "esm": {
+      "version": "3.2.25",
+      "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz",
+      "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA=="
+    },
     "espree": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
@@ -9815,6 +10070,11 @@
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true
     },
+    "get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE="
+    },
     "get-stdin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
@@ -9992,8 +10252,7 @@
     "graceful-fs": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
-      "dev": true
+      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
     },
     "grapheme-splitter": {
       "version": "1.0.4",
@@ -10074,8 +10333,7 @@
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
     "has-symbols": {
       "version": "1.0.1",
@@ -12241,7 +12499,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "dev": true,
       "requires": {
         "graceful-fs": "^4.1.6"
       }
@@ -13182,7 +13439,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -13315,8 +13571,7 @@
     "moment": {
       "version": "2.24.0",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
-      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==",
-      "dev": true
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
     },
     "move-concurrently": {
       "version": "1.0.1",
@@ -13380,6 +13635,11 @@
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
       "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
     },
+    "nanoassert": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz",
+      "integrity": "sha1-TzFS4JVA/eKMdvRLGbvNHVpCR40="
+    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -13462,6 +13722,14 @@
         "lodash": "^4.17.15"
       }
     },
+    "node-dir": {
+      "version": "0.1.17",
+      "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
+      "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=",
+      "requires": {
+        "minimatch": "^3.0.2"
+      }
+    },
     "node-forge": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
@@ -14420,6 +14688,35 @@
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true
     },
+    "path": {
+      "version": "0.12.7",
+      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
+      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
+      "requires": {
+        "process": "^0.11.1",
+        "util": "^0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+        },
+        "process": {
+          "version": "0.11.10",
+          "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+          "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
+        },
+        "util": {
+          "version": "0.10.4",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+          "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+          "requires": {
+            "inherits": "2.0.3"
+          }
+        }
+      }
+    },
     "path-browserify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
@@ -14487,6 +14784,11 @@
         }
       }
     },
+    "pathval": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
+      "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA="
+    },
     "pbkdf2": {
       "version": "3.0.17",
       "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
@@ -15524,6 +15826,21 @@
       "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
       "dev": true
     },
+    "promisify-child-process": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/promisify-child-process/-/promisify-child-process-2.1.2.tgz",
+      "integrity": "sha512-j2BRwNaM7fUwrd67avtqSTRevQXZiqS+T4Ky3VVaQdvzkPpsTByBAv+ZyBxuXgV/eUrCe2qYrOZvPvd+sMryeg==",
+      "requires": {
+        "@types/node": "^10.11.3"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "10.17.26",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.26.tgz",
+          "integrity": "sha512-myMwkO2Cr82kirHY8uknNRHEVtn0wV3DTQfkrjx17jmkstDRZ24gNUdl8AHXVyVclTYI/bNjgTPTAWvWLqXqkw=="
+        }
+      }
+    },
     "prompts": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz",
@@ -15949,8 +16266,7 @@
     "regenerator-runtime": {
       "version": "0.13.3",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
-      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==",
-      "dev": true
+      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
     },
     "regenerator-transform": {
       "version": "0.14.1",
@@ -16722,8 +17038,7 @@
     "serialize-javascript": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
-      "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==",
-      "dev": true
+      "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ=="
     },
     "serve-index": {
       "version": "1.9.1",
@@ -18399,7 +18714,6 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
       "requires": {
         "has-flag": "^3.0.0"
       }
@@ -18825,6 +19139,52 @@
       "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=",
       "dev": true
     },
+    "tipping-contract": {
+      "version": "github:aeternity/tipping-contract#e89ff0e85583f3b621c54daa72f37313f127cba1",
+      "from": "github:aeternity/tipping-contract#develop",
+      "requires": {
+        "@aeternity/aepp-sdk": "^7.6.0",
+        "aeproject-config": "^2.2.0",
+        "aeproject-lib": "^2.2.0",
+        "aeproject-utils": "^2.2.0",
+        "bignumber.js": "^9.0.0",
+        "chai": "^4.2.0",
+        "esm": "^3.2.25"
+      },
+      "dependencies": {
+        "@aeternity/aepp-sdk": {
+          "version": "7.6.0",
+          "resolved": "https://registry.npmjs.org/@aeternity/aepp-sdk/-/aepp-sdk-7.6.0.tgz",
+          "integrity": "sha512-HC3SI+xTsM7VEBPZPTRh/CpW09nApsxip1Zrgr4JyCae1Oatjts1HB+kR21mLsT2NeM5CXxer1e0v1qsuXtVrQ==",
+          "requires": {
+            "@aeternity/bip39": "^0.1.0",
+            "@stamp/it": "^1.0.3",
+            "@stamp/required": "^1.0.1",
+            "aes-js": "^3.1.1",
+            "axios": "^0.19.0",
+            "bignumber.js": "^9.0.0",
+            "bip32-path": "^0.4.2",
+            "blakejs": "^1.1.0",
+            "bs58check": "^2.1.1",
+            "ed2curve": "^0.3.0",
+            "joi-browser": "^13.4.0",
+            "libsodium-wrappers-sumo": "0.7.6",
+            "ramda": "^0.27.0",
+            "rlp": "2.2.5",
+            "sha.js": "^2.4.11",
+            "tweetnacl": "^1.0.0",
+            "tweetnacl-auth": "^1.0.1",
+            "uuid": "^8.0.0",
+            "websocket": "^1.0.26"
+          }
+        },
+        "uuid": {
+          "version": "8.3.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz",
+          "integrity": "sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ=="
+        }
+      }
+    },
     "tmp": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz",
@@ -19131,6 +19491,11 @@
         "prelude-ls": "~1.1.2"
       }
     },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
+    },
     "type-fest": {
       "version": "0.13.1",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
@@ -19161,6 +19526,11 @@
         "is-typedarray": "^1.0.0"
       }
     },
+    "typescript": {
+      "version": "3.9.6",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.6.tgz",
+      "integrity": "sha512-Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw=="
+    },
     "uglify-js": {
       "version": "3.4.10",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
@@ -19344,8 +19714,7 @@
     "universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
     },
     "unpipe": {
       "version": "1.0.0",
@@ -19553,8 +19922,7 @@
     "uuid": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "dev": true
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
     },
     "v8-compile-cache": {
       "version": "2.0.3",
diff --git a/package.json b/package.json
index f9a1a5ccd..b0d29e061 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,8 @@
   },
   "license": "ISC",
   "dependencies": {
+    "tipping-contract": "github:aeternity/tipping-contract#develop",
+    "aeternity-fungible-token": "github:mradkov/aeternity-fungible-token",
     "@aeternity/aepp-sdk": "^7.7.0",
     "@aeternity/superhero-button": "^0.1.3",
     "@dicebear/avatars": "^4.2.5",
diff --git a/src/App.vue b/src/App.vue
index 33a5b17a9..8fa2d4d95 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -34,7 +34,9 @@
 <script>
 import { mapMutations, mapState, mapGetters } from 'vuex';
 import { detect } from 'detect-browser';
-import { client, initClient, scanForWallets } from './utils/aeternity';
+import {
+  client, initClient, scanForWallets, tokenBalance,
+} from './utils/aeternity';
 import Backend from './utils/backend';
 import { EventBus } from './utils/eventBus';
 import Util, { IS_MOBILE_DEVICE, supportedBrowsers } from './utils/util';
@@ -66,18 +68,20 @@ export default {
     ...mapMutations([
       'setLoggedInAccount', 'updateTopics', 'updateCurrencyRates',
       'setOracleState', 'addLoading', 'removeLoading', 'setChainNames', 'updateBalance',
-      'setGraylistedUrls', 'setVerifiedUrls', 'useSdkWallet', 'setPinnedItems',
+      'setGraylistedUrls', 'setTokenInfo', 'setVerifiedUrls', 'useSdkWallet', 'addTokenBalance',
+      'setPinnedItems',
     ]),
     async reloadData() {
       // await fetch
       const [
-        chainNames, oracleState, topics, verifiedUrls, graylistedUrls,
+        chainNames, oracleState, topics, verifiedUrls, graylistedUrls, tokenInfo,
       ] = await Promise.all([
         Backend.getCacheChainNames(),
         Backend.getOracleCache(),
         Backend.getTopicsCache(),
         Backend.getVerifiedUrls(),
         Backend.getGrayListedUrls(),
+        Backend.getTokenInfo(),
         this.$store.dispatch('backend/reloadStats'),
         this.$store.dispatch('backend/reloadPrices'),
       ]);
@@ -93,6 +97,8 @@ export default {
       this.setOracleState(oracleState);
       this.setGraylistedUrls(graylistedUrls);
       this.setVerifiedUrls(verifiedUrls);
+      this.setTokenInfo(tokenInfo);
+      if (this.address) this.loadTokenBalances(this.address);
     },
     async fetchUserData() {
       await Promise.all([
@@ -123,9 +129,18 @@ export default {
         address,
         balance: Util.atomsToAe(balance).toFixed(2),
       });
+
+      // trigger run async in background
+      this.loadTokenBalances(address);
+
       this.fetchUserData();
       this.removeLoading('wallet');
     },
+    async loadTokenBalances(address) {
+      const tokens = await Backend.getTokenBalances(address);
+      await Promise.all(Object.entries(tokens).map(async ([token]) => this
+        .addTokenBalance({ token, balance: await tokenBalance(token, address) })));
+    },
   },
 };
 </script>
diff --git a/src/components/AeAmount.vue b/src/components/AeAmount.vue
index b1a4458f4..c5610c8f6 100644
--- a/src/components/AeAmount.vue
+++ b/src/components/AeAmount.vue
@@ -2,12 +2,13 @@
   <span class="ae-amount">
     <template>{{ roundedAmount }}</template>
     <!--eslint-disable-next-line vue-i18n/no-raw-text-->
-    <span class="ae">AE</span>
+    <span class="ae">{{ tokenSymbol || 'AE' }}</span>
   </span>
 </template>
 
 <script>
 import BigNumber from 'bignumber.js';
+import { mapState } from 'vuex';
 import util from '../utils/util';
 
 export default {
@@ -15,11 +16,24 @@ export default {
     amount: { type: [String, Number], default: 0 },
     round: { type: Number, default: 2 },
     aettos: { type: Boolean, required: false },
+    token: { type: String, default: null },
   },
   computed: {
+    ...mapState({
+      amountTokenInfo({ tokenInfo }) {
+        return this.token ? tokenInfo[this.token] : null;
+      },
+    }),
+    tokenSymbol() {
+      return this.amountTokenInfo ? this.amountTokenInfo.symbol : null;
+    },
     roundedAmount() {
-      return new BigNumber(this.aettos ? util.atomsToAe(this.amount) : this.amount)
-        .toFixed(this.round);
+      const aeOrAettos = this.aettos ? util.atomsToAe(this.amount) : this.amount;
+      const aeTokenAmount = this.amountTokenInfo
+        ? util.shiftDecimalPlaces(this.amount, -this.amountTokenInfo.decimals)
+        : aeOrAettos;
+
+      return new BigNumber(aeTokenAmount).toFixed(this.round);
     },
   },
 };
diff --git a/src/components/AeAmountFiat.vue b/src/components/AeAmountFiat.vue
index 1d6d90b0e..b542345de 100644
--- a/src/components/AeAmountFiat.vue
+++ b/src/components/AeAmountFiat.vue
@@ -1,7 +1,13 @@
 <template>
   <span class="ae-amount-fiat">
-    <AeAmount v-bind="$attrs" />
-    &nbsp;<FiatValue v-bind="$attrs" />
+    <AeAmount
+      v-bind="$attrs"
+      :token="token"
+    />
+    &nbsp;<FiatValue
+      v-if="!token"
+      v-bind="$attrs"
+    />
   </span>
 </template>
 
@@ -14,5 +20,8 @@ export default {
     FiatValue,
     AeAmount,
   },
+  props: {
+    token: { type: String, default: null },
+  },
 };
 </script>
diff --git a/src/components/AeInputAmount.vue b/src/components/AeInputAmount.vue
index f446af1c9..78c2198a5 100644
--- a/src/components/AeInputAmount.vue
+++ b/src/components/AeInputAmount.vue
@@ -8,19 +8,37 @@
       :min="min"
       :step="step"
       :placeholder="$t('amount')"
-      class="form-control"
+      class="form-control input-amount"
       aria-label="Default"
       aria-describedby="inputGroup-sizing-mn"
       :disabled="disabled"
       @input="$emit('input', $event.target.value)"
     >
-    <div class="input-group-append">
+    <div
+      v-if="tokenTipable"
+      class="input-group-append"
+    >
+      <Dropdown
+        :options="selectTokenOptions"
+        :selected="selectedToken"
+        :method="selectToken"
+      />
+    </div>
+    <div
+      v-if="selectedToken === 'native'"
+      class="input-group-append"
+    >
       <span
         class="input-group-text append__ae text-ellipsis"
         :title="value"
       >
-        <!--eslint-disable-next-line vue-i18n/no-raw-text-->
-        <span class="ae">AE</span>&nbsp;
+        <!-- eslint-disable vue-i18n/no-raw-text -->
+        <span
+          v-if="!tokenTipable"
+          class="ae"
+        >
+          AE
+        </span>&nbsp;
         <FiatValue
           display-symbol
           :amount="value.toString()"
@@ -31,17 +49,42 @@
 </template>
 
 <script>
+import { mapState } from 'vuex';
+import { hasV2ContractAddress } from '@/utils/aeternity';
 import FiatValue from './FiatValue.vue';
+import Dropdown from './Dropdown.vue';
 
 export default {
   components: {
-    FiatValue,
+    Dropdown, FiatValue,
   },
   props: {
     min: { type: Number, default: 0 },
     step: { type: Number, default: 0.01 },
     value: { type: [Number, String], required: true },
+    selectTokenF: { type: Function, required: true },
     disabled: { type: Boolean },
+    notTokenTipable: { type: Boolean },
+  },
+  data: () => ({
+    selectedToken: 'native',
+  }),
+  computed: {
+    ...mapState({
+      selectTokenOptions: ({ tokenBalances, tokenInfo }) => [
+        { text: 'AE', value: 'native' },
+        ...tokenBalances.map(({ token }) => ({ text: tokenInfo[token].symbol, value: token })),
+      ],
+    }),
+    tokenTipable() {
+      return !this.notTokenTipable && hasV2ContractAddress();
+    },
+  },
+  methods: {
+    selectToken(selected) {
+      this.selectedToken = selected;
+      this.selectTokenF(this.selectedToken);
+    },
   },
 };
 </script>
diff --git a/src/components/Dropdown.vue b/src/components/Dropdown.vue
index 1c72ce50c..be006a641 100644
--- a/src/components/Dropdown.vue
+++ b/src/components/Dropdown.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="dropdown">
-    <div class="display">
+    <div
+      class="display"
+      :class="{ rounded }"
+    >
       <div
         class="text-ellipsis"
         :title="displayValue"
@@ -30,6 +33,7 @@ export default {
     options: { type: Array, default: null },
     selected: { type: String, default: '' },
     method: { type: Function, required: true },
+    rounded: Boolean,
   },
   data() {
     return {
@@ -50,7 +54,6 @@ export default {
 .dropdown {
   display: inline-block;
   position: relative;
-  min-width: 6rem;
 
   .display {
     text-align: center;
@@ -59,12 +62,15 @@ export default {
     font-size: 0.75rem;
     background-color: $light_color;
     padding: 0.6rem 2.2rem 0.6rem 0.85rem;
-    border-radius: 0.25rem;
     line-height: 0.9rem;
     min-height: 2.2rem;
     display: flex;
     align-items: center;
 
+    .rounded {
+      border-radius: 0.25rem;
+    }
+
     img {
       position: absolute;
       right: 0.85rem;
diff --git a/src/components/SendComment.vue b/src/components/SendComment.vue
index 91d6dfd9f..55a325a17 100644
--- a/src/components/SendComment.vue
+++ b/src/components/SendComment.vue
@@ -24,7 +24,7 @@ import Backend from '../utils/backend';
 export default {
   components: { MessageInput },
   props: {
-    tipId: { type: [Number, String], required: true },
+    tipId: { type: String, required: true },
     parentId: { type: [Number, String], default: undefined },
   },
   data: () => ({
diff --git a/src/components/TipInput.vue b/src/components/TipInput.vue
index d80238f82..3d7dc8077 100644
--- a/src/components/TipInput.vue
+++ b/src/components/TipInput.vue
@@ -9,11 +9,20 @@
     >
       <img :src="iconTip">
       <template v-if="!userAddress">
-        &nbsp;<AeAmountFiat :amount="tipUrlStats.amount" />
+        <AeAmountFiat
+          v-if="!isTokenAndZeroAeTip"
+          :amount="tip ? tipUrlStats.amount_ae || tip.total_amount_ae : '0'"
+        />
+        <AeAmountFiat
+          v-for="tokenTip in tipUrlStats.token_total_amount || tip.token_total_amount"
+          :key="tokenTip.token"
+          :amount="tokenTip.amount"
+          :token="tokenTip.token"
+        />
       </template>
     </Component>
     <Modal
-      v-if="showModal"
+      v-if="showModal && tip.url"
       @close="hideModal"
     >
       <Loading v-if="showLoading" />
@@ -36,7 +45,10 @@
             >
           </div>
           <div class="not-bootstrap-row">
-            <AeInputAmount v-model="value" />
+            <AeInputAmount
+              v-model="inputValue"
+              :select-token-f="(token) => inputToken = token"
+            />
             <AeButton :disabled="!isValid">
               {{ tip ? $t('retip') : $t('tip') }}
             </AeButton>
@@ -49,12 +61,13 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex';
+import { retip, tip } from '@/utils/aeternity';
+import { EventBus } from '@/utils/eventBus';
+import BigNumber from 'bignumber.js';
 import iconTip from '../assets/iconTip.svg';
 import iconTipUser from '../assets/iconTipUser.svg';
 import iconTipped from '../assets/iconTipped.svg';
-import { tip, retip } from '../utils/aeternity';
 import Backend from '../utils/backend';
-import { EventBus } from '../utils/eventBus';
 import util, { createDeepLinkUrl } from '../utils/util';
 import AeInputAmount from './AeInputAmount.vue';
 import Loading from './Loading.vue';
@@ -76,14 +89,15 @@ export default {
     comment: { type: Object, default: null },
   },
   data: () => ({
-    value: 0,
+    inputValue: 0,
+    inputToken: 'native',
     showModal: false,
     showLoading: false,
     error: false,
     message: '',
   }),
   computed: {
-    ...mapState(['useSdkWallet', 'address']),
+    ...mapState(['useSdkWallet', 'address', 'tokenInfo']),
     ...mapGetters('backend', ['minTipAmount']),
     ...mapState('backend', {
       tipUrlStats({ stats }) {
@@ -91,10 +105,19 @@ export default {
         if (!urlStats) return {};
         return {
           isTipped: urlStats.senders.includes(this.address),
-          amount: urlStats.total_amount,
+          amount_ae: urlStats.total_amount_ae,
+          token_total_amount: urlStats.token_total_amount,
         };
       },
     }),
+    isTokenAndZeroAeTip() {
+      return new BigNumber(this.tipUrlStats.amount_ae || '0').isZero()
+        && new BigNumber(this.tip.total_amount_ae).isZero()
+        && !!this.tip.token;
+    },
+    isTokenTipable() {
+      return this.tip.id.split('_')[1] === 'v2';
+    },
     tipUrl() {
       if (this.comment) {
         return `https://superhero.com/tip/${this.comment.tipId}/comment/${this.comment.id}`;
@@ -109,7 +132,7 @@ export default {
         ? { type: 'retip', id: this.tip.id } : { type: 'tip', url: this.tipUrl });
     },
     isValid() {
-      return (this.tip || this.message.trim().length > 0) && this.value > this.minTipAmount;
+      return (this.tip || this.message.trim().length > 0) && this.inputValue > this.minTipAmount;
     },
     iconTip() {
       if (this.userAddress) return iconTipUser;
@@ -128,9 +151,15 @@ export default {
       if (!this.isValid) return;
       this.showLoading = true;
       try {
-        const amount = util.aeToAtoms(this.value);
-        if (this.tip) await retip(this.tip.id, amount);
-        else await tip(this.tipUrl, this.message, amount);
+        const amount = util.shiftDecimalPlaces(this.inputValue,
+          this.inputToken !== 'native' ? this.tokenInfo[this.inputToken].decimals : 18).toFixed();
+
+        if (this.tipUrl !== this.tip.url) {
+          await tip(this.tipUrl, this.message, amount, this.inputToken);
+        } else {
+          await retip(this.tip.contractId, this.tip.id, amount, this.inputToken);
+        }
+
         if (!this.userAddress) {
           await Backend.cacheInvalidateTips();
           EventBus.$emit('reloadData');
@@ -146,8 +175,9 @@ export default {
     hideModal() {
       this.showModal = false;
       this.message = '';
-      this.value = 0;
+      this.inputValue = 0;
       this.error = false;
+      this.inputToken = 'native';
     },
   },
 };
diff --git a/src/components/__tests__/AeAmount.js b/src/components/__tests__/AeAmount.js
index dec8df146..d911fc21f 100644
--- a/src/components/__tests__/AeAmount.js
+++ b/src/components/__tests__/AeAmount.js
@@ -32,6 +32,9 @@ describe('AeAmount', () => {
   },
   ].forEach((test) => it(test.name, () => {
     const wrapper = shallowMount(AeAmount, {
+      computed: {
+        amountTokenInfo: () => null,
+      },
       propsData: {
         amount: test.amount,
         round: test.round,
diff --git a/src/components/layout/Overview.vue b/src/components/layout/Overview.vue
index 150ecaad8..ff9e2f09d 100644
--- a/src/components/layout/Overview.vue
+++ b/src/components/layout/Overview.vue
@@ -25,7 +25,7 @@
     </div>
 
     <AeAmountFiat
-      :amount="stats.total_amount"
+      :amount="stats.total_amount_ae"
       class="value"
     />
     <div class="label">
@@ -33,7 +33,7 @@
     </div>
 
     <AeAmountFiat
-      :amount="stats.total_claimed_amount"
+      :amount="stats.total_claimed_amount_ae"
       class="value"
     />
     <div class="label">
diff --git a/src/components/layout/RightSectionTopics.vue b/src/components/layout/RightSectionTopics.vue
index 5aef1f80f..3306c0abc 100644
--- a/src/components/layout/RightSectionTopics.vue
+++ b/src/components/layout/RightSectionTopics.vue
@@ -21,7 +21,7 @@
           class="text-ellipsis"
           :topic="topic"
         />
-        <AeAmountFiat :amount="data.amount" />
+        <AeAmountFiat :amount="data.amount_ae" />
       </div>
     </div>
   </div>
diff --git a/src/components/layout/RightSectionWallet.vue b/src/components/layout/RightSectionWallet.vue
index 93b1da585..25ffe6002 100644
--- a/src/components/layout/RightSectionWallet.vue
+++ b/src/components/layout/RightSectionWallet.vue
@@ -27,6 +27,17 @@
           :options="currencyDropdownOptions"
           :method="updateCurrency"
           :selected="selectedCurrency"
+          rounded
+        />
+      </div>
+
+      <div v-if="hasV2ContractAddress()">
+        <AeAmount
+          v-for="tokenBalance in tokenBalances"
+          :key="tokenBalance.token"
+          class="not-bootstrap-row"
+          :amount="tokenBalance.balance"
+          :token="tokenBalance.token"
         />
       </div>
     </template>
@@ -36,6 +47,7 @@
 <script>
 import { mapState, mapMutations, mapGetters } from 'vuex';
 import BigNumber from 'bignumber.js';
+import { hasV2ContractAddress } from '@/utils/aeternity';
 import AeAmount from '../AeAmount.vue';
 import Dropdown from '../Dropdown.vue';
 import RightSectionTitle from './RightSectionTitle.vue';
@@ -48,7 +60,7 @@ export default {
   }),
   computed: {
     ...mapGetters(['isLoggedIn']),
-    ...mapState(['balance', 'address', 'useIframeWallet', 'selectedCurrency']),
+    ...mapState(['balance', 'address', 'useIframeWallet', 'selectedCurrency', 'tokenBalances']),
     ...mapState({
       currencyDropdownOptions({ backend: { prices }, balance }) {
         return Object.entries(prices).map(([currency, price]) => ({
@@ -61,7 +73,10 @@ export default {
       },
     }),
   },
-  methods: mapMutations(['updateCurrency']),
+  methods: {
+    ...mapMutations(['updateCurrency']),
+    hasV2ContractAddress() { return hasV2ContractAddress(); },
+  },
 };
 </script>
 
diff --git a/src/components/layout/sendTip/SendTip.vue b/src/components/layout/sendTip/SendTip.vue
index 0572081e7..efcebf6e5 100644
--- a/src/components/layout/sendTip/SendTip.vue
+++ b/src/components/layout/sendTip/SendTip.vue
@@ -9,14 +9,14 @@
           @click="toggleSendTip(false)"
         >
       </div>
-      <form @submit.prevent>
+      <form @submit.prevent="sendTip">
         <MessageInput
           v-model="sendTipForm.title"
           maxlength="280"
           :placeholder="$t('addMessage')"
         />
-        <div class="form-row">
-          <div class="form-group col-md-5 col-lg-6 col-sm-12 send-url">
+        <div class="mt-2 d-flex flex-row">
+          <div class="send-url">
             <UrlStatus
               :url="sendTipForm.url"
               @is-blacklisted-url="isBlacklistedUrl = $event"
@@ -28,19 +28,22 @@
               :placeholder="$t('components.layout.SendTip.EnterURL')"
             >
           </div>
-          <div class="col-lg-4 col-md-5 col-sm-12 send-amount">
-            <AeInputAmount v-model="sendTipForm.amount" />
+          <div class="send-amount">
+            <AeInputAmount
+              v-model="sendTipForm.amount"
+              :select-token-f="(token) => inputToken = token"
+            />
           </div>
-          <div class="col-lg-2 col-md-2 col-sm-12">
-            <div class="text-right">
-              <AeButton
-                :disabled="!canTip || !isSendTipDataValid"
-                :loading="sendingTip"
-                @click="sendTip"
-              >
+          <div class="text-right">
+            <AeButton
+              :disabled="!canTip || !isSendTipDataValid"
+              :loading="sendingTip"
+              @click="sendTip"
+            >
+              <span class="text-nowrap">
                 <IconDiamond /> {{ $t('tip') }}
-              </AeButton>
-            </div>
+              </span>
+            </AeButton>
           </div>
         </div>
       </form>
@@ -56,10 +59,10 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex';
+import { tip } from '@/utils/aeternity';
+import { EventBus } from '@/utils/eventBus';
 import AeInputAmount from '../../AeInputAmount.vue';
 import util, { createDeepLinkUrl } from '../../../utils/util';
-import { tip } from '../../../utils/aeternity';
-import { EventBus } from '../../../utils/eventBus';
 import Backend from '../../../utils/backend';
 import AeButton from '../../AeButton.vue';
 import IconDiamond from '../../../assets/iconDiamond.svg?icon-component';
@@ -76,6 +79,7 @@ export default {
   },
   data() {
     return {
+      inputToken: 'native',
       sendTipForm: {
         amount: 0,
         url: '',
@@ -89,7 +93,7 @@ export default {
   computed: {
     ...mapGetters(['isLoggedIn']),
     ...mapGetters('backend', ['minTipAmount']),
-    ...mapState(['loading']),
+    ...mapState(['loading', 'tokenInfo']),
     isSendTipDataValid() {
       const urlRegex = /(https?:\/\/)?([\w-])+\.{1}([a-zA-Z]{2,63})([/\w-]*)*\/?\??([^#\n\r]*)?#?([^\n\r]*)/g;
       // TODO: better validation
@@ -106,8 +110,10 @@ export default {
   methods: {
     async sendTip() {
       this.sendingTip = true;
-      const amount = util.aeToAtoms(this.sendTipForm.amount);
-      tip(this.sendTipForm.url, this.sendTipForm.title, amount)
+      const amount = util.shiftDecimalPlaces(this.sendTipForm.amount,
+        this.inputToken !== 'native' ? this.tokenInfo[this.inputToken].decimals : 18).toFixed();
+
+      tip(this.sendTipForm.url, this.sendTipForm.title, amount, this.inputToken)
         .then(async () => {
           await Backend.cacheInvalidateTips().catch(console.error);
           this.clearTipForm();
@@ -177,6 +183,30 @@ export default {
       }
     }
 
+    .send-url {
+      position: relative;
+      background-color: $buttons_background;
+      color: $standard_font_color;
+      border: 0.05rem solid $buttons_background;
+      border-radius: 0.25rem;
+      padding: 0;
+
+      input,
+      input:focus {
+        border: 0;
+      }
+
+      &:focus-within {
+        border-color: $secondary_color;
+      }
+
+      input {
+        background-color: $buttons_background;
+        color: $standard_font_color;
+        font-size: 0.75rem;
+      }
+    }
+
     .form-group {
       margin-bottom: 0;
 
@@ -224,6 +254,10 @@ export default {
 
     .url-input {
       padding-left: 2.1rem;
+
+      &:focus {
+        box-shadow: none;
+      }
     }
 
     .closed-view.message-input {
diff --git a/src/components/tipRecords/TipRecord.vue b/src/components/tipRecords/TipRecord.vue
index 672879355..be1ccccf5 100644
--- a/src/components/tipRecords/TipRecord.vue
+++ b/src/components/tipRecords/TipRecord.vue
@@ -83,31 +83,34 @@
           >
         </div>
       </div>
-      <div
-        v-else
-        class="tip__article"
-      >
-        <div class="tip__article__content">
-          <div
-            class="site__url"
+      <div v-else>
+        <template v-if="tip.url">
+          <a
+            :href="tip.url"
             :title="tip.url"
-          >
-            <a
-              class="text-ellipsis"
-              target="_blank"
-              :href="tip.url"
-              @click.stop
-            >
-              <ExternalLink />
-              <span class="text-ellipsis">{{ tip.url }}</span>
-            </a>
-          </div>
-          <div
-            class="tip__amount"
+            class="text-ellipsis"
+            target="_blank"
             @click.stop
           >
-            <TipInput :tip="tip" />
-          </div>
+            {{ tip.url }}
+          </a>
+        </template>
+        <div
+          v-if="tip.receiver"
+          class="tip__author"
+          :title="tip.receiver"
+          @click.stop
+        >
+          <TipInput :tip="tip" />
+          <RouterLink :to="{ name: 'user-profile', params: { address: tip.receiver } }">
+            <Avatar :address="tip.receiver" />
+            <div class="tip__author_name">
+              <span class="chain__name">
+                {{ tip.chainName }}
+              </span>
+              <span class="address">{{ tip.receiver }}</span>
+            </div>
+          </RouterLink>
         </div>
       </div>
       <div class="tip__footer">
@@ -242,6 +245,67 @@ export default {
   .tip__body {
     padding-top: 1rem;
     width: 100%;
+  }
+
+  .tip__author {
+    align-items: center;
+    color: $light_font_color;
+    display: flex;
+    font-size: 0.8rem;
+    justify-content: space-between;
+    padding: 0 1rem 0.9rem 1rem;
+
+    .tip__date {
+      font-size: 0.6rem;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      .three-dots {
+        font-size: 0.75rem;
+        margin-left: 0.3rem;
+      }
+    }
+
+    .address {
+      font-size: 0.65rem;
+    }
+
+    .address,
+    .chain__name {
+      display: inline-block;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      width: 100%;
+      word-break: break-all;
+    }
+
+    img.user-identicon,
+    img.preview__image,
+    svg {
+      border-radius: 50%;
+      flex-shrink: 0;
+      height: 2rem;
+      margin-right: 0.25rem;
+      object-fit: cover;
+      width: 2rem;
+    }
+
+    a {
+      color: $light_font_color;
+      display: flex;
+      margin-right: 1rem;
+      overflow: hidden;
+
+      &:hover {
+        filter: brightness(1.3);
+      }
+    }
+
+    .chain__name {
+      color: #fff;
+    }
 
     .tip__description .author-and-date .date .three-dots {
       font-size: 0.75rem;
diff --git a/src/components/tipRecords/TipTitle.vue b/src/components/tipRecords/TipTitle.vue
index 52a81d6a4..cead59a19 100644
--- a/src/components/tipRecords/TipTitle.vue
+++ b/src/components/tipRecords/TipTitle.vue
@@ -21,7 +21,7 @@
 
 <script>
 
-import TippingContractUtil from '../../utils/tippingContractUtil';
+import { topicsRegex } from '@/utils/util';
 import Topic from './Topic.vue';
 
 export default {
@@ -32,8 +32,8 @@ export default {
   },
   computed: {
     splitByTopics() {
-      return this.tip.title.split(TippingContractUtil.topicsRegex).map((part) => {
-        const matches = TippingContractUtil.topicsRegex.test(part);
+      return this.tip.title.split(topicsRegex).map((part) => {
+        const matches = topicsRegex.test(part);
 
         return {
           text: part,
diff --git a/src/config/constants.js b/src/config/constants.js
index 95784be22..c154a1480 100644
--- a/src/config/constants.js
+++ b/src/config/constants.js
@@ -1,11 +1,15 @@
-export const BACKEND_URL = window.Cypress
+export const BACKEND_URL = typeof Cypress !== 'undefined'
   ? 'https://testnet.superhero.aeternity.art'
-  : 'https://raendom-backend.z52da5wt.xyz';
+  : 'https://test-tipping.aeternity.art';
 
-export const EXPLORER_URL = 'https://mainnet.aeternal.io/';
+export const EXPLORER_URL = 'https://testnet.aeternal.io/';
 export const COMPILER_URL = 'https://latest.compiler.aepps.com';
-export const NODE_URL = 'https://mainnet.aeternity.io';
+export const NODE_URL = 'https://testnet.aeternity.io';
 
-export const CONTRACT_ADDRESS = window.Cypress
+export const CONTRACT_V1_ADDRESS = window.Cypress
   ? 'ct_2GRP3xp7KWrKtZSnYfdcLnreRWrntWf5aTsxtLqpBHp71EFc3i'
-  : 'ct_2AfnEfCSZCTEkxL5Yoi4Yfq6fF7YapHRaFKDJK3THMXMBspp5z';
+  : 'ct_2Cvbf3NYZ5DLoaNYAU71t67DdXLHeSXhodkSNifhgd7Xsw28Xd';
+
+export const CONTRACT_V2_ADDRESS = window.Cypress
+  ? null
+  : null;
diff --git a/src/contracts/OracleServiceInterface.aes b/src/contracts/OracleServiceInterface.aes
deleted file mode 100644
index 4f1432e4b..000000000
--- a/src/contracts/OracleServiceInterface.aes
+++ /dev/null
@@ -1,23 +0,0 @@
-contract OracleService =
-
-  type oracle_type = oracle(string, string)
-  type oracle_query_tuples = list(oracle_type * oracle_query(string, string))
-
-  record success_claim =
-    { success : bool
-    , account : address
-    , percentage : int }
-
-  record state =
-    { trusted_oracles : map(int, oracle_type)
-    , trusted_oracle_seq : int
-    , oracle_queries : map(string, oracle_query_tuples)
-    , minimum_amount_of_oracles : int
-    , success_claimed_urls : map(string, success_claim)
-    , owner : address }
-
-  payable stateful entrypoint query_oracle : (string, address) => unit
-  stateful entrypoint check_persist_claim : (string, address, bool) => success_claim
-
-  entrypoint get_state : () => state
-  entrypoint estimate_query_fee : () => int
diff --git a/src/contracts/TippingInterface.aes b/src/contracts/TippingInterface.aes
deleted file mode 100644
index ab395beeb..000000000
--- a/src/contracts/TippingInterface.aes
+++ /dev/null
@@ -1,23 +0,0 @@
-contract OracleService =
-  record success_claim = { success : bool, caller : address, percentage : int }
-
-  stateful entrypoint check_persist_claim : (string, address, bool) => success_claim
-  payable stateful entrypoint query_oracle : (string, address) => unit
-
-contract Tipping =
-  type tip_id = int
-  type url_id = int
-  type retip_id = int
-  type url = string
-  type claim_gen = int
-
-  record tip = { sender : address, title : string, claim_gen : claim_gen, timestamp : int, url_id : url_id, amount : int }
-  record retip = { sender : address, amount : int, claim_gen : claim_gen, tip_id : tip_id }
-  record state = { urls : map(url, url_id), claims : map(url_id, claim_gen * int), url_index : map(url_id, url), tips : map(tip_id, tip), retips : map(retip_id, retip), owner : address, oracle_service : OracleService }
-
-  payable stateful entrypoint tip : (string, string) => unit
-  payable stateful entrypoint retip : (tip_id) => unit
-  payable stateful entrypoint pre_claim : (string, address) => unit
-  stateful entrypoint claim : (string, address, bool) => unit
-  stateful entrypoint migrate_balance : (address) => unit
-  entrypoint get_state : () => state
diff --git a/src/store/index.js b/src/store/index.js
index f498fa82b..515986131 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -26,6 +26,8 @@ export default new Vuex.Store({
     chainNames: [],
     verifiedUrls: [],
     graylistedUrls: [],
+    tokenInfo: {},
+    tokenBalances: [],
     isHiddenContent: true,
     useSdkWallet: false,
     useIframeWallet: false,
@@ -48,11 +50,13 @@ export default new Vuex.Store({
     persistState(
       (state) => state,
       ({
-        selectedCurrency, address, balance,
+        selectedCurrency, address, balance, tokenInfo, tokenBalances,
       }) => ({
         selectedCurrency,
         address,
         balance,
+        tokenInfo,
+        tokenBalances,
       }),
     ),
     modals,
diff --git a/src/store/mutations.js b/src/store/mutations.js
index 4dfb67988..3f82d2900 100644
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -39,6 +39,9 @@ export default {
   setGraylistedUrls(state, payload) {
     state.graylistedUrls = payload;
   },
+  setTokenInfo(state, payload) {
+    state.tokenInfo = payload;
+  },
   setVerifiedUrls(state, payload) {
     state.verifiedUrls = payload;
   },
@@ -54,6 +57,11 @@ export default {
   setUserProfile(state, profile) {
     state.profile = profile;
   },
+  addTokenBalance(state, payload) {
+    state.tokenBalances = [payload, ...state.tokenBalances]
+      .filter((bal, idx, arr) => !arr.slice(0, idx).some((b) => b.token === bal.token))
+      .sort((a, b) => a.token.localeCompare(b.token));
+  },
   setPinnedItems(state, pinnedItems) {
     state.pinnedItems = pinnedItems;
   },
diff --git a/src/store/plugins/persistState.js b/src/store/plugins/persistState.js
index a997bc1fd..c63718be8 100644
--- a/src/store/plugins/persistState.js
+++ b/src/store/plugins/persistState.js
@@ -33,11 +33,11 @@ export const resetState = () => {
 
 export default (reducerLoad, reducerSave) => (store) => {
   let resetting = false;
-  let lastEmitedState = reducerLoad(getState(), store);
-  store.commit('syncState', lastEmitedState);
+  let lastEmittedState = reducerLoad(getState(), store);
+  store.commit('syncState', lastEmittedState);
 
   store.subscribe(({ type, payload }, state) => {
-    if (resetting || (type === 'syncState' && payload === lastEmitedState)) return;
+    if (resetting || (type === 'syncState' && payload === lastEmittedState)) return;
     setState(reducerSave(state));
   });
 
@@ -51,7 +51,7 @@ export default (reducerLoad, reducerSave) => (store) => {
   });
 
   window.addEventListener('storage', () => {
-    lastEmitedState = reducerLoad(getState());
-    store.commit('syncState', lastEmitedState);
+    lastEmittedState = reducerLoad(getState());
+    store.commit('syncState', lastEmittedState);
   });
 };
diff --git a/src/utils/aeternity.js b/src/utils/aeternity.js
index 9f030e059..a909c8c60 100644
--- a/src/utils/aeternity.js
+++ b/src/utils/aeternity.js
@@ -5,20 +5,34 @@ import {
 } from '@aeternity/aepp-sdk/es';
 import Detector from '@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/wallet-detector';
 import BrowserWindowMessageConnection from '@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/connection/browser-window-message';
-import { CONTRACT_ADDRESS, COMPILER_URL, NODE_URL } from '@/config/constants';
-import TIPPING_INTERFACE from '../contracts/TippingInterface.aes';
+import {
+  CONTRACT_V1_ADDRESS, CONTRACT_V2_ADDRESS, COMPILER_URL, NODE_URL,
+} from '@/config/constants';
+import TIPPING_V1_INTERFACE from 'tipping-contract/Tipping_v1_Interface.aes';
+import TIPPING_V2_INTERFACE from 'tipping-contract/Tipping_v2_Interface.aes';
+import FUNGIBLE_TOKEN_CONTRACT from 'aeternity-fungible-token/FungibleTokenFullInterface.aes';
+import { BigNumber } from 'bignumber.js';
 import { EventBus } from './eventBus';
 import store from '../store';
+import { IS_MOBILE_DEVICE } from './util';
 
-let contract;
+let contractV1;
+let contractV2;
 
 export let client; // eslint-disable-line import/no-mutable-exports
 
+export const hasV2ContractAddress = () => CONTRACT_V2_ADDRESS !== null;
+
 const initTippingContractIfNeeded = async () => {
   if (!client) throw new Error('Init sdk first');
-  if (contract) return;
-  contract = await client
-    .getContractInstance(TIPPING_INTERFACE, { contractAddress: CONTRACT_ADDRESS });
+  if (!contractV1) {
+    contractV1 = await client
+      .getContractInstance(TIPPING_V1_INTERFACE, { contractAddress: CONTRACT_V1_ADDRESS });
+  }
+  if (!contractV2 && hasV2ContractAddress()) {
+    contractV2 = await client
+      .getContractInstance(TIPPING_V2_INTERFACE, { contractAddress: CONTRACT_V2_ADDRESS });
+  }
 };
 
 /**
@@ -45,7 +59,6 @@ export const initClient = async () => {
         getCurrentAccount: async () => Cypress.env('publicKey'),
       };
       await initTippingContractIfNeeded();
-      contract.methods.migrate_balance(Cypress.env('publicKey'));
     } else {
       client = await RpcAepp({
         name: 'Superhero',
@@ -69,7 +82,7 @@ export const scanForWallets = async () => {
     connectionInfo: { id: 'spy' },
   });
   const detector = await Detector({ connection: scannerConnection });
-  const webWalletTimeout = setTimeout(() => store.commit('useIframeWallet'), 2000);
+  const webWalletTimeout = setTimeout(() => !IS_MOBILE_DEVICE && store.commit('useIframeWallet'), 2000);
 
   return new Promise((resolve) => {
     detector.scan(async ({ newWallet }) => {
@@ -83,12 +96,63 @@ export const scanForWallets = async () => {
   });
 };
 
-export const tip = async (url, title, amount) => {
+export const tokenBalance = async (token, address) => {
+  const tokenContract = await client
+    .getContractInstance(FUNGIBLE_TOKEN_CONTRACT, { contractAddress: token });
+
+  const { decodedResult } = await tokenContract.methods.balance(address);
+  return new BigNumber(decodedResult || 0).toFixed();
+};
+
+const createOrChangeAllowance = async (tokenAddress, amount) => {
+  const tokenContract = await client
+    .getContractInstance(FUNGIBLE_TOKEN_CONTRACT, { contractAddress: tokenAddress });
+
+  const { decodedResult } = await tokenContract.methods.allowance({
+    from_account: await client.address(),
+    for_account: CONTRACT_V2_ADDRESS.replace('ct_', 'ak_'),
+  });
+
+  const allowanceAmount = decodedResult !== undefined
+    ? new BigNumber(decodedResult).multipliedBy(-1).plus(amount).toNumber()
+    : amount;
+
+  return tokenContract
+    .methods[decodedResult !== undefined ? 'change_allowance' : 'create_allowance'](
+      CONTRACT_V2_ADDRESS.replace('ct_', 'ak_'),
+      allowanceAmount,
+    );
+};
+
+// will always tip to the latest contract
+export const tip = async (url, title, amount, tokenAddress = null) => {
   await initTippingContractIfNeeded();
-  return contract.methods.tip(url, title, { amount });
+
+  if (tokenAddress && tokenAddress !== 'native') {
+    await createOrChangeAllowance(tokenAddress, amount);
+    return contractV2.methods.tip_token(url, title, tokenAddress, amount);
+  }
+
+  return hasV2ContractAddress()
+    ? contractV2.methods.tip(url, title, { amount })
+    : contractV1.methods.tip(url, title, { amount });
 };
 
-export const retip = async (id, amount) => {
+export const retip = async (contractAddress, id, amount, tokenAddress = null) => {
   await initTippingContractIfNeeded();
-  return contract.methods.retip(id, { amount });
+
+  if (tokenAddress && tokenAddress !== 'native') {
+    await createOrChangeAllowance(tokenAddress, amount);
+    return contractV2.methods.retip_token(Number(id.split('_')[0]), tokenAddress, amount);
+  }
+
+  if (contractAddress === CONTRACT_V1_ADDRESS) {
+    return contractV1.methods.retip(Number(id.split('_')[0]), { amount });
+  }
+
+  if (contractAddress === CONTRACT_V2_ADDRESS) {
+    return contractV2.methods.retip(Number(id.split('_')[0]), { amount });
+  }
+
+  return null;
 };
diff --git a/src/utils/backend.js b/src/utils/backend.js
index 7ec907bad..1ee2f0785 100644
--- a/src/utils/backend.js
+++ b/src/utils/backend.js
@@ -108,6 +108,10 @@ export default class Backend {
 
   static getTopicsCache = async () => backendFetch('cache/topics');
 
+  static getTokenInfo = async () => backendFetch('tokenCache/tokenInfo');
+
+  static getTokenBalances = async (address) => backendFetch(`tokenCache/balances?address=${address}`);
+
   static cacheInvalidateTips = async () => backendFetch('cache/invalidate/tips');
 
   static getCommentCountForAddress = async (address) => backendFetch(`comment/count/author/${address}`);
diff --git a/src/utils/tippingContractUtil.js b/src/utils/tippingContractUtil.js
deleted file mode 100644
index 138f097b4..000000000
--- a/src/utils/tippingContractUtil.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import BigNumber from 'bignumber.js';
-import Util from './util';
-
-const topicsRegex = /(#[a-zA-Z]+\b)(?!;)/g;
-
-const getTipsRetips = (state) => {
-  const findUrl = (urlId) => state.urls.find(([, id]) => urlId === id)[0];
-
-  const findClaimGen = (tipClaimGen, urlId) => {
-    const [, data] = state.claims.find(([id]) => id === urlId);
-
-    return {
-      unclaimed: tipClaimGen > data[0],
-      claim_gen: data[0],
-      unclaimed_amount: data[1],
-    };
-  };
-
-  const findRetips = (tipId, urlId) => state.retips
-    .filter(([, data]) => data.tip_id === tipId).map(([id, data]) => ({
-      ...data,
-      id,
-      claim: findClaimGen(data.claim_gen, urlId),
-      amount_ae: Util.atomsToAe(data.amount).toFixed(),
-    }));
-
-  const tips = state.tips.map(([id, data]) => {
-    const tipsData = data;
-    tipsData.id = id;
-    tipsData.url = findUrl(tipsData.url_id);
-    tipsData.topics = [...new Set(tipsData.title.match(topicsRegex))].map((x) => x.toLowerCase());
-    tipsData.retips = findRetips(id, tipsData.url_id);
-    tipsData.claim = findClaimGen(tipsData.claim_gen, tipsData.url_id);
-
-    tipsData.amount_ae = Util.atomsToAe(tipsData.amount).toFixed();
-
-    const retipAmount = tipsData.retips.reduce((acc, retip) => acc.plus(retip.amount), new BigNumber('0')).toFixed();
-
-    tipsData.retip_amount_ae = Util.atomsToAe(retipAmount).toFixed();
-
-    tipsData.total_amount = Util
-      .atomsToAe(new BigNumber(tipsData.amount).plus(retipAmount)).toFixed();
-
-    tipsData.total_unclaimed_amount = Util.atomsToAe(new BigNumber(tipsData.claim.unclaimed ? tipsData.amount : 0).plus(tipsData.retips.reduce((acc, retip) => acc.plus(retip.claim.unclaimed ? retip.amount : 0), new BigNumber('0'))).toFixed()).toFixed();
-
-    return tipsData;
-  });
-
-  const urls = state.urls.map(([url, id]) => {
-    const urlTips = tips.filter((tip) => tip.url_id === id);
-    const claim = state.claims.find(([urlId]) => urlId === id)[1];
-
-    return {
-      url,
-      tip_ids: urlTips.map((tip) => tip.id),
-      retip_ids: urlTips.flatMap((tip) => tip.retips.map((retip) => retip.id)),
-      unclaimed_amount: claim[1],
-    };
-  });
-
-  const senders = [...new Set(tips
-    .reduce((acc, tip) => acc
-      .concat([tip.sender, ...tip.retips.map((retip) => retip.sender)]), []))];
-
-  const stats = {
-    tips_length: state.tips.length,
-    retips_length: state.retips.length,
-    total_tips_length: state.tips.length + state.retips.length,
-    total_amount: tips.reduce((acc, tip) => acc.plus(tip.total_amount), new BigNumber('0')).toFixed(),
-    total_unclaimed_amount: tips.reduce((acc, tip) => acc.plus(tip.total_unclaimed_amount), new BigNumber('0')).toFixed(),
-    senders_length: senders.length,
-  };
-
-  return {
-    stats,
-    urls,
-    tips,
-  };
-};
-
-export default {
-  getTipsRetips,
-  topicsRegex,
-};
diff --git a/src/utils/util.js b/src/utils/util.js
index 7768a0ad5..88ad0785a 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -3,8 +3,13 @@ import BigNumber from 'bignumber.js';
 import { EventBus } from './eventBus';
 import i18n from './i18nHelper';
 
-const atomsToAe = (atoms) => (new BigNumber(atoms)).dividedBy(new BigNumber(1000000000000000000));
-const aeToAtoms = (ae) => (new BigNumber(ae)).times(new BigNumber(1000000000000000000));
+export const topicsRegex = /(#[a-zA-Z]+\b)(?!;)/g;
+
+const shiftDecimalPlaces = (amount, decimals) => new BigNumber(amount).shiftedBy(decimals);
+
+const atomsToAe = (atoms) => shiftDecimalPlaces(atoms, -18);
+const aeToAtoms = (ae) => shiftDecimalPlaces(ae, 18);
+
 export const wrapTry = async (promise) => {
   try {
     return Promise.race([
@@ -97,7 +102,9 @@ export const getI18nPath = (index, page) => (isTitle(index, page)
   : `views.${page}.sections[${index}].text`);
 
 export default {
+  topicsRegex,
   atomsToAe,
+  shiftDecimalPlaces,
   aeToAtoms,
   wrapTry,
   currencySigns,
diff --git a/src/views/UserProfile.vue b/src/views/UserProfile.vue
index 685d23ea4..7ab509ab1 100644
--- a/src/views/UserProfile.vue
+++ b/src/views/UserProfile.vue
@@ -275,15 +275,15 @@ export default {
         {
           value: this.userStats.tipsLength + this.userStats.retipsLength,
           title: this.$t('views.UserProfileView.TipsSent'),
-          amount: this.userStats.totalTipAmount,
+          amount: this.userStats.totalTipAmountAe,
         },
         {
           title: this.$t('views.UserProfileView.ClaimedAmount'),
-          amount: this.userStats.claimedAmount,
+          amount: this.userStats.claimedAmountAe,
         },
         {
           title: this.$t('views.UserProfileView.UnclaimedAmount'),
-          amount: this.userStats.unclaimedAmount,
+          amount: this.userStats.unclaimedAmountAe,
         },
       ];
     },
diff --git a/src/views/admin/Tracing.vue b/src/views/admin/Tracing.vue
index 34e54f85a..682a0059c 100644
--- a/src/views/admin/Tracing.vue
+++ b/src/views/admin/Tracing.vue
@@ -19,12 +19,12 @@
         Total Claimed:
         <AeAmount
           class="mx-2"
-          :amount="blockchainTrace.tip.total_claimed_amount"
+          :amount="blockchainTrace.tip.total_claimed_amount_ae"
         />
         Total Unclaimed:
         <AeAmount
           class="mx-2"
-          :amount="blockchainTrace.tip.total_unclaimed_amount"
+          :amount="blockchainTrace.tip.total_unclaimed_amount_ae"
         />
         Retips:
         <span class="mx-2">
@@ -37,12 +37,12 @@
         Total Claimed:
         <AeAmount
           class="mx-2"
-          :amount="blockchainTrace.url_stats.total_claimed_amount"
+          :amount="blockchainTrace.url_stats.total_claimed_amount_ae"
         />
         Total Unclaimed:
         <AeAmount
           class="mx-2"
-          :amount="blockchainTrace.url_stats.total_unclaimed_amount"
+          :amount="blockchainTrace.url_stats.total_unclaimed_amount_ae"
         />
         Total Tips:
         <span class="mx-2">