Fixes, screenshots

src/assets/scss/app.scss

@@ -18,7 +18,7 @@ $la-font-path: "/fonts/line-awesome";
   "layout/footer";
 
 // Views
-@import "views/welcome",
+@import "views/create",
   "views/home",
   "views/receive",
   "views/deployment";

src/assets/scss/views/welcome.scss → src/assets/scss/views/create.scss

@@ -1,7 +1,12 @@
-.welcome {
+.create {
   width: 100%;
   flex-direction: column;
 
+  &__heading {
+    margin-top: 0;
+    font-weight: 500;
+  }
+
   &__warning {
     margin-bottom: 1rem;
     border-style: solid;

src/locales/en.json

@@ -61,6 +61,7 @@
     }
   },
   "home": {
+    "select_wallet": "Select wallet",
     "tabs": {
       "messages": "Messages",
       "transactions": "Transactions"

src/locales/ru.json

@@ -19,14 +19,14 @@
     }
   },
   "create": {
-    "account_name": "Account name",
-    "words_count": "{n} words",
-    "phrase": "This is your seed phrase",
-    "heading": "Don't you have an account yet?",
-    "phrase_alert": "Warning! Losing or compromising your seed phrase will result in losing access to your account and all your funds",
+    "account_name": "Название аккаунта",
+    "words_count": "{n} слов(а)",
+    "phrase": "Ваша фраза",
+    "heading": "Создание аккаунта",
+    "phrase_alert": "Внимание! Утрата или утечка вашей мастер-фразы приведет к потере аккаунта и всех ваших средств",
     "buttons": {
-      "generate": "Generate new",
-      "restore": "Restore from seed phrase"
+      "generate": "Сгенерировать еще раз",
+      "restore": "Восстановить из фразы"
     }
   },
   "receive": {
@@ -57,6 +57,7 @@
     }
   },
   "home": {
+    "select_wallet": "Выберите кошелек",
     "tabs": {
       "messages": "Сообщения",
       "transactions": "Транзакции"

src/main.js

@@ -1,10 +1,10 @@
 import store from './store'
 import App from './App.vue'
+import { Quasar } from 'quasar'
 import { createApp } from 'vue'
 import TonClient from './utils/ton'
 import extension from 'extensionizer'
 import { router } from './utils/router'
-import { Quasar, QSelect, QIcon } from 'quasar'
 import iconSet from 'quasar/icon-set/line-awesome'
 import { i18n, loadLocaleMessages, setI18nLanguage } from './utils/i18n'
 

src/store/accounts.js

@@ -1,6 +1,7 @@
 import { v4 } from 'uuid'
 import { ton } from '@utils/ton'
 import { i18n } from '@utils/i18n'
+import { toSHA256 } from '@utils/convert'
 import WrongPasswordException from '../utils/exceptions/WrongPasswordException'
 
 export default {
@@ -35,7 +36,7 @@ export default {
         ...account.xprv
       })
 
-      if (!ton.isHex(result.slice(4))) {
+      if (!ton.isASCII(result)) {
         throw new WrongPasswordException()
       }
 
@@ -44,21 +45,32 @@ export default {
   },
 
   actions: {
-    async create ({ commit, getters, dispatch }, { xprv, name, password }) {
+    async create ({ commit, getters, dispatch }, { xprv, phrase, name, password }) {
       const id = v4()
 
       commit('push', {
         id,
         data: {
+          phraseHash: await toSHA256(phrase),
+          passwordHash: await toSHA256(password),
           name: name || i18n.global.t('global.account') + ' #' + (getters.count + 1),
           xprv: await ton.encrypt({
             password,
             data: xprv
+          }),
+          phrase: await ton.encrypt({
+            password,
+            data: phrase
           })
         }
       })
 
-      dispatch('wallets/create', { accountId: id, xprv, password }, { root: true })
+      commit('select', id)
+
+      await dispatch('wallets/create', {
+        password,
+        account: id
+      }, { root: true })
     }
   }
 }

src/store/wallets.js

@@ -1,6 +1,7 @@
 import { v4 } from 'uuid'
 import { ton } from '@utils/ton'
 import { i18n } from '@utils/i18n'
+import { toSHA256 } from '@utils/convert'
 import WrongPasswordException from '../utils/exceptions/WrongPasswordException'
 
 export default {
@@ -61,10 +62,10 @@ export default {
   },
 
   actions: {
-    async create ({ commit, getters, rootState, rootGetters }, { name, password }) {
-      const accountId = rootState.accounts.selectedId
-      const index = getters.forAccount(accountId).length
+    async create ({ commit, getters, rootState, rootGetters }, { name, password, account }) {
+      const accountId = account || rootState.accounts.selectedId
 
+      const index = getters.forAccount(accountId).length
       const xprv = await rootGetters['accounts/getPrivateKey']({
         password,
         id: accountId
@@ -74,34 +75,24 @@ export default {
         xprv, index
       })
 
+      const id = v4()
+
       commit('push', {
-        id: v4(),
+        id,
         data: {
           index,
           accountId,
           public: keys.public,
+          passwordHash: await toSHA256(password),
           secret: await ton.encrypt({
             password,
             data: keys.secret
           }),
           name: name || i18n.global.t('global.wallet') + ' #' + (index + 1)
         }
       })
-    },
-
-    async update ({ getters, rootState }, { network = null, account = null, id }) {
-      const wallet = getters.getWallet({
-        id,
-        account: account || getters.current.id
-      })
-
-      const currentNetwork = rootState.settings.network
-
-      if (!wallet.networks[currentNetwork]) {
-        wallet.networks[currentNetwork] = {}
-      }
 
-      Object.assign(wallet.networks[currentNetwork], await ton.accountShort(wallet.data.public))
+      commit('select', id)
     }
   }
 }

src/utils/extension.js

@@ -1,4 +1,10 @@
+import extension from 'extensionizer'
+
 extension.browserAction.onClicked.addListener(function (tab) {
+  if (extension.extension.getExtensionTabs().length) {
+    return false
+  }
+
   extension.tabs.create({
     url: extension.extension.getBackgroundPage().location.href,
   })

src/utils/queries/accountActivity.js

@@ -1,9 +1,16 @@
 export default `query ($address: String!) {
-  transactions (filter: {
-    account_addr: {
-      eq: $address
+  transactions (
+    filter: {
+      account_addr: {
+        eq: $address
+      }
     }
-  }) {
+    
+    orderBy: [{
+      path: "lt"
+      direction: DESC
+    }]
+  ) {
     id
     aborted
     status

src/utils/ton/wrapper.js

@@ -124,6 +124,10 @@ export class TonWrapper {
     return /[0-9A-Fa-f]{6}/g.test(str)
   }
 
+  isASCII (str) {
+    return /^[\x00-\x7F]*$/.test(str)
+  }
+
   async getDefaultPayload (data) {
     if (! data.comment) {
       return ''

src/views/create-account.vue

@@ -1,9 +1,9 @@
 <template>
-  <div class="welcome">
-    <h1 class="heading">{{ $t('create.heading') }}</h1>
+  <div class="create">
+    <h5 class="create__heading">{{ $t('create.heading') }}</h5>
 
-    <div class="welcome__phrase-container">
-      <div class="welcome__phrase-header">
+    <div class="create__phrase-container">
+      <div class="create__phrase-header">
         <q-select dense
                   filled
                   emit-value
@@ -32,17 +32,17 @@
         <q-btn color="white" text-color="black" class="on-right" @click="generate">
           <q-icon name="las la-redo-alt" class="on-left" /> {{ $t('create.buttons.generate') }}
         </q-btn>
-        <a href="#" class="welcome__generate" @click.prevent="generate">{{ }}</a>
+        <a href="#" class="create__generate" @click.prevent="generate">{{ }}</a>
       </div>
 
-      <div class="welcome__phrase" v-if="mode === 'generate'">
+      <div class="create__phrase" v-if="mode === 'generate'">
         {{ createOptions.phrase }}
       </div>
 
       <q-input square dense filled v-model="createOptions.phrase" class="q-mb-md" v-else
                :label="$t('create.phrase')"></q-input>
 
-      <q-banner class="welcome__warning">
+      <q-banner class="create__warning">
         <q-icon name="las la-exclamation-circle" /> {{ $t('create.phrase_alert') }}
       </q-banner>
 
@@ -131,9 +131,10 @@
       xprv,
       name: createOptions.name,
       password: password.value,
+      phrase: createOptions.phrase,
     })
 
-    await r.push('/' + locale)
+    await r.push('/')
   }
 
   /*

src/views/home.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="home__default-message" v-if="! wallet.id">
-    {{ $t('home.you_need_to_select_wallet') }}
+    {{ $t('home.select_wallet') }}
   </div>
 
   <template v-else-if="deployment">