Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

defi-r #1485

Open
wants to merge 67 commits into
base: develop
Choose a base branch
from
Open

defi-r #1485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
c06252d
create defi-r
RustemYuzlibaev Aug 6, 2024
70dbeca
Update SendTokenDialog.vue
RustemYuzlibaev Aug 6, 2024
eef773c
add fixes and indexer support
RustemYuzlibaev Aug 21, 2024
7c50361
Merge branch 'develop' into tech/defi-r
RustemYuzlibaev Aug 21, 2024
bcd3953
start dashboard
RustemYuzlibaev Aug 22, 2024
1d673af
prepare mockups
RustemYuzlibaev Aug 24, 2024
3f23eab
add table
RustemYuzlibaev Aug 29, 2024
b84ebeb
Merge branch 'develop' into tech/defi-r
RustemYuzlibaev Aug 29, 2024
8e60c23
add pagination
RustemYuzlibaev Aug 31, 2024
78cc367
add expiry functions
RustemYuzlibaev Sep 3, 2024
bd80732
Merge branch 'tech/defi-r' of github.com:sora-xor/polkaswap-exchange-…
RustemYuzlibaev Sep 3, 2024
6c2a3e7
support flow of adding
RustemYuzlibaev Sep 3, 2024
8d3df0f
Update AssetOwner.vue
RustemYuzlibaev Sep 3, 2024
f00aba9
Update CreateSbtToken.vue
RustemYuzlibaev Sep 3, 2024
93ed04f
add translation
RustemYuzlibaev Sep 5, 2024
cf46cf6
up wallet
RustemYuzlibaev Sep 5, 2024
1b041e1
Update CreateSbtToken.vue
RustemYuzlibaev Sep 5, 2024
63335e7
Merge branch 'develop' into tech/defi-r
RustemYuzlibaev Sep 5, 2024
79d821e
Merge branch 'develop' into tech/defi-r
RustemYuzlibaev Sep 13, 2024
23c56b6
bump version
RustemYuzlibaev Sep 13, 2024
1408d02
Update GrantPrivilegeDialog.vue
RustemYuzlibaev Sep 13, 2024
0ce7776
change imports
RustemYuzlibaev Sep 13, 2024
3b2c1ae
Merge branch 'develop' into tech/defi-r
RustemYuzlibaev Sep 13, 2024
3976859
remove unused
RustemYuzlibaev Sep 15, 2024
888539a
add css vars
RustemYuzlibaev Sep 15, 2024
4b8447f
Revert "remove unused"
RustemYuzlibaev Sep 15, 2024
f3ce294
Revert "Revert "remove unused""
RustemYuzlibaev Sep 15, 2024
3d77246
fix wallet method import
RustemYuzlibaev Sep 16, 2024
15a583c
Merge branch 'develop' into tech/defi-r
RustemYuzlibaev Sep 16, 2024
a55e5cd
fix position & add image for token creation
RustemYuzlibaev Sep 17, 2024
8aefca4
Merge branch 'tech/defi-r' of github.com:sora-xor/polkaswap-exchange-…
RustemYuzlibaev Sep 17, 2024
6d4e9ac
add en translations
RustemYuzlibaev Sep 17, 2024
b367a95
improve code
RustemYuzlibaev Sep 18, 2024
ec4e1ac
add missing translations
RustemYuzlibaev Sep 18, 2024
24c5bd7
Update package.json
RustemYuzlibaev Sep 20, 2024
69d86ef
add translations
RustemYuzlibaev Sep 23, 2024
5e4258d
Update AssetOwnerDetailsSBT.vue
RustemYuzlibaev Sep 23, 2024
4981ab1
Update Sbt.vue
RustemYuzlibaev Sep 23, 2024
e4ab7ff
hide stats
RustemYuzlibaev Oct 3, 2024
0bf8b7b
Merge branch 'develop' into tech/defi-r
RustemYuzlibaev Oct 3, 2024
2933e91
Merge branch 'develop' into tech/defi-r
Naghme98 Oct 3, 2024
36a9f2e
bump version
RustemYuzlibaev Oct 3, 2024
fd1417f
Merge branch 'tech/defi-r' of github.com:sora-xor/polkaswap-exchange-…
RustemYuzlibaev Oct 3, 2024
21f8964
Update en.json
RustemYuzlibaev Oct 3, 2024
c76ee30
add operation translations
RustemYuzlibaev Oct 3, 2024
176d998
Update CreateSbtToken.vue
RustemYuzlibaev Oct 3, 2024
3aafa58
bump version
RustemYuzlibaev Oct 8, 2024
69250c7
Merge branch 'develop' into tech/defi-r
RustemYuzlibaev Oct 8, 2024
1216601
migrate to new storage
RustemYuzlibaev Oct 8, 2024
90739c1
return to refetch
RustemYuzlibaev Oct 9, 2024
f1c3add
Merge branch 'develop' into tech/defi-r
RustemYuzlibaev Oct 9, 2024
09dd87e
add check from wallet
RustemYuzlibaev Oct 9, 2024
27f3e52
Update en.json
RustemYuzlibaev Oct 9, 2024
ecb7517
Update package.json
Oct 9, 2024
b2e1ac2
Update SendTokenDialog.vue
RustemYuzlibaev Oct 10, 2024
e6da91d
Merge branch 'tech/defi-r' of github.com:sora-xor/polkaswap-exchange-…
RustemYuzlibaev Oct 10, 2024
042af5c
fix xorless transfer
RustemYuzlibaev Oct 10, 2024
d388aac
merge origin/develop
Nikita-Polyakov Oct 15, 2024
ec81de3
Merge branch 'develop' into tech/defi-r
Oct 17, 2024
31396d1
Merge branch 'develop' into tech/defi-r
RustemYuzlibaev Oct 21, 2024
255090b
Update yarn.lock
RustemYuzlibaev Oct 21, 2024
06b50e2
Merge branch 'develop' into tech/defi-r
RustemYuzlibaev Oct 21, 2024
3441044
Merge branch 'tech/defi-r' of github.com:sora-xor/polkaswap-exchange-…
RustemYuzlibaev Oct 21, 2024
8a26139
add translactions
RustemYuzlibaev Oct 22, 2024
e2afffa
reduce duplication
RustemYuzlibaev Oct 22, 2024
13858f4
remove unused
RustemYuzlibaev Oct 22, 2024
f4d6a25
Merge branch 'develop' into tech/defi-r
RustemYuzlibaev Oct 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "polkaswap-exchange-web",
"version": "1.42.0",
"version": "1.43.0",
"repository": {
"type": "git",
"url": "https://github.com/sora-xor/polkaswap-exchange-web.git"
Expand Down Expand Up @@ -29,7 +29,7 @@
"dependencies": {
"@cedelabs/widgets-universal": "^1.3.1",
"@metamask/detect-provider": "^2.0.0",
"@soramitsu/soraneo-wallet-web": "1.43.2",
"@soramitsu/soraneo-wallet-web": "1.43.2-beta-1",
"@walletconnect/ethereum-provider": "^2.13.3",
"@walletconnect/modal": "^2.6.2",
"core-js": "^3.37.1",
Expand Down
Binary file added public/asset-owner/token-creation.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/env.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"soraCard": false,
"orderBook": true,
"kensetsu": true,
"assetOwner": false,
"assetOwner": true,
"alt": true,
"debug": true,
"pointSystemV2": true
Expand Down
51 changes: 51 additions & 0 deletions src/lang/messages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1186,6 +1186,57 @@ export default {
incorrectCollateral: 'Token pair is not supported',
},
},
assetOwner: {
letsStartBtn: 'LET’S START',
selectExisting: 'Select existing',
createSbt: 'Create {type}',
orSelectExisting: 'Or select existing',
createRegulatedAsset: 'Create new regulated asset',
addRegulatedAsset: 'Add another regulated asset',
attachedRegulatedAssets: 'Attached regulated assets',
ownerSbtTitle: 'Your {type}',
regulatedAssetsConnected: 'Regulated assets connected',
regulatedPools: 'Regulated pools',
sbtManagers: '{type} Managers',
you: 'You',
accountWithAccess: 'Account with SBT access',
issueSbtAccess: 'Issue {type} access',
startIssue: 'Start issuing access for the SBT to accounts',
permissionedAssets: 'Permissioned assets',
addRegulatedAssets: 'Add regulated assets',
sbtCreation: {
addAssets: 'Add Assets to SBT',
addDescription: 'Enter SBT Details',
addMeta: 'Enter SBT Details',
preview: 'SBT Preview',
},
guide: {
createToken: 'Create your token',
createTokenDesc:
'Easily launch your unique token—available in multiple formats like NFTs and SBTs—using the robust, secure infrastructure of the SORA Network',
title: 'How to create an {type}:',
stepOneTitle: 'Select or Create Regulated Assets',
stepOneDesc:
'Choose or create assets that you have personally created and regulate. These are assets under your control and management.',
stepTwoTitle: 'Enter SBT Details',
stepTwoDesc: "Provide essential information such as the SBT's name and ticker symbol, as well as the icon.",
stepThreeTitle: 'Review and sign the transaction',
stepThreeDesc: 'Review and sign the final creation transaction to complete the SBT setup.',
disclaimerSbt:
'Keep this page open during the entire process. Closing or navigating away will require you to restart from the beginning. Complete steps quickly to avoid timeout.',
},
dialog: {
createAsset: 'Create a new asset',
createAssetDesc: 'Set up a new permissioned asset for the {type}',
addExisting: 'Add an existing asset',
addExistingDesc: 'Add an already created asset for the SBT',
enterAddress: 'Enter address for issuance',
selectAccessEnd: 'Select when access will end',
selectDate: 'Select date',
issueAccess: 'Issue access',
pickDate: 'Pick a day',
},
},
rotatePhoneNotification: {
enableAcceleration: 'Enable acceleration access in your settings.',
gyroscropePhone:
Expand Down
Loading