Skip to content

Commit

Permalink
Merge pull request #1383 from aeternity/feature/remove-tokens
Browse files Browse the repository at this point in the history
Remove MigratedBalanceModal
  • Loading branch information
davidyuk authored May 26, 2020
2 parents 727d262 + 0445369 commit 764b7f2
Show file tree
Hide file tree
Showing 9 changed files with 1 addition and 155 deletions.
2 changes: 0 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
VUE_APP_MIGRATION_STATUS_URL=https://api.backendless.com/CBD0589C-4114-2D15-FF41-6FC7F3EE8800/39EBBD6D-5A94-0739-FF27-B17F3957B700/data/migrations?pageSize=100&where=pubKey%20%3D%20%27ADDRESS%27
VUE_APP_MIGRATION_PHASE=0
UNFINISHED_FEATURES=true
VUE_APP_REMOTE_CONNECTION_BACKEND_URL=https://signaling.aepps.com
VUE_APP_VAPID_PUBLIC_KEY=BJP4PnSPRizQofIOBhe8o-AlaElRYbp7Mi_nirXzPYkJPkZfu-ONL7M14Y2c_q9LfU1K3XUcwzfx3lNM_jBLJrc
Expand Down
97 changes: 0 additions & 97 deletions src/components/mobile/MigratedBalanceModal.vue

This file was deleted.

7 changes: 0 additions & 7 deletions src/locales/cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -299,13 +299,6 @@
}
},

"migrated-balance": {
"title": "迁移中的数量",
"subtitle": "未显示为上述余额",
"note": "正在迁移中。他们将在下一次硬分叉后可使用。",
"to-migrations": "查看迁移"
},

"redeem-balance": {
"title": "Redeem Balance",
"subtitle": "Scan QR code to redeem",
Expand Down
7 changes: 0 additions & 7 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -299,13 +299,6 @@
}
},

"migrated-balance": {
"title": "Tokens in migration",
"subtitle": "Not shown as balance above",
"note": "are in migration now. They will be available after the next hardfork.",
"to-migrations": "See migrations"
},

"redeem-balance": {
"title": "Redeem Balance",
"subtitle": "Scan QR code to redeem",
Expand Down
7 changes: 0 additions & 7 deletions src/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -299,13 +299,6 @@
}
},

"migrated-balance": {
"title": "Tokens migrados",
"subtitle": "No se muestra como saldo arriba",
"note": "están en la migración ahora estarán disponibles después del próxima. Hardfork.",
"to-migrations": "Ver migraciones"
},

"redeem-balance": {
"title": "Redeem Balance",
"subtitle": "Scan QR code to redeem",
Expand Down
7 changes: 0 additions & 7 deletions src/locales/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -299,13 +299,6 @@
}
},

"migrated-balance": {
"title": "Жетоны в миграции",
"subtitle": "Не отображаются как баланс выше",
"note": "в настоящее время мигрируются. Они будут доступны после следующего хардфорка.",
"to-migrations": "Открыть миграции"
},

"redeem-balance": {
"title": "Redeem баланс",
"subtitle": "Сканируйте QR-код, для выкупа",
Expand Down
14 changes: 0 additions & 14 deletions src/pages/mobile/Transfer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,6 @@
>
<LeftMore slot="right" />
</ListItem>
<ListItem
:title="$t('transfer.migrated-balance.title')"
:subtitle="$t('transfer.migrated-balance.subtitle')"
border-dark
@click="open({ name: 'migratedBalance' })"
>
<img
slot="icon"
:src="glowingStarEmoji"
>
<LeftMore slot="right" />
</ListItem>
<ListItem
:to="{ name: 'redeem' }"
class="redeem-balance"
Expand All @@ -83,7 +71,6 @@ import { mapActions } from 'vuex';
import moneyWithWingsEmoji from 'emoji-datasource-apple/img/apple/64/1f4b8.png';
import manTippingHandEmoji from 'emoji-datasource-apple/img/apple/64/1f481-200d-2642-fe0f.png';
import mantelpieceClockEmoji from 'emoji-datasource-apple/img/apple/64/1f570-fe0f.png';
import glowingStarEmoji from 'emoji-datasource-apple/img/apple/64/1f31f.png';
import mobilePhoneWithAnArrowEmoji from 'emoji-datasource-apple/img/apple/64/1f4f2.png';
import MobilePage from '../../components/mobile/Page.vue';
import Guide from '../../components/Guide.vue';
Expand All @@ -103,7 +90,6 @@ export default {
moneyWithWingsEmoji,
manTippingHandEmoji,
mantelpieceClockEmoji,
glowingStarEmoji,
mobilePhoneWithAnArrowEmoji,
tooltipsVisible: false,
}),
Expand Down
2 changes: 0 additions & 2 deletions src/router/modals/mobile.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { registerModal } from '../../store/plugins/ui/modals';
import { notificationOptions } from './utils';
import AccountSwitcherModal from '../../components/mobile/AccountSwitcherModal.vue';
import SecurityCourseModal from '../../components/mobile/SecurityCourseModal.vue';
import MigratedBalanceModal from '../../components/mobile/MigratedBalanceModal.vue';
import ConfirmAccountAccessModal from '../../components/mobile/ConfirmAccountAccessModal.vue';
import ConfirmSignModal from '../../components/mobile/ConfirmSignModal.vue';
import ConfirmTransactionSignModal from '../../components/mobile/ConfirmTransactionSignModal.vue';
Expand All @@ -15,7 +14,6 @@ import NotificationSpendSuccess from '../../components/NotificationSpendSuccess.
export default () => {
registerModal({ name: 'accountSwitcher', component: AccountSwitcherModal });
registerModal({ name: 'proposeToOpenSecurityCourses', component: SecurityCourseModal, allowRedirect: true });
registerModal({ name: 'migratedBalance', component: MigratedBalanceModal });
registerModal({ name: 'confirmAccountAccess', component: ConfirmAccountAccessModal });
registerModal({ name: 'confirmSign', component: ConfirmSignModal, hidePage: true });
registerModal({ name: 'confirmTransactionSign', component: ConfirmTransactionSignModal, hidePage: true });
Expand Down
13 changes: 1 addition & 12 deletions src/stories/AeModal.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import Vuex from 'vuex';
import { storiesOf } from '@storybook/vue';
import { action } from '@storybook/addon-actions';
import AeButton from '../components/AeButton.vue';
import MigratedBalanceModal from '../components/mobile/MigratedBalanceModal.vue';
import LedgerModal from '../components/desktop/LedgerModal.vue';
import LedgerAddressConfirmModal from '../components/desktop/LedgerAddressConfirmModal.vue';
import LedgerSignTransactionModal from '../components/desktop/LedgerSignTransactionModal.vue';
Expand All @@ -12,16 +11,6 @@ import ModalSpendSuccess from '../components/desktop/ModalSpendSuccess.vue';
import { account, amount, transactionHash } from './mock-data';

storiesOf('AeModal', module)
.add('MigratedBalanceModal', () => ({
components: { MigratedBalanceModal },
template: '<migrated-balance-modal :resolve="resolve" />',
methods: { resolve: action('resolve') },
store: new Vuex.Store({
getters: {
'accounts/active': () => account,
},
}),
}))
.add('LedgerModal', () => ({
components: { LedgerModal, AeButton },
template: `
Expand All @@ -31,7 +20,7 @@ storiesOf('AeModal', module)
@close="action"
>
Content
<ae-button
slot="footer"
size="small"
Expand Down

1 comment on commit 764b7f2

@davidyuk
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.