Lockdrop logic removed (#954)

* Lockdrop logic removed

* more lockdrop removed (#957)

* fix: fetch dApps staking data after changing accounts (#955)

* fix: fetch staked dapps data for EVM wallets

* fix: clean up

* fix: position for page column

* Account unification (#925)

* Unification service skeleton

* Started with unify account implementation

* Unifiy account implemented - not working

* It works

* Error handling

* Mapped accounts getter functions

* Set identity logic (#931)

* Create and update identity

* Update identity works

* NFT metadata fetch

* Account unification batch call

* Comment

* Native asset transfer support for unified accounts (#938)

* Native token transfer

* Use unified SS50 for dApps staking

* getIdentity fix

* Update NFT repo to use Token API endpoints

* Update test call

* feat: added AccountUnification modal (#935)

* feat: added AccountUnification modal

* Add UI modals for account unification

* refactor: ModalConnectWallet

* Remove the wallet connect section on the user account modal

* Add type

* Add NFT select modal

* Add unify accounts icon button on the asset page

* Add dark theme, replace tailwind css to pure css

* remove body tag from style

* Replace rem to px

* Add styles for mobile screens

* Add static texts

* Adjust styles

* Update help

* feat: implemented logic in the ‘account unification’ modal (#936)

* feat: load the evm account from metamask

* feat: checks the staking info

* refactor: clean up

* feat: added close modal in step 2

* feat: removed account name input

* rollback: account name

* feat: added XC20 tokens which are required to transfer to unified account

* feat: updated 'accountName' logic

* feat: added jazzicon in Step 3

* adjust class naming rule

* clean up

* test: refactor useAccountUnification.ts

* fix: allow AU on local node

* test: refactor useAccountUnification.ts (2)

* test: refactor useAccountUnification.ts (3)

* Fix media query

* Use i18n

* Add help texts using i18n

---------

Co-authored-by: Ayumi Takahashi <ayumee528@gmail.com>

* Fix for reading staking data from UA (#942)

* Fix for reading staking data from UA

* Removed unnecessary store read

* Account unification call refactoring

* Adjust the checkbox position

* UA logic integration (#943)

* Basic integration implemented

* Disable submit button on action

* Rename from Step to AuStep

* use i18n

* add the emojis to i18 file

* feat: transfer XC20 tokens to the unified SS58 account (#944)

* feat: transfer XC20 tokens to unified SS58 account

* feat: transfer XC20 tokens to unified SS58 account (2)

* feat: added XCM tokens on shibuya

* feat: added XCM tokens on shibuya (2)

* refactor: clean up

* fix: updated receiving faucet account

* Accounts - show UA name and modal (#948)

* fix: account unification modals (#953)

* fix: connect MetaMask after users click connect button

* fix: updated words

* feat: added a check input for sending submit transaction

* fix: words

* fix: getMappedNativeAddress and getMappedEvmAddress functions

* Fix for breaking changes on Shibuya (#958)

* Moonfit added (#937) (#939)

* Uplift to the latest Quasar version (#940)

* feat: updated XCM with equilibrium to V3 (#946)

* fix: let space wrap and height grow for cards in banner (#947)

* let space wrap and height grow

* minimum width added, aligned bottom

* Remove lockdrop (#951)

* hotfix: update the hotfix branch (#920)

* fix: rollback

* fix: update ci yml files

* Lockdrop switch removed

* Removed toggleEvmWalletSchema

---------

Co-authored-by: impelcrypto <92044428+impelcrypto@users.noreply.github.com>

* fix: fetch dApps staking data after changing accounts (#955)

* fix: fetch staked dapps data for EVM wallets

* fix: clean up

* fix: position for page column

* Methods naming fix top match the latest runtime upgrade

---------

Co-authored-by: impelcrypto <92044428+impelcrypto@users.noreply.github.com>
Co-authored-by: Gregory Luneau <greg@astar.network>

* Display unification costs (#959)

* Display unification costs

* Limit account length

* fix: updated sending ERC20 tokens logic and displaying the destination balance for EVM address (considering deducting staked amount)

* fix: odd space issue

* Display and edit unified account (#963)

* Display unified account details

* Edit unified account

* Cleanup

* Update src/components/header/modals/account-unification/AuStep3.vue

Co-authored-by: impelcrypto <92044428+impelcrypto@users.noreply.github.com>

---------

Co-authored-by: impelcrypto <92044428+impelcrypto@users.noreply.github.com>

---------

Co-authored-by: impelcrypto <impelcrypto@gmail.com>
Co-authored-by: impelcrypto <92044428+impelcrypto@users.noreply.github.com>
Co-authored-by: Ayumi Takahashi <ayumee528@gmail.com>
Co-authored-by: Gregory Luneau <greg@astar.network>

* Fix for provider not set or invalid error (#970)

* Fix for provider not set or invalid error

* Don't use gas station on Shibuya

* fix: disabled transaction speed ui for Shibuya EVM (#971)

---------

Co-authored-by: impelcrypto <92044428+impelcrypto@users.noreply.github.com>

---------

Co-authored-by: Gregory Luneau <greg@astar.network>
Co-authored-by: impelcrypto <92044428+impelcrypto@users.noreply.github.com>
Co-authored-by: impelcrypto <impelcrypto@gmail.com>
Co-authored-by: Ayumi Takahashi <ayumee528@gmail.com>

src/components/assets/Account.vue

@@ -253,8 +253,11 @@ export default defineComponent({
       supportWalletObj,
       signatoryIconWallet,
       isAccountUnification,
+<<<<<<< HEAD
       unifiedAccount,
       isAccountUnified,
+=======
+>>>>>>> 372fe9b5 (Lockdrop logic removed (#954))
       getShortenAddress,
       copyAddress,
       showAccountUnificationModal,